#3153 Removing references to master issue 2093: Make Containers Support multiple Structures