Merge branch 'savingsettings' into base