Merge 'preferred-email' into stable-2.5 * preferred-email: Require preferred email to be a verified address