issue #20734: Work shipment objects towards usability.