Merge "More optimizations to User::saveOptions()"