diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index 5d0e32d6876a2..638cb19051db5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -44,6 +44,13 @@ define(
                         addressData.region.region_code = region['code'];
                         addressData.region.region = region['name'];
                     }
+                } else if (
+                    !addressData.region_id
+                    && countryData()[addressData.country_id]
+                    && countryData()[addressData.country_id]['regions']
+                ) {
+                    addressData.region.region_code = '';
+                    addressData.region.region = '';
                 }
                 delete addressData.region_id;
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index 1d6fea79fe8fc..2021df484d180 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -177,7 +177,7 @@ define(
                     address;
 
                 if (this.validateAddressData(addressFlat)) {
-                    addressFlat = $.extend(true, {}, quote.shippingAddress(), addressFlat);
+                    addressFlat = uiRegistry.get('checkoutProvider').shippingAddress;
                     address = addressConverter.formAddressDataToQuoteAddress(addressFlat);
                     selectShippingAddress(address);
                 }
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index de2051cbce9b9..1cb70798dfef2 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -739,9 +739,13 @@ protected function _getXmlQuotes()
                 curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (bool)$this->getConfigFlag('mode_xml'));
                 $xmlResponse = curl_exec($ch);
-
-                $debugData['result'] = $xmlResponse;
-                $this->_setCachedQuotes($xmlRequest, $xmlResponse);
+                if ($xmlResponse !== false) {
+                    $debugData['result'] = $xmlResponse;
+                    $this->_setCachedQuotes($xmlRequest, $xmlResponse);
+                } else {
+                    $debugData['result'] = ['error' => curl_error($ch)];
+                }
+                curl_close($ch);
             } catch (\Exception $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
@@ -1002,7 +1006,11 @@ protected function _getXmlTracking($trackings)
                 curl_setopt($ch, CURLOPT_POSTFIELDS, $xmlRequest);
                 curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                 $xmlResponse = curl_exec($ch);
-                $debugData['result'] = $xmlResponse;
+                if ($xmlResponse !== false) {
+                    $debugData['result'] = $xmlResponse;
+                } else {
+                    $debugData['result'] = ['error' => curl_error($ch)];
+                }
                 curl_close($ch);
             } catch (\Exception $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
index af2815969436a..d56d207f8e281 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
@@ -42,6 +42,20 @@ class Method extends Block
      */
     protected $blockWaitElement = '._block-content-loading';
 
+    /**
+     * Shipping method row locator.
+     *
+     * @var string
+     */
+    private $shippingMethodRow = '#checkout-step-shipping_method tbody tr.row';
+
+    /**
+     * Shipping error row locator.
+     *
+     * @var string
+     */
+    private $shippingError = '#checkout-step-shipping_method tbody tr.row-error';
+
     /**
      * Select shipping method.
      *
@@ -50,10 +64,9 @@ class Method extends Block
      */
     public function selectShippingMethod(array $method)
     {
-        // Code under test uses JavaScript setTimeout at this point as well.
-        sleep(3);
+        $this->waitForShippingRates();
+
         $selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
-        $this->waitForElementNotVisible($this->blockWaitElement);
         $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click();
     }
 
@@ -74,4 +87,62 @@ function () use ($browser, $selector) {
             }
         );
     }
