Merge branch 'tr/maint-send-email-2047' into maint-1.7.11