Merge branch 'jk/send-email-sender-prompt'