[Stable] Batch Shipping update