Revert revert of !4179

Gerhard Ravenrequested to merge
fix-empty-container-packing into master

This reverts commit 31c240f2, and removes the failing (incorrect) assert statements

Merge request reports