Merge branch 'mw/send-email'