Merge branch 'sa/send-email-smtp-batch-data-limit'