Merge pull request #18116 from dwi2/bug975293

Bug 975293 - Make sure we have _containerElement defined in the context ...