Shipment notification changes fixed