Merge pull request #4173 from Montellese/settings_fixes