Merge branch 'jc/send-email-skip-backup'