Sync with master
Auto-save settings