Add settings to base and overwrites on environments
Merge branch 'develop'