Merge "Throw specific exception caused by invalid email regex in config" into stable-3.3