Fixed the environments and config files
Merge branch 'develop'