Merge pull request #8124 from jyrkiput/patch-1

Fix detaching from attached container