Merge branch 'master' into develop
Fixing tests
Moving environment variable checks to features
Merge branch 'develop'