Merge "Revert "User::saveOptions() optimization""