Issue #2345733 follow-up: only do batchSend in batch mode