Merge pull request #392 from JCgH4164838Gh792C124B5/WW-5050_Followup

Minor follow-up to WW-5050 changes to ContainerImpl