Ordered batch operations working for 2.4.X and 2.5.X