+
+    /**
+     * Wait until shipping rates will appear.
+     *
+     * @return void
+     */
+    public function waitForShippingRates()
+    {
+        // Code under test uses JavaScript setTimeout at this point as well.
+        sleep(3);
+        $this->waitForElementNotVisible($this->blockWaitElement);
+    }
+
+    /**
+     * Return available shipping methods with prices.
+     *
+     * @return array
+     */
+    public function getAvailableMethods()
+    {
+        $this->waitForShippingRates();
+        $methods = $this->_rootElement->getElements($this->shippingMethodRow);
+        $result = [];
+        foreach ($methods as $method) {
+            $methodName = trim($method->find('td.col-method:not(:first-child)')->getText());
+            $methodPrice = trim($method->find('td.col-price')->getText());
+            $methodPrice = $this->escapeCurrency($methodPrice);
+
+            $result[$methodName] = $methodPrice;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Is shipping rates estimation error present.
+     *
+     * @return bool
+     */
+    public function isErrorPresent()
+    {
+        $this->waitForShippingRates();
+
+        return $this->_rootElement->find($this->shippingError)->isVisible();
+    }
+
+    /**
+     * Escape currency in price.
+     *
+     * @param string $price
+     * @return string|null
+     */
+    private function escapeCurrency($price)
+    {
+        preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+
+        return (isset($matches[1])) ? $matches[1] : null;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php
new file mode 100644
index 0000000000000..4c89b2fe05135
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Checkout\Test\TestStep\FillShippingAddressStep;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Asserts that shipping methods are present on checkout page after address modification.
+ */
+class AssertShippingMethodsSuccessEstimateAfterAddressEdit extends AbstractConstraint
+{
+    /**
+     * Asserts that shipping methods are present on checkout page after address modification.
+     *
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param TestStepFactory $testStepFactory
+     * @param FixtureFactory $fixtureFactory
+     * @param BrowserInterface $browser
+     * @param array $editAddressData
+     * @return void
+     */
+    public function processAssert(
+        CheckoutOnepage $checkoutOnepage,
+        TestStepFactory $testStepFactory,
+        FixtureFactory $fixtureFactory,
+        BrowserInterface $browser,
+        array $editAddressData = []
+    ) {
+        if ($this->shouldOpenCheckout($checkoutOnepage, $browser)) {
+            $checkoutOnepage->open();
+        }
+
+        if (!empty ($editAddressData)) {
+
+            $address = $fixtureFactory->createByCode('address', ['data' => $editAddressData]);
+            $testStepFactory->create(
+                FillShippingAddressStep::class,
+                [
+                    'checkoutOnepage' => $checkoutOnepage,
+                    'shippingAddress' => $address
+                ]
+            )->run();
+
+            \PHPUnit_Framework_Assert::assertFalse(
+                $checkoutOnepage->getShippingMethodBlock()->isErrorPresent(),
+                'Shipping estimation error is present.'
+            );
+
+            $methods = $checkoutOnepage->getShippingMethodBlock()->getAvailableMethods();
+            \PHPUnit_Framework_Assert::assertNotEmpty(
+                $methods,
+                'No shipping methods are present.'
+            );
+        }
+    }
+
+    /**
+     * Should open checkout page or not.
+     *
+     * @param CheckoutOnepage  $checkoutOnepage
+     * @param BrowserInterface $browser
+     * @return bool
+     */
+    private function shouldOpenCheckout(CheckoutOnepage $checkoutOnepage, BrowserInterface $browser)
+    {
+        $result = true;
+        
+        foreach (['checkout/', $checkoutOnepage::MCA] as $path) {
+            $length = strlen($path);
+            if (substr($browser->getUrl(), -$length) === $path) {
+                $result = false;
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Shipping methods are present on checkout page after address modification.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageEstimateShippingMethodsTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageEstimateShippingMethodsTest.php
new file mode 100644
index 0000000000000..35c3b811f887c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageEstimateShippingMethodsTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Configure shipping method according dataset.
+ * 2. Create product(-s)
+ *
+ * Steps:
+ * 1. Go to Frontend.
+ * 2. Add product(-s) to the cart.
+ * 3. Proceed to Checkout.
+ * 4. Fill shipping address according to dataset.
+ * 5. Wait until shipping methods will appear.
+ * 6. Perform assertions.
+ *
+ * @group One_Page_Checkout_(CS)
+ * @ZephyrId MAGETWO-71002
+ */
+class OnePageEstimateShippingMethodsTest extends Scenario
+{
+    /**
+     * Runs test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
index 0947fd61673d3..d4dfe4a1b6d09 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
@@ -51,6 +51,7 @@ public function run()
     {
         if ($this->shippingAddress) {
             $this->checkoutOnepage->getShippingBlock()->fill($this->shippingAddress);
+            $this->checkoutOnepage->getShippingMethodBlock()->waitForShippingRates();
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ResolveShippingMethodsStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ResolveShippingMethodsStep.php
new file mode 100644
index 0000000000000..46d160d29fa68
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ResolveShippingMethodsStep.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Resolve shipping methods from checkout page.
+ */
+class ResolveShippingMethodsStep implements TestStepInterface
+{
+    /**
+     * Checkout view page.
+     *
+     * @var CheckoutOnepage
+     */
+    private $checkoutOnepage;
+
+    /**
+     * Open checkout page or not.
+     *
+     * @var bool
+     */
+    private $openPage = false;
+
+    /**
+     * @param CheckoutOnepage $checkoutOnepage
+     * @param bool $openPage
+     */
+    public function __construct(CheckoutOnepage $checkoutOnepage, $openPage = false)
+    {
+        $this->checkoutOnepage = $checkoutOnepage;
+        $this->openPage = $openPage;
+    }
+
+    /**
+     * Run step flow.
+     *
+     * @return array
+     */
+    public function run()
+    {
+        if ($this->openPage) {
+            $this->checkoutOnepage->open();
+        }
+
+        $methods = $this->checkoutOnepage->getShippingMethodBlock()->getAvailableMethods();
+        return ['shippingMethods' => $methods];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
index 743c30c4c578c..7f6c5bfc1f798 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -28,4 +28,12 @@
         <step name="addProductsToTheCart" module="Magento_Checkout" next="removeProductsFromTheCart" />
         <step name="removeProductsFromTheCart" module="Magento_Checkout" />
     </scenario>
+    <scenario name="OnePageEstimateShippingMethodsTest" firstStep="setupConfiguration">
+        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
+        <step name="proceedToCheckout" module="Magento_Checkout" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Checkout" next="resolveShippingMethods" />
+        <step name="resolveShippingMethods" module="Magento_Checkout" />
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml
new file mode 100644
index 0000000000000..684b182bb4c2b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\OnePageEstimateShippingMethodsTest" summary="Estimate shipping methods at checkout" ticketId="MAGETWO-71002">
+        <variation name="OnePageEstimateShippingMethodsTestUpsVariation" ticketId="MAGETWO-71003">
+            <data name="products" xsi:type="string">catalogProductSimple::default</data>
+            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
+            <data name="editAddressData" xsi:type="array">
+                <item name="city" xsi:type="string">Birmingham</item>
+                <item name="region_id" xsi:type="string">Alabama</item>
+                <item name="postcode" xsi:type="string">35201</item>
+            </data>
+            <data name="configData" xsi:type="string">ups, shipping_origin_US_CA</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertShippingMethodsSuccessEstimateAfterAddressEdit" />
+        </variation>
+    </testCase>
+</config>