Merge branch 'fc/send-email-no-sender-prompt'