Reintroduce container component as a utility
#14993
Merged
container component as a utility
#14993