Merge branch 'fix/missing-config-settings' into 'develop'