Merge branch 'generic-fe-settings' into 'develop'