diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 9ee5d5025d968..2f2a467f62c7e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -49,15 +49,25 @@ $numColumns = sizeof($block->getColumns());
 </div>
 <?php if ($block->canDisplayContainer()): ?>
 <script>
-var deps = ['mage/adminhtml/grid'];
+var deps = [];
+
+<?php if ($block->getDependencyJsObject()): ?>
+deps.push('uiRegistry');
+<?php endif; ?>
 
 <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-deps.push('Magento_Sales/order/create/form')
+deps.push('Magento_Sales/order/create/form');
 <?php endif; ?>
 
-require(deps, function(){
+deps.push('mage/adminhtml/grid');
+
+require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
     <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
+    <?php if ($block->getDependencyJsObject()): ?>
+        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+    <?php endif; ?>
+
     <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
     <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
@@ -74,6 +84,10 @@ require(deps, function(){
     <?php echo $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
 
+    <?php if ($block->getDependencyJsObject()): ?>
+    });
+    <?php endif; ?>
+
 });
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 99ae60d1dc8f9..7818706170b07 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -142,15 +142,25 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->canDisplayContainer()): ?>
 </div>
 <script>
-    var deps = ['mage/adminhtml/grid'];
+    var deps = [];
+
+    <?php if ($block->getDependencyJsObject()): ?>
+    deps.push('uiRegistry');
+    <?php endif; ?>
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-    deps.push('Magento_Sales/order/create/form');
+    deps.push('Magento_Sales/order/create/form')
     <?php endif; ?>
 
-    require(deps, function(){
+    deps.push('mage/adminhtml/grid');
+
+    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
+        <?php if ($block->getDependencyJsObject()): ?>
+            registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+        <?php endif; ?>
+
         <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
         <?php echo $block->getJsObjectName() ?>.useAjax = <?php echo $block->getUseAjax() ? 'true' : 'false' ?>;
         <?php if ($block->getRowClickCallback()): ?>
@@ -171,6 +181,10 @@ $numColumns = sizeof($block->getColumns());
         <?php echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
         <?php endif ?>
         <?php echo $block->getAdditionalJavaScript(); ?>
+
+        <?php if ($block->getDependencyJsObject()): ?>
+            });
+        <?php endif; ?>
     });
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index a094fbf83e81d..9387986ab0db7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -243,16 +243,26 @@ $numColumns = sizeof($block->getColumns());
     <?php if ($block->canDisplayContainer()): ?>
 </div>
 <script>
-    var deps = ['mage/adminhtml/grid'];
+    var deps = [];
+
+    <?php if ($block->getDependencyJsObject()): ?>
+    deps.push('uiRegistry');
+    <?php endif; ?>
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
     deps.push('Magento_Sales/order/create/form')
     <?php endif; ?>
 
-    require(deps, function(){
+    deps.push('mage/adminhtml/grid');
+
+    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         //<![CDATA[
+    <?php if ($block->getDependencyJsObject()): ?>
+        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+    <?php endif; ?>
+
     <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
     <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
@@ -269,6 +279,10 @@ $numColumns = sizeof($block->getColumns());
     <?php echo $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
     <?php echo $block->getAdditionalJavaScript(); ?>
+
+    <?php if ($block->getDependencyJsObject()): ?>
+        });
+    <?php endif; ?>
     //]]>
 
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
index aa7647e033b77..13555a95edcaf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
@@ -17,6 +17,12 @@ define(
         'use strict';
         return Component.extend({
             redirectAfterPlaceOrder: true,
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                //
+            },
             isPlaceOrderActionAllowed: ko.observable(quote.billingAddress() != null),
             /**
              * Initialize view.
@@ -63,7 +69,7 @@ define(
 
                     $.when(placeOrder).fail(function(){
                         self.isPlaceOrderActionAllowed(true);
-                    });
+                    }).done(this.afterPlaceOrder);
                     return true;
                 }
                 return false;
diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/transparent.js
index da106862b0e54..2060ca7c8ea5e 100644
--- a/app/code/Magento/Payment/view/frontend/web/transparent.js
+++ b/app/code/Magento/Payment/view/frontend/web/transparent.js
@@ -6,10 +6,9 @@
 define([
     "jquery",
     "mage/template",
-    "Magento_Checkout/js/action/set-payment-information",
     "jquery/ui",
     "Magento_Payment/js/model/credit-card-validation/validator"
-], function($, mageTemplate, setPaymentInformationAction){
+], function($, mageTemplate){
     'use strict';
 
     $.widget('mage.transparent', {
@@ -74,7 +73,6 @@ define([
          * @private
          */
         _orderSave: function() {
-            setPaymentInformationAction();
             var postData = $(this.options.paymentFormSelector).serialize();
             if ($(this.options.reviewAgreementForm).length) {
                 postData += '&' + $(this.options.reviewAgreementForm).serialize();
diff --git a/app/code/Magento/Paypal/Controller/Payflow/Form.php b/app/code/Magento/Paypal/Controller/Payflow/Form.php
index 8b5f966ce8ad3..47834722d2b21 100644
--- a/app/code/Magento/Paypal/Controller/Payflow/Form.php
+++ b/app/code/Magento/Paypal/Controller/Payflow/Form.php
@@ -1,23 +1,25 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Paypal\Controller\Payflow;
 
-class Form extends \Magento\Paypal\Controller\Payflow
+use Magento\Paypal\Controller\Payflow;
+
+/**
+ * Class Form
+ */
+class Form extends Payflow
 {
     /**
      * Submit transaction to Payflow getaway into iframe
      *
      * @return void
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function execute()
     {
         $this->getResponse()->setHeader('P3P', 'CP="CAO PSA OUR"');
         $this->_view->loadLayout(false)->renderLayout();
-        $layout = $this->_view->getLayout();
     }
 }
diff --git a/app/code/Magento/Paypal/Helper/Backend.php b/app/code/Magento/Paypal/Helper/Backend.php
index 0703923127131..90ca4db5b646d 100644
--- a/app/code/Magento/Paypal/Helper/Backend.php
+++ b/app/code/Magento/Paypal/Helper/Backend.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Paypal\Helper;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Paypal Backend helper
  */
@@ -18,21 +20,29 @@ class Backend extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @var \Magento\Config\Model\Config
      */
-    protected $_backendConfig;
+    protected $backendConfig;
+
+    /**
+     * @var \Magento\Config\Model\Config\ScopeDefiner
+     */
+    protected $scopeDefiner;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Config\Model\Config $backendConfig
+     * @param \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Directory\Helper\Data $directoryHelper,
-        \Magento\Config\Model\Config $backendConfig
+        \Magento\Config\Model\Config $backendConfig,
+        \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner
     ) {
         parent::__construct($context);
         $this->directoryHelper = $directoryHelper;
-        $this->_backendConfig = $backendConfig;
+        $this->backendConfig = $backendConfig;
+        $this->scopeDefiner = $scopeDefiner;
     }
 
     /**
@@ -44,7 +54,11 @@ public function getConfigurationCountryCode()
     {
         $countryCode  = $this->_request->getParam(\Magento\Paypal\Model\Config\StructurePlugin::REQUEST_PARAM_COUNTRY);
         if ($countryCode === null || preg_match('/^[a-zA-Z]{2}$/', $countryCode) == 0) {
-            $countryCode = $this->_backendConfig->getConfigDataValue(
+            $scope = $this->scopeDefiner->getScope();
+            if ($scope != ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
+                $this->backendConfig->setData($scope, $this->_request->getParam($scope));
+            }
+            $countryCode = $this->backendConfig->getConfigDataValue(
                 \Magento\Paypal\Block\Adminhtml\System\Config\Field\Country::FIELD_CONFIG_PATH
             );
         }
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index e894c5a39b65d..65220f0f58590 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -691,7 +691,11 @@ public function getSupportedBuyerCountryCodes()
      */
     public function getMerchantCountry()
     {
-        $countryCode = $this->_scopeConfig->getValue($this->_mapGeneralFieldset('merchant_country'));
+        $countryCode = $this->_scopeConfig->getValue(
+            $this->_mapGeneralFieldset('merchant_country'),
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $this->_storeId
+        );
         if (!$countryCode) {
             $countryCode = $this->directoryHelper->getDefaultCountry($this->_storeId);
         }
diff --git a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
index 32d4b655497f3..69e473e3c40cf 100644
--- a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
@@ -5,49 +5,80 @@
  */
 namespace Magento\Paypal\Test\Unit\Helper;
 
+use Magento\Config\Model\Config;
+use Magento\Config\Model\Config\ScopeDefiner;
+use Magento\Directory\Helper\Data;
+use Magento\Framework\App\Helper\Context;
+use Magento\Paypal\Helper\Backend;
+use Magento\Paypal\Model\Config\StructurePlugin;
+
 class BackendTest extends \PHPUnit_Framework_TestCase
 {
+    const SCOPE = 'website';
+
+    const SCOPE_ID = 1;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
     /**
      * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_request;
+    private $request;
 
     /**
-     * @var \Magento\Directory\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $directoryHelperMock;
+    private $directoryHelperMock;
 
     /**
-     * @var \Magento\Config\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_backendConfig;
+    private $backendConfig;
 
     /**
-     * @var \Magento\Paypal\Helper\Backend
+     * @var ScopeDefiner|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_helper;
+    private $scopeDefiner;
+
+    /**
+     * @var Backend
+     */
+    private $helper;
 
     public function setUp()
     {
-        $this->_request = $this->getMockForAbstractClass('Magento\Framework\App\RequestInterface');
-        $this->directoryHelperMock = $this->getMock('Magento\Directory\Helper\Data', [], [], '', false);
-        $this->_backendConfig = $this->getMock('Magento\Config\Model\Config', [], [], '', false);
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_helper = $objectManager->getObject(
-            'Magento\Paypal\Helper\Backend',
-            [
-                'httpRequest' => $this->_request,
-                'directoryHelper' => $this->directoryHelperMock,
-                'backendConfig' => $this->_backendConfig
-            ]
+        $this->context = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->request = $this->getMock('Magento\Framework\App\RequestInterface');
+        $this->context->expects(static::once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+        $this->directoryHelperMock = $this->getMockBuilder('Magento\Directory\Helper\Data')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->backendConfig = $this->getMockBuilder('Magento\Config\Model\Config')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeDefiner = $this->getMockBuilder('Magento\Config\Model\Config\ScopeDefiner')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->helper = new Backend(
+            $this->context,
+            $this->directoryHelperMock,
+            $this->backendConfig,
+            $this->scopeDefiner
         );
     }
 
     public function testGetConfigurationCountryCodeFromRequest()
     {
-        $this->_configurationCountryCodePrepareRequest('US');
-        $this->_configurationCountryCodeAssertResult('US');
+        $this->configurationCountryCodePrepareRequest('US');
+        $this->configurationCountryCodeAssertResult('US');
     }
 
     /**
@@ -56,9 +87,9 @@ public function testGetConfigurationCountryCodeFromRequest()
      */
     public function testGetConfigurationCountryCodeFromConfig($request)
     {
-        $this->_configurationCountryCodePrepareRequest($request);
-        $this->_configurationCountryCodePrepareConfig('GB');
-        $this->_configurationCountryCodeAssertResult('GB');
+        $this->configurationCountryCodePrepareRequest($request);
+        $this->configurationCountryCodePrepareConfig('GB');
+        $this->configurationCountryCodeAssertResult('GB');
     }
 
     public function getConfigurationCountryCodeFromConfigDataProvider()
@@ -77,12 +108,12 @@ public function getConfigurationCountryCodeFromConfigDataProvider()
      */
     public function testGetConfigurationCountryCodeFromDefault($request, $config, $default)
     {
-        $this->_configurationCountryCodePrepareRequest($request);
-        $this->_configurationCountryCodePrepareConfig($config);
+        $this->configurationCountryCodePrepareRequest($request);
+        $this->configurationCountryCodePrepareConfig($config);
         $this->directoryHelperMock->expects($this->once())
             ->method('getDefaultCountry')
             ->will($this->returnValue($default));
-        $this->_configurationCountryCodeAssertResult($default);
+        $this->configurationCountryCodeAssertResult($default);
     }
 
     public function getConfigurationCountryCodeFromDefaultDataProvider()
@@ -99,12 +130,16 @@ public function getConfigurationCountryCodeFromDefaultDataProvider()
      *
      * @param string|null $request
      */
-    private function _configurationCountryCodePrepareRequest($request)
+    private function configurationCountryCodePrepareRequest($request)
     {
-        $this->_request->expects($this->once())
+        $this->request->expects($this->atLeastOnce())
             ->method('getParam')
-            ->with(\Magento\Paypal\Model\Config\StructurePlugin::REQUEST_PARAM_COUNTRY)
-            ->will($this->returnValue($request));
+            ->willReturnMap(
+                [
+                    [StructurePlugin::REQUEST_PARAM_COUNTRY, null, $request],
+                    [self::SCOPE, null, self::SCOPE_ID]
+                ]
+            );
     }
 
     /**
@@ -112,12 +147,21 @@ private function _configurationCountryCodePrepareRequest($request)
      *
      * @param string|null|false $config
      */
-    private function _configurationCountryCodePrepareConfig($config)
+    private function configurationCountryCodePrepareConfig($config)
     {
-        $this->_backendConfig->expects($this->once())
+
+        $this->scopeDefiner->expects($this->once())
+            ->method('getScope')
+            ->willReturn(self::SCOPE);
+
+        $this->backendConfig->expects($this->once())
+            ->method('setData')
+            ->with(self::SCOPE, self::SCOPE_ID);
+
+        $this->backendConfig->expects($this->once())
             ->method('getConfigDataValue')
             ->with(\Magento\Paypal\Block\Adminhtml\System\Config\Field\Country::FIELD_CONFIG_PATH)
-            ->will($this->returnValue($config));
+            ->willReturn($config);
     }
 
     /**
@@ -125,8 +169,8 @@ private function _configurationCountryCodePrepareConfig($config)
      *
      * @param string $expected
      */
-    private function _configurationCountryCodeAssertResult($expected)
+    private function configurationCountryCodeAssertResult($expected)
     {
-        $this->assertEquals($expected, $this->_helper->getConfigurationCountryCode());
+        $this->assertEquals($expected, $this->helper->getConfigurationCountryCode());
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index 03df793c371cd..afc87740f302c 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -13,81 +13,106 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     /**
      * @var Config
      */
-    protected $_model;
+    private $model;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /**
      * @var \Magento\Directory\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $directoryHelper;
+    private $directoryHelper;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Payment\Model\Source\CctypeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ccTypeFactory;
+
+    /**
+     * @var \Magento\Paypal\Model\CertFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $certFactory;
 
     protected function setUp()
     {
-        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_scopeConfig = $this->getMock(
-            'Magento\Framework\App\Config\ScopeConfigInterface',
-            ['getValue', 'isSetFlag'],
-            [],
-            '',
-            false
-        );
-        $this->directoryHelper = $this->getMock('Magento\Directory\Helper\Data', ['getDefaultCountry'], [], '', false);
-        $this->_model = $helper->getObject(
-            'Magento\Paypal\Model\Config',
-            ['scopeConfig' => $this->_scopeConfig, 'directoryHelper' => $this->directoryHelper]
+        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+
+        $this->directoryHelper = $this->getMockBuilder('Magento\Directory\Helper\Data')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+
+        $this->ccTypeFactory = $this->getMockBuilder('Magento\Payment\Model\Source\CctypeFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->certFactory = $this->getMockBuilder('Magento\Paypal\Model\CertFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new Config(
+            $this->scopeConfig,
+            $this->directoryHelper,
+            $this->storeManager,
+            $this->ccTypeFactory,
+            $this->certFactory
         );
     }
 
     public function testGetCountryMethods()
     {
-        $this->assertNotContains('payflow_direct', $this->_model->getCountryMethods('GB'));
-        $this->assertContains(Config::METHOD_WPP_PE_EXPRESS, $this->_model->getCountryMethods('CA'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_EXPRESS, $this->_model->getCountryMethods('GB'));
-        $this->assertContains(Config::METHOD_WPP_PE_EXPRESS, $this->_model->getCountryMethods('CA'));
-        $this->assertContains(Config::METHOD_WPP_EXPRESS, $this->_model->getCountryMethods('DE'));
-        $this->assertContains(Config::METHOD_BILLING_AGREEMENT, $this->_model->getCountryMethods('DE'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('other'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('other'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('CA'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('CA'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('GB'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('GB'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('AU'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('AU'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('NZ'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('NZ'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('JP'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('JP'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('FR'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('FR'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('IT'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('IT'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('ES'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('ES'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('HK'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('HK'));
-        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->_model->getCountryMethods('DE'));
-        $this->assertNotContains(Config::METHOD_WPP_BML, $this->_model->getCountryMethods('DE'));
+        $this->assertNotContains('payflow_direct', $this->model->getCountryMethods('GB'));
+        $this->assertContains(Config::METHOD_WPP_PE_EXPRESS, $this->model->getCountryMethods('CA'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_EXPRESS, $this->model->getCountryMethods('GB'));
+        $this->assertContains(Config::METHOD_WPP_PE_EXPRESS, $this->model->getCountryMethods('CA'));
+        $this->assertContains(Config::METHOD_WPP_EXPRESS, $this->model->getCountryMethods('DE'));
+        $this->assertContains(Config::METHOD_BILLING_AGREEMENT, $this->model->getCountryMethods('DE'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('other'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('other'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('CA'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('CA'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('GB'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('GB'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('AU'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('AU'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('NZ'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('NZ'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('JP'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('JP'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('FR'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('FR'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('IT'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('IT'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('ES'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('ES'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('HK'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('HK'));
+        $this->assertNotContains(Config::METHOD_WPP_PE_BML, $this->model->getCountryMethods('DE'));
+        $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('DE'));
     }
 
     public function testGetBuildNotationCode()
     {
-        $this->_model->setMethod('payflow_direct');
-        $this->_model->setStoreId(123);
-        $this->_scopeConfig->expects($this->once())
+        $this->model->setMethod('payflow_direct');
+        $this->model->setStoreId(123);
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('paypal/bncode', ScopeInterface::SCOPE_STORE, 123)
             ->will($this->returnValue('some BN code'));
-        $this->assertEquals('some BN code', $this->_model->getBuildNotationCode());
+        $this->assertEquals('some BN code', $this->model->getBuildNotationCode());
     }
 
     public function testIsMethodActive()
     {
-        $this->assertFalse($this->_model->isMethodActive('payflow_direct'));
+        $this->assertFalse($this->model->isMethodActive('payflow_direct'));
     }
 
     /**
@@ -95,7 +120,7 @@ public function testIsMethodActive()
      */
     public function testIsMethodAvailableWPPPE()
     {
-        $this->assertFalse($this->_model->isMethodAvailable('payflow_direct'));
+        $this->assertFalse($this->model->isMethodAvailable('payflow_direct'));
     }
 
     /**
@@ -103,17 +128,52 @@ public function testIsMethodAvailableWPPPE()
      */
     public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
     {
-        $this->_scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->with('paypal/general/merchant_country')
             ->will($this->returnValue('US'));
-        $this->_scopeConfig->expects($this->exactly(2))
+        $this->scopeConfig->expects($this->exactly(2))
             ->method('isSetFlag')
             ->withAnyParameters()
             ->will($this->returnValue(true));
 
-        $this->_model->setMethod($methodName);
-        $this->assertEquals($expected, $this->_model->isMethodAvailable($methodName));
+        $this->model->setMethod($methodName);
+        $this->assertEquals($expected, $this->model->isMethodAvailable($methodName));
+    }
+
+
+    public function testGetMerchantCountryPaypal()
+    {
+        $this->scopeConfig->expects(static::once())
+            ->method('getValue')
+            ->with(
+                'paypal/general/merchant_country',
+                ScopeInterface::SCOPE_STORE,
+                null
+            )->willReturn('US');
+
+        $this->directoryHelper->expects(static::never())
+            ->method('getDefaultCountry');
+
+        static::assertEquals('US', $this->model->getMerchantCountry());
+    }
+
+    public function testGetMerchantCountryGeneral()
+    {
+        $this->scopeConfig->expects(static::once())
+            ->method('getValue')
+            ->with(
+                'paypal/general/merchant_country',
+                ScopeInterface::SCOPE_STORE,
+                null
+            )->willReturn(null);
+
+        $this->directoryHelper->expects(static::once())
+            ->method('getDefaultCountry')
+            ->with(null)
+            ->willReturn('US');
+
+        static::assertEquals('US', $this->model->getMerchantCountry());
     }
 
     /**
@@ -131,44 +191,44 @@ public function isMethodAvailableDataProvider()
 
     public function testIsCreditCardMethod()
     {
-        $this->assertFalse($this->_model->getIsCreditCardMethod('payflow_direct'));
+        $this->assertFalse($this->model->getIsCreditCardMethod('payflow_direct'));
     }
 
     public function testGetSpecificConfigPath()
     {
-        $this->_model->setMethod('payflow_direct');
-        $this->assertNull($this->_model->getValue('useccv'));
-        $this->assertNull($this->_model->getValue('vendor'));
+        $this->model->setMethod('payflow_direct');
+        $this->assertNull($this->model->getValue('useccv'));
+        $this->assertNull($this->model->getValue('vendor'));
 
         // _mapBmlFieldset
-        $this->_model->setMethod(Config::METHOD_WPP_BML);
-        $this->_scopeConfig->expects($this->once())
+        $this->model->setMethod(Config::METHOD_WPP_BML);
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_WPP_EXPRESS . '/allow_ba_signup')
             ->will($this->returnValue(1));
-        $this->assertEquals(1, $this->_model->getValue('allow_ba_signup'));
+        $this->assertEquals(1, $this->model->getValue('allow_ba_signup'));
     }
 
     public function testGetSpecificConfigPathPayflow()
     {
         // _mapBmlPayflowFieldset
-        $this->_model->setMethod(Config::METHOD_WPP_PE_BML);
-        $this->_scopeConfig->expects($this->once())
+        $this->model->setMethod(Config::METHOD_WPP_PE_BML);
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_WPP_PE_EXPRESS . '/allow_ba_signup')
             ->will($this->returnValue(1));
-        $this->assertEquals(1, $this->_model->getValue('allow_ba_signup'));
+        $this->assertEquals(1, $this->model->getValue('allow_ba_signup'));
     }
 
     public function testGetSpecificConfigPathPayflowAdvancedLink()
     {
         // _mapWpukFieldset
-        $this->_model->setMethod(Config::METHOD_PAYFLOWADVANCED);
-        $this->_scopeConfig->expects($this->once())
+        $this->model->setMethod(Config::METHOD_PAYFLOWADVANCED);
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_PAYFLOWADVANCED . '/payment_action')
             ->willReturn('Authorization');
-        $this->assertEquals('Authorization', $this->_model->getValue('payment_action'));
+        $this->assertEquals('Authorization', $this->model->getValue('payment_action'));
     }
 
     /**
@@ -176,11 +236,11 @@ public function testGetSpecificConfigPathPayflowAdvancedLink()
      */
     public function testGetPayPalBasicStartUrl($value, $url)
     {
-        $this->_scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/paypal_express/skip_order_review_step')
             ->will($this->returnValue($value));
-        $this->assertEquals($url, $this->_model->getPayPalBasicStartUrl('token'));
+        $this->assertEquals($url, $this->model->getPayPalBasicStartUrl('token'));
     }
 
     /**
@@ -197,16 +257,16 @@ public function skipOrderReviewStepDataProvider()
     public function testGetExpressCheckoutOrderUrl()
     {
         $url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&order_id=orderId';
-        $this->assertEquals($url, $this->_model->getExpressCheckoutOrderUrl('orderId'));
+        $this->assertEquals($url, $this->model->getExpressCheckoutOrderUrl('orderId'));
     }
 
     public function testGetBmlPublisherId()
     {
-        $this->_scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_WPP_BML . '/publisher_id')
             ->will($this->returnValue('12345'));
-        $this->assertEquals('12345', $this->_model->getBmlPublisherId());
+        $this->assertEquals('12345', $this->model->getBmlPublisherId());
     }
 
     /**
@@ -214,11 +274,11 @@ public function testGetBmlPublisherId()
      */
     public function testGetBmlPosition($section, $expected)
     {
-        $this->_scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_WPP_BML . '/' . $section . '_position')
             ->will($this->returnValue($expected));
-        $this->assertEquals($expected, $this->_model->getBmlPosition($section));
+        $this->assertEquals($expected, $this->model->getBmlPosition($section));
     }
 
     /**
@@ -237,11 +297,11 @@ public function getBmlPositionDataProvider()
      */
     public function testGetBmlSize($section, $expected)
     {
-        $this->_scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->once())
             ->method('getValue')
             ->with('payment/' . Config::METHOD_WPP_BML . '/' . $section . '_size')
             ->will($this->returnValue($expected));
-        $this->assertEquals($expected, $this->_model->getBmlSize($section));
+        $this->assertEquals($expected, $this->model->getBmlSize($section));
     }
 
     /**
@@ -260,22 +320,22 @@ public function getBmlSizeDataProvider()
      */
     public function testGetBmlDisplay($section, $expectedValue, $expectedFlag, $expected)
     {
-        $this->_model->setStoreId(1);
+        $this->model->setStoreId(1);
         $this->directoryHelper->expects($this->any())
             ->method('getDefaultCountry')
             ->with(1)
             ->will($this->returnValue('US'));
-        $this->_scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
             ->will($this->returnValue($expectedFlag));
-        $this->_scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->will($this->returnValueMap([
                 ['payment/' . Config::METHOD_WPP_BML . '/' . $section . '_display', 'store', 1, $expectedValue],
                 ['payment/' . Config::METHOD_WPP_BML . '/active', 'store', 1, $expectedValue],
                 ['payment/' . Config::METHOD_WPP_PE_BML . '/active', 'store', 1, $expectedValue],
             ]));
-        $this->assertEquals($expected, $this->_model->getBmlDisplay($section));
+        $this->assertEquals($expected, $this->model->getBmlDisplay($section));
     }
 
     /**
@@ -310,10 +370,10 @@ public function testGetExpressCheckoutShortcutImageUrl(
         $buttonType,
         $result
     ) {
-        $this->_model->setMethod(Config::METHOD_WPP_EXPRESS);
-        $this->_model->setStoreId(123);
+        $this->model->setMethod(Config::METHOD_WPP_EXPRESS);
+        $this->model->setStoreId(123);
 
-        $this->_scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->willReturnMap([
                 ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
@@ -323,7 +383,7 @@ public function testGetExpressCheckoutShortcutImageUrl(
 
         $this->assertEquals(
             $result,
-            $this->_model->getExpressCheckoutShortcutImageUrl($localeCode, $orderTotal, $pal)
+            $this->model->getExpressCheckoutShortcutImageUrl($localeCode, $orderTotal, $pal)
         );
     }
 
@@ -378,10 +438,10 @@ public function testGetPaymentMarkImageUrl(
         $sandboxFlag,
         $result
     ) {
-        $this->_model->setMethod(Config::METHOD_WPP_EXPRESS);
-        $this->_model->setStoreId(123);
+        $this->model->setMethod(Config::METHOD_WPP_EXPRESS);
+        $this->model->setStoreId(123);
 
-        $this->_scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->willReturnMap([
                 ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
@@ -390,7 +450,7 @@ public function testGetPaymentMarkImageUrl(
 
         $this->assertEquals(
             $result,
-            $this->_model->getPaymentMarkImageUrl($localeCode, $orderTotal, $pal, $staticSize)
+            $this->model->getPaymentMarkImageUrl($localeCode, $orderTotal, $pal, $staticSize)
         );
     }
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
index 85d1c701fa005..ab13dd5647ae0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
@@ -13,10 +13,20 @@ define(
 
         return Component.extend({
             defaults: {
-                template: 'Magento_Paypal/payment/iframe-methods'
+                template: 'Magento_Paypal/payment/iframe-methods',
+                paymentReady: false
             },
             redirectAfterPlaceOrder: false,
             isInAction: iframe.isInAction,
+            initObservable: function () {
+                this._super()
+                    .observe('paymentReady');
+
+                return this;
+            },
+            isPaymentReady: function () {
+                return this.paymentReady();
+            },
             /**
              * Get action url for payment method iframe.
              * @returns {String}
@@ -28,6 +38,10 @@ define(
              * Places order in pending payment status.
              */
             placePendingPaymentOrder: function () {
+                var self = this;
+                this.afterPlaceOrder = function () {
+                    self.paymentReady(true);
+                };
                 if (this.placeOrder()) {
                     this.isInAction(true);
                     // capture all click events
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
index 81c41a741acb3..0e6ce4bebd2c4 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
@@ -5,9 +5,11 @@
 /*global define*/
 define(
     [
-        'Magento_Payment/js/view/payment/iframe'
+        'jquery',
+        'Magento_Payment/js/view/payment/iframe',
+        'Magento_Checkout/js/action/set-payment-information'
     ],
-    function (Component) {
+    function ($, Component, setPaymentInformationAction) {
         'use strict';
 
         return Component.extend({
@@ -42,8 +44,14 @@ define(
             },
 
             placeOrder: function() {
+                var self = this;
                 if (this.validateHandler()) {
-                    this.placeOrderHandler();
+                    this.isPlaceOrderActionAllowed(false);
+                    $.when(setPaymentInformationAction()).done(function() {
+                        self.placeOrderHandler();
+                    }).fail(function() {
+                        self.isPlaceOrderActionAllowed(true);
+                    });
                 }
             }
         });
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
index e82657ef85bad..0df570ec9c390 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
@@ -37,6 +37,7 @@
             <div id="iframe-warning" class="message notice">
                 <div><!-- ko text: $t('Please do not refresh the page until you complete payment.') --><!-- /ko --></div>
             </div>
+            <!-- ko if: isPaymentReady() -->
             <iframe data-bind="attr: {id: getCode() + '-iframe', src: getActionUrl()}"
                     data-container="paypal-iframe"
                     class="paypal iframe"
@@ -45,9 +46,9 @@
                     border="0"
                     height="610"
                     width="100%"
-            >
+                    >
             </iframe>
+            <!-- /ko -->
         </div>
     </div>
 </div>
-