10 Commits (master-settings-upgrade)