Fix shipment custom field changes not applying upon subsequent edits