Provision to override shipment weight #6058