Merge branch 'jp/send-email-to-cmd'