Merge "Update batching logic." into main