Merge "Added CAS-style logic to User::saveSettings as a final sanity check"