Merge pull request #18347 from tiborvass/container_package

Move Container to its own package (carry of 17969)