Merge pull request #2237 from xmcclure/container-owner