Batch operations passing on 2.4.X and 2.5.4