Merge pull request #2660 from Montellese/settings_refactor