IN-663 Fix the batch key s/orders/shipments/