Merge branch 'tr/send-email-8bit' into maint