Merge "Let User::idFromName always return int or null"