Make container if null is passed.
Fix conflicts, merge 4.0 branch.