improved container classes

Merged Mark OLESEN requested to merge feature-improved-container-classes into develop

Merge request reports