Merge "Don't force loading of groups and options on User::loadFromUserObject"