Merge remote-tracking branch 'origin/MC-28956' into 2.3-develop-pr38

Author: serhii-balko

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

@@ -625,6 +625,7 @@ public function setShippingMethods($methods)
             $addressId = $address->getId();
             if (isset($methods[$addressId])) {
                 $address->setShippingMethod($methods[$addressId]);
+                $address->setCollectShippingRates(true);
             } elseif (!$address->getShippingMethod()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Set shipping methods for all addresses. Verify the shipping methods and try again.')

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

@@ -420,13 +420,16 @@ public function testSetShippingMethods()
         $methodsArray = [1 => 'flatrate_flatrate', 2 => 'tablerate_bestway'];
         $addressId = 1;
         $addressMock = $this->getMockBuilder(QuoteAddress::class)
-            ->setMethods(['getId', 'setShippingMethod'])
+            ->setMethods(['getId', 'setShippingMethod', 'setCollectShippingRates'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
         $addressMock->expects($this->once())->method('setShippingMethod')->with($methodsArray[$addressId]);
+        $addressMock->expects($this->once())
+            ->method('setCollectShippingRates')
+            ->with(true);
         $this->quoteMock->expects($this->once())
             ->method('__call')
             ->with('setTotalsCollectedFlag', [false])