Merge branch 'hotfix/editor-controls'
Merge branch 'release/2.1'
remove dependence on ENV vars and use app_config
Merge branch 'hotfix/env-vars' into develop