Merge branch 'rd/send-email-2047-fix'