Merge branch 'jd/send-email-to-whom'