ALIEN-512 fix select display for cloud / environment
Merge branch 'develop' into develop-official