Merge remote-tracking branch 'south/MAGETWO-46891-2.0' into 2.0

Author: Oleksii Korshenko

app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js

@@ -12,6 +12,9 @@ define(
     function($, address, customerData, mageUtils) {
         'use strict';
         var countryData = customerData.get('directory-data');
+        if (_.isEmpty(countryData())) {
+            countryData(customerData.reload(['directory-data'], false));
+        }
 
         return {
             /**

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -50,6 +50,10 @@ define(
         });
         addressOptions.push(newAddressOption);
 
+        if (_.isEmpty(countryData())) {
+            countryData(customerData.reload(['directory-data'], false));
+        }
+
         return Component.extend({
             defaults: {
                 template: 'Magento_Checkout/billing-address'

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js

@@ -15,6 +15,10 @@ define([
 ], function($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
+    if (_.isEmpty(countryData())) {
+        countryData(customerData.reload(['directory-data'], false));
+    }
+
     return Component.extend({
         defaults: {
             template: 'Magento_Checkout/shipping-address/address-renderer/default'

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js

@@ -9,6 +9,10 @@ define([
 ], function(Component, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
+    if (_.isEmpty(countryData())) {
+        countryData(customerData.reload(['directory-data'], false));
+    }
+
     return Component.extend({
         defaults: {
             template: 'Magento_Checkout/shipping-information/address-renderer/default'