Merge branch 'ab/send-email-config-fix' into maint