Merge branch 'bg/send-email-smtpdomain'