Merge "Fix unexpected return type of User::idFromName()"