Merge pull request #2824 from Montellese/settings_unloading