Merge branch 'feature/unique-container-names' into develop

Merge branch 'feature/unique-container-names' into develop