Merge branch 'tr/maint-1.6.0-send-email-irt' into maint