(#1954) - WIP change batching for replication