Merge shiping model with  1.5.5.1