Merge branch 'release/0.6.5' into develop
exit if no config for environment
merging.