Merge "Remove User::isValidEmailAddr() (deprecated since 1.18)"