Merge "Support batching ops across Add*Blocks() call" into main