Merge branch 'lh/send-email-hide-x-mailer'