|#743| Rahul| externalizing messages in Shipment Module