Merge branch 'ja/send-email-ehlo' into next