Merge branch 'sb/send-email-reconfirm-fix' into maint