Merge branch 'ab/send-email-validate-errors-fix'