Merge branch 'pb/send-email-te'