Merge "Made User::loadPasswords respect "queryFlagsUsed""