(#1954) - change batching for replication