Merge "Verify BatchedModifications messages sent vs received"