Merge remote-tracking branch 'origin/MAGETWO-94329' into 2.3-develop-pr34

Author: DianaRusin

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -693,6 +693,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             $order->setIsVirtual(1);
         } else {
             $order->setShippingAddress($this->quoteAddressToOrderAddress->convert($address));
+            $order->setShippingMethod($address->getShippingMethod());
         }
 
         $order->setPayment($this->quotePaymentToOrderPayment->convert($quote->getPayment()));

app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

@@ -659,11 +659,13 @@ private function getOrderMock(
                     'getId',
                     'getCanSendNewEmailFlag',
                     'getItems',
+                    'setShippingMethod',
                 ]
             )->getMock();
         $orderMock->method('setQuote')->with($this->quoteMock);
         $orderMock->method('setBillingAddress')->with($orderAddressMock)->willReturnSelf();
         $orderMock->method('setShippingAddress')->with($orderAddressMock)->willReturnSelf();
+        $orderMock->expects($this->once())->method('setShippingMethod')->with('carrier')->willReturnSelf();
         $orderMock->method('setPayment')->with($orderPaymentMock)->willReturnSelf();
         $orderMock->method('addItem')->with($orderItemMock)->willReturnSelf();
         $orderMock->method('getIncrementId')->willReturn('1');