Merge branch 'al/send-email-auto-cte-fixup'