Merge pull request #12275 from JMAConsulting/dev_mail_11-1