Code

Merge branch 'bg/send-email-smtpdomain' into maint