Merge "Update batching APIs" into sc-dev