issue #22067: unspork ship_shipment