Merge "Remove batching." into devel/master