Merge branch 'xz/send-email-batch-size'