Merge pull request #4689 from aparcar/keep_settings