Merge branch 'jk/send-email-complete-aliases'