Merge branch 'rl/send-email-aliases'