Merge branch 'MC-30500' of https://github.com/magento-mpi/magento2ce into PR-2020-02-05

Author: chittima

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

@@ -383,6 +383,7 @@ public function mapItems(
                         $priceIncludesTax,
                         $useBaseCurrency
                     );
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
                 }
             } else {
@@ -394,6 +395,7 @@ public function mapItems(
                     $priceIncludesTax,
                     $useBaseCurrency
                 );
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
             }
         }
@@ -591,7 +593,10 @@ protected function processProductItems(
         $total->setSubtotalInclTax($subtotalInclTax);
         $total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
         $total->setBaseSubtotalInclTax($baseSubtotalInclTax);
-        $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
+        $address = $shippingAssignment->getShipping()->getAddress();
+        $address->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
+        $address->setSubtotal($total->getSubtotal());
+        $address->setBaseSubtotal($total->getBaseSubtotal());
 
         return $this;
     }
@@ -799,6 +804,7 @@ public function convertAppliedTaxes($appliedTaxes, $baseAppliedTaxes, $extraInfo
                 'rates' => $rates,
             ];
             if (!empty($extraInfo)) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $appliedTaxArray = array_merge($appliedTaxArray, $extraInfo);
             }