Merge "User::saveOptions() optimization"