Merge branch 'config-changes' into 'develop'