Merge branch 'jt/send-email-validate-hook'