Adapt to new Container API.
Merge remote-tracking branch 'origin/refactor' into composite_refactor