Merge branch 'jc/send-email-reconfirm' into maint