Containers and compartments (#7795) - Basecamp