Use drop shipment in scenario

issue3677
review3561002