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