Merge branch 'develop' of github.corp.ebay.com:magento-mpi/magento2ce into develop

Author: Kostiantyn Poida

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

@@ -491,13 +491,19 @@ public function saveBilling($data, $customerAddressId)
                     )->setCollectShippingRates(
                         true
                     )->collectTotals();
-                    $shipping->save();
+                    if (!$this->isCheckoutMethodRegister()) {
+                        $shipping->save();
+                    }
                     $this->getCheckout()->setStepData('shipping', 'complete', true);
                     break;
             }
         }
 
-        $this->quoteRepository->save($this->getQuote());
+        if ($this->isCheckoutMethodRegister()) {
+            $this->quoteRepository->save($this->getQuote());
+        } else {
+            $address->save();
+        }
 
         $this->getCheckout()->setStepData(
             'billing',
@@ -516,6 +522,16 @@ public function saveBilling($data, $customerAddressId)
         return [];
     }
 
+    /**
+     * Check whether checkout method is "register"
+     *
+     * @return bool
+     */
+    protected function isCheckoutMethodRegister()
+    {
+        return $this->getQuote()->getCheckoutMethod() == self::METHOD_REGISTER;
+    }
+
     /**
      * Validate customer data and set some its data for further usage in quote
      *