Merge "Revert public API changes. BATCH property." into devel/master