diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index e9e00749a4fb2..12eb318e92f5e 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -56,9 +58,9 @@ public function __construct(
     protected function _getConfigUrl()
     {
         $output = '';
-        $defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $defaultUnsecure = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
-        $defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
+        $defaultSecure = $this->_config->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
 
         if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
             $defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index 3a966391c75cb..378596188378e 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -93,7 +95,7 @@ private function _canShowNotification()
      */
     private function _isFileAccessible()
     {
-        $unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
         /** @var $http \Magento\Framework\HTTP\Adapter\Curl */
         $http = $this->_curlFactory->create();
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 2d793e5632e9c..6efb27722a57e 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -72,7 +72,7 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
     protected $_canUseBaseUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
diff --git a/app/code/Magento/Backend/App/Action/Context.php b/app/code/Magento/Backend/App/Action/Context.php
index ceae4ef4bf04e..0630d8213d241 100644
--- a/app/code/Magento/Backend/App/Action/Context.php
+++ b/app/code/Magento/Backend/App/Action/Context.php
@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\App\Action\Context
     protected $_backendUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\Helper\Data $helper
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $canUseBaseUrl
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
         \Magento\Backend\Model\Auth $auth,
         \Magento\Backend\Helper\Data $helper,
         \Magento\Backend\Model\UrlInterface $backendUrl,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         $canUseBaseUrl = false
     ) {
@@ -146,7 +146,7 @@ public function getCanUseBaseUrl()
     }
 
     /**
-     * @return \Magento\Core\App\Action\FormKeyValidator
+     * @return \Magento\Framework\Data\Form\FormKey\Validator
      */
     public function getFormKeyValidator()
     {
diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
index 3ae734acb76f9..fbcacd862a219 100644
--- a/app/code/Magento/Backend/App/Router.php
+++ b/app/code/Magento/Backend/App/Router.php
@@ -8,7 +8,7 @@
  */
 namespace Magento\Backend\App;
 
-class Router extends \Magento\Core\App\Router\Base
+class Router extends \Magento\Framework\App\Router\Base
 {
     /**
      * @var \Magento\Backend\App\ConfigInterface
@@ -53,11 +53,9 @@ class Router extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      *
@@ -70,11 +68,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
@@ -85,11 +81,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $storeManager,
-            $scopeConfig,
-            $urlSecurityInfo,
             $routerId,
-            $nameBuilder
+            $nameBuilder,
+            $pathConfig
         );
         $this->_coreConfig = $coreConfig;
         $this->_backendConfig = $backendConfig;
diff --git a/app/code/Magento/Backend/Block/System/Cache/Form.php b/app/code/Magento/Backend/Block/System/Cache/Form.php
index fb098810898de..7265e5336ed71 100644
--- a/app/code/Magento/Backend/Block/System/Cache/Form.php
+++ b/app/code/Magento/Backend/Block/System/Cache/Form.php
@@ -13,25 +13,25 @@
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\App\Cache\TypeListInterface
      */
-    protected $_coreData;
+    protected $cacheTypeList;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         array $data = []
     ) {
-        $this->_coreData = $coreData;
+        $this->cacheTypeList = $cacheTypeList;
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -63,7 +63,7 @@ public function initForm()
             ]
         );
 
-        foreach ($this->_coreData->getCacheTypes() as $type => $label) {
+        foreach ($this->cacheTypeList->getTypeLabels() as $type => $label) {
             $fieldset->addField(
                 'enable_' . $type,
                 'checkbox',
diff --git a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
index d788419b38025..2e8c60f95bab0 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
@@ -5,12 +5,10 @@
  */
 namespace Magento\Backend\Helper\Dashboard;
 
-use Magento\Core\Helper\Data as HelperData;
-
 /**
  * Adminhtml abstract  dashboard helper.
  */
-abstract class AbstractDashboard extends HelperData
+abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Helper collection
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index 17cffb3f53c45..c72171c9199e6 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -10,7 +10,7 @@
 /**
  * Data helper for dashboard
  */
-class Data extends \Magento\Core\Helper\Data
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\Framework\Data\Collection\Db
@@ -27,33 +27,26 @@ class Data extends \Magento\Core\Helper\Data
      */
     const INSTALL_DATE = 'install/date';
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $_storeManager;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param DeploymentConfig $deploymentConfig
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        DeploymentConfig $deploymentConfig,
-        $dbCompatibleMode = true
+        DeploymentConfig $deploymentConfig
     ) {
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
         $this->_installDate = $deploymentConfig->get(self::INSTALL_DATE);
+        $this->_storeManager = $storeManager;
     }
 
     /**
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index 899e2b2ee6e04..df9396bbe3247 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -17,30 +17,15 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        \Magento\Reports\Model\Resource\Order\Collection $orderCollection,
-        $dbCompatibleMode = true
+        \Magento\Reports\Model\Resource\Order\Collection $orderCollection
     ) {
         $this->_orderCollection = $orderCollection;
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/Config.php b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
index 6817f9e166a73..c78299439efc7 100644
--- a/app/code/Magento/Backend/Model/Translate/Inline/Config.php
+++ b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
@@ -13,21 +13,23 @@ class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
     /**
      * @var \Magento\Backend\App\ConfigInterface
      */
-    protected $_config;
+    protected $config;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Developer\Helper\Data
      */
-    protected $_helper;
+    protected $devHelper;
 
     /**
      * @param \Magento\Backend\App\ConfigInterface $config
-     * @param \Magento\Core\Helper\Data $helper
+     * @param \Magento\Developer\Helper\Data $devHelper
      */
-    public function __construct(\Magento\Backend\App\ConfigInterface $config, \Magento\Core\Helper\Data $helper)
-    {
-        $this->_config = $config;
-        $this->_helper = $helper;
+    public function __construct(
+        \Magento\Backend\App\ConfigInterface $config,
+        \Magento\Developer\Helper\Data $devHelper
+    ) {
+        $this->config = $config;
+        $this->devHelper = $devHelper;
     }
 
     /**
@@ -35,7 +37,7 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config, \Magen
      */
     public function isActive($scope = null)
     {
-        return $this->_config->isSetFlag('dev/translate_inline/active_admin');
+        return $this->config->isSetFlag('dev/translate_inline/active_admin');
     }
 
     /**
@@ -43,6 +45,6 @@ public function isActive($scope = null)
      */
     public function isDevAllowed($scope = null)
     {
-        return $this->_helper->isDevAllowed($scope);
+        return $this->devHelper->isDevAllowed($scope);
     }
 }
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index c7550ac85fd96..29dfc0423c490 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -6,6 +6,7 @@
         "magento/module-store": "0.42.0-beta8",
         "magento/module-directory": "0.42.0-beta8",
         "magento/module-core": "0.42.0-beta8",
+        "magento/module-developer": "0.42.0-beta8",
         "magento/module-eav": "0.42.0-beta8",
         "magento/module-cron": "0.42.0-beta8",
         "magento/module-theme": "0.42.0-beta8",
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 3fbebc9a79a4d..0028de483092f 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -8,8 +8,6 @@
 
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
-use Magento\Bundle\Model\Product\Price;
-
 /**
  * Bundle option renderer
  */
@@ -30,9 +28,9 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
     protected $_showSingle;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $_coreHelper;
+    protected $pricingHelper;
 
     /**
      * @var \Magento\Tax\Helper\Data
@@ -53,7 +51,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param \Magento\Tax\Helper\Data $taxData
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -67,10 +65,10 @@ public function __construct(
         \Magento\Framework\Math\Random $mathRandom,
         \Magento\Checkout\Helper\Cart $cartHelper,
         \Magento\Tax\Helper\Data $taxData,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         array $data = []
     ) {
-        $this->_coreHelper = $coreHelper;
+        $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
         $this->_taxHelper = $taxData;
         parent::__construct(
@@ -248,7 +246,7 @@ public function getSelectionPrice($selection)
                 1
             );
             if (is_numeric($price)) {
-                $price = $this->_coreHelper->currencyByStore($price, $store, false);
+                $price = $this->pricingHelper->currencyByStore($price, $store, false);
             }
         }
         return is_numeric($price) ? $price : 0;
diff --git a/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
index 577c518d1e611..55a9f0c6724e5 100644
--- a/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php
@@ -17,9 +17,9 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
     /**
      * Core data
      *
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $coreData;
+    protected $pricingHelper;
 
     /**
      * Catalog product configuration
@@ -38,17 +38,17 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfiguration
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Framework\Escaper $escaper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Catalog\Helper\Product\Configuration $productConfiguration,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Framework\Escaper $escaper
     ) {
         $this->productConfiguration = $productConfiguration;
-        $this->coreData = $coreData;
+        $this->pricingHelper = $pricingHelper;
         $this->escaper = $escaper;
         parent::__construct($context);
     }
@@ -139,7 +139,9 @@ public function getBundleOptions(ItemInterface $item)
                                 $option['value'][] = $qty . ' x '
                                     . $this->escaper->escapeHtml($bundleSelection->getName())
                                     . ' '
-                                    . $this->coreData->currency($this->getSelectionFinalPrice($item, $bundleSelection));
+                                    . $this->pricingHelper->currency(
+                                        $this->getSelectionFinalPrice($item, $bundleSelection)
+                                    );
                             }
                         }
 
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index b14a7d9292e62..e3dbc53bac480 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -144,7 +144,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Registry $coreRegistry
@@ -170,7 +169,6 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Registry $coreRegistry,
@@ -206,7 +204,6 @@ public function __construct(
             $eavConfig,
             $catalogProductType,
             $eventManager,
-            $coreData,
             $fileStorageDb,
             $filesystem,
             $coreRegistry,
diff --git a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
index d1b3d77da6c3d..4cd99cbceee50 100644
--- a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
+++ b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
@@ -21,7 +21,6 @@ class Data extends \Magento\Captcha\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManager $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Captcha\Model\CaptchaFactory $factory
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
@@ -29,13 +28,12 @@ class Data extends \Magento\Captcha\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManager $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Captcha\Model\CaptchaFactory $factory,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
         $this->_backendConfig = $backendConfig;
-        parent::__construct($context, $storeManager, $config, $filesystem, $factory);
+        parent::__construct($context, $storeManager, $filesystem, $factory);
     }
 
     /**
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index 47c0ad3a56bb0..922595252b905 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -44,11 +44,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_captcha = [];
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_config;
-
     /**
      * @var Filesystem
      */
@@ -67,19 +62,16 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param Filesystem $filesystem
      * @param \Magento\Captcha\Model\CaptchaFactory $factory
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
         Filesystem $filesystem,
         \Magento\Captcha\Model\CaptchaFactory $factory
     ) {
         $this->_storeManager = $storeManager;
-        $this->_config = $config;
         $this->_filesystem = $filesystem;
         $this->_factory = $factory;
         parent::__construct($context);
@@ -115,7 +107,7 @@ public function getCaptcha($formId)
      */
     public function getConfig($key, $store = null)
     {
-        return $this->_config->getValue(
+        return $this->scopeConfig->getValue(
             'customer/captcha/' . $key,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -132,7 +124,7 @@ public function getConfig($key, $store = null)
      */
     public function getFonts()
     {
-        $fontsConfig = $this->_config->getValue(\Magento\Captcha\Helper\Data::XML_PATH_CAPTCHA_FONTS, 'default');
+        $fontsConfig = $this->scopeConfig->getValue(\Magento\Captcha\Helper\Data::XML_PATH_CAPTCHA_FONTS, 'default');
         $fonts = [];
         if ($fontsConfig) {
             $libDir = $this->_filesystem->getDirectoryRead(DirectoryList::LIB_INTERNAL);
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
index 0a830a078df72..f80bdede71af3 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
@@ -47,9 +47,9 @@ class Options extends \Magento\Framework\View\Element\Template
     protected $_jsonEncoder;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $_coreData;
+    protected $pricingHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Data
@@ -58,7 +58,7 @@ class Options extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Catalog\Model\Product\Option $option
@@ -68,7 +68,7 @@ class Options extends \Magento\Framework\View\Element\Template
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Catalog\Model\Product\Option $option,
@@ -76,7 +76,7 @@ public function __construct(
         \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         array $data = []
     ) {
-        $this->_coreData = $coreData;
+        $this->pricingHelper = $pricingHelper;
         $this->_catalogData = $catalogData;
         $this->_jsonEncoder = $jsonEncoder;
         $this->_registry = $registry;
@@ -155,11 +155,11 @@ public function hasOptions()
      */
     protected function _getPriceConfiguration($option)
     {
-        $optionPrice = $this->_coreData->currency($option->getPrice(true), false, false);
+        $optionPrice = $this->pricingHelper->currency($option->getPrice(true), false, false);
         $data = [
             'prices' => [
                 'oldPrice' => [
-                    'amount' => $this->_coreData->currency($option->getPrice(false), false, false),
+                    'amount' => $this->pricingHelper->currency($option->getPrice(false), false, false),
                     'adjustments' => [],
                 ],
                 'basePrice' => [
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 56874d583125f..58ab8d2db8b1c 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -30,9 +30,9 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
     protected $_option;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $_coreHelper;
+    protected $pricingHelper;
 
     /**
      * @var \Magento\Catalog\Helper\Data
@@ -41,17 +41,17 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData,
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
         array $data = []
     ) {
-        $this->_coreHelper = $coreHelper;
+        $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
         parent::__construct($context, $data);
     }
@@ -179,6 +179,6 @@ public function getPrice($price, $includingTax = null)
     public function getCurrencyPrice($price)
     {
         $store = $this->getProduct()->getStore();
-        return $this->_coreHelper->currencyByStore($price, $store, false);
+        return $this->pricingHelper->currencyByStore($price, $store, false);
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index 4cdd4984ff31a..bac018a247f34 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -29,20 +29,20 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Catalog\Model\Product\Option\Type\Date $catalogProductOptionTypeDate
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Catalog\Model\Product\Option\Type\Date $catalogProductOptionTypeDate,
         array $data = []
     ) {
         $this->_catalogProductOptionTypeDate = $catalogProductOptionTypeDate;
-        parent::__construct($context, $coreHelper, $catalogData, $data);
+        parent::__construct($context, $pricingHelper, $catalogData, $data);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index d2c8f141aefab..2ee644bacd6a6 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -13,27 +13,6 @@
 
 class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
-    /**
-     * @var \Magento\Core\Helper\Data
-     */
-    protected $_coreHelper;
-
-    /**
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreHelper
-     * @param \Magento\Catalog\Helper\Data $catalogData
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreHelper,
-        \Magento\Catalog\Helper\Data $catalogData,
-        array $data = []
-    ) {
-        $this->_coreHelper = $coreHelper;
-        parent::__construct($context, $coreHelper, $catalogData, $data);
-    }
-
     /**
      * Return html for control element
      *
@@ -78,7 +57,7 @@ public function getValuesHtml()
                 $select->addOption(
                     $_value->getOptionTypeId(),
                     $_value->getTitle() . ' ' . $priceStr . '',
-                    ['price' => $this->_coreHelper->currencyByStore($_value->getPrice(true), $store, false)]
+                    ['price' => $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false)]
                 );
             }
             if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_MULTIPLE) {
@@ -169,7 +148,7 @@ public function getValuesHtml()
                     '" ' .
                     $checked .
                     ' price="' .
-                    $this->_coreHelper->currencyByStore($_value->getPrice(true), $store, false) .
+                    $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
                     '" />' .
                     '<label class="label" for="options_' .
                     $_option->getId() .
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 4e934b0685e69..441646f6e71e1 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Controller\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Controller\Result;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -73,7 +73,7 @@ class Compare extends \Magento\Framework\App\Action\Action
     protected $_storeManager;
 
     /**
-     * @var FormKeyValidator
+     * @var Validator
      */
     protected $_formKeyValidator;
 
@@ -103,7 +103,7 @@ class Compare extends \Magento\Framework\App\Action\Action
      * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
      * @param \Magento\Catalog\Model\Session $catalogSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param FormKeyValidator $formKeyValidator
+     * @param Validator $formKeyValidator
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param ProductRepositoryInterface $productRepository
@@ -118,7 +118,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
         \Magento\Catalog\Model\Session $catalogSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        FormKeyValidator $formKeyValidator,
+        Validator $formKeyValidator,
         Result\RedirectFactory $resultRedirectFactory,
         PageFactory $resultPageFactory,
         ProductRepositoryInterface $productRepository
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index aa311afa1c330..93b985ec094a5 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Controller\Product\Compare;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Controller\Result;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -30,7 +30,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
      * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
      * @param \Magento\Catalog\Model\Session $catalogSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param FormKeyValidator $formKeyValidator
+     * @param Validator $formKeyValidator
      * @param Result\RedirectFactory $resultRedirectFactory
      * @param PageFactory $resultPageFactory
      * @param ProductRepositoryInterface $productRepository
@@ -47,7 +47,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
         \Magento\Catalog\Model\Session $catalogSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        FormKeyValidator $formKeyValidator,
+        Validator $formKeyValidator,
         Result\RedirectFactory $resultRedirectFactory,
         PageFactory $resultPageFactory,
         ProductRepositoryInterface $productRepository,
diff --git a/app/code/Magento/Catalog/Helper/Catalog.php b/app/code/Magento/Catalog/Helper/Catalog.php
index ac7c921361563..f345c85ceb2ea 100644
--- a/app/code/Magento/Catalog/Helper/Catalog.php
+++ b/app/code/Magento/Catalog/Helper/Catalog.php
@@ -26,27 +26,6 @@ class Catalog extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_categoryAttributeTabBlock;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        parent::__construct($context);
-    }
-
     /**
      * Retrieve Attribute Tab Block Name for Product Edit
      *
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/app/code/Magento/Catalog/Helper/Category.php
index 04492509b595c..271a320a36e9a 100644
--- a/app/code/Magento/Catalog/Helper/Category.php
+++ b/app/code/Magento/Catalog/Helper/Category.php
@@ -29,13 +29,6 @@ class Category extends AbstractHelper
      */
     protected $_storeCategories = [];
 
-    /**
-     * Scope config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * Store manager
      *
@@ -66,7 +59,6 @@ class Category extends AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
      * @param CategoryRepositoryInterface $categoryRepository
      */
@@ -74,14 +66,12 @@ public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
         CategoryRepositoryInterface $categoryRepository
     ) {
         $this->_categoryFactory = $categoryFactory;
         $this->_storeManager = $storeManager;
         $this->_dataCollectionFactory = $dataCollectionFactory;
-        $this->_scopeConfig = $scopeConfig;
         $this->categoryRepository = $categoryRepository;
         parent::__construct($context);
     }
@@ -116,7 +106,7 @@ public function getStoreCategories($sorted = false, $asCollection = false, $toLo
 
         $recursionLevel = max(
             0,
-            (int)$this->_scopeConfig->getValue(
+            (int)$this->scopeConfig->getValue(
                 'catalog/navigation/max_depth',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
@@ -179,7 +169,7 @@ public function canShow($category)
      */
     public function canUseCanonicalTag($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_USE_CATEGORY_CANONICAL_TAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 7e4d6732ae26f..1ac6cf797e21a 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -174,7 +174,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param Category $catalogCategory
      * @param Product $catalogProduct
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Catalog\Model\Template\Filter\Factory $templateFilterFactory
      * @param string $templateFilterModel
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyFactory
@@ -196,7 +195,6 @@ public function __construct(
         Category $catalogCategory,
         Product $catalogProduct,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Catalog\Model\Template\Filter\Factory $templateFilterFactory,
         $templateFilterModel,
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyFactory,
@@ -215,7 +213,6 @@ public function __construct(
         $this->string = $string;
         $this->_catalogCategory = $catalogCategory;
         $this->_catalogProduct = $catalogProduct;
-        $this->_scopeConfig = $scopeConfig;
         $this->_coreRegistry = $coreRegistry;
         $this->_templateFilterModel = $templateFilterModel;
         $this->_taxClassKeyFactory = $taxClassKeyFactory;
@@ -386,7 +383,7 @@ public function getAttributeHiddenFields()
      */
     public function getPriceScope()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_PRICE_SCOPE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -409,7 +406,7 @@ public function isPriceGlobal()
      */
     public function isUsingStaticUrlsAllowed()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::CONFIG_USE_STATIC_URLS,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
@@ -423,7 +420,7 @@ public function isUsingStaticUrlsAllowed()
      */
     public function isUrlDirectivesParsingAllowed()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::CONFIG_PARSE_URL_DIRECTIVES,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
@@ -447,7 +444,7 @@ public function getPageTemplateProcessor()
      */
     public function shouldDisplayProductCountOnLayer($storeId = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 4f1afb10f4ba2..3d90ae634bd52 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -94,13 +94,6 @@ class Image extends AbstractHelper
      */
     protected $_assetRepo;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * Product image factory
      *
@@ -112,17 +105,14 @@ class Image extends AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\Product\ImageFactory $productImageFactory
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Catalog\Model\Product\ImageFactory $productImageFactory,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\View\Asset\Repository $assetRepo
     ) {
         $this->_productImageFactory = $productImageFactory;
         parent::__construct($context);
-        $this->_scopeConfig = $scopeConfig;
         $this->_assetRepo = $assetRepo;
     }
 
@@ -162,25 +152,25 @@ public function init(\Magento\Catalog\Model\Product $product, $attributeName, $i
         $this->setProduct($product);
 
         $this->setWatermark(
-            $this->_scopeConfig->getValue(
+            $this->scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_image",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkImageOpacity(
-            $this->_scopeConfig->getValue(
+            $this->scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkPosition(
-            $this->_scopeConfig->getValue(
+            $this->scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_position",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkSize(
-            $this->_scopeConfig->getValue(
+            $this->scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_size",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index b18e4b6b2f0d1..c3e07058bfcb4 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -62,18 +62,6 @@ class Product extends \Magento\Core\Helper\Url
      */
     protected $_attributeConfig;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_coreConfig;
-
     /**
      * Catalog session
      *
@@ -112,8 +100,6 @@ class Product extends \Magento\Core\Helper\Url
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param string $typeSwitcherLabel
      * @param array $reindexPriceIndexerData
      * @param array $reindexProductCategoryIndexerData
@@ -128,8 +114,6 @@ public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Catalog\Model\Attribute\Config $attributeConfig,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         $typeSwitcherLabel,
         $reindexPriceIndexerData,
         $reindexProductCategoryIndexerData,
@@ -140,9 +124,7 @@ public function __construct(
         $this->_typeSwitcherLabel = $typeSwitcherLabel;
         $this->_attributeConfig = $attributeConfig;
         $this->_coreRegistry = $coreRegistry;
-        $this->_scopeConfig = $scopeConfig;
         $this->_assetRepo = $assetRepo;
-        $this->_coreConfig = $coreConfig;
         $this->_reindexPriceIndexerData = $reindexPriceIndexerData;
         $this->productRepository = $productRepository;
         $this->categoryRepository = $categoryRepository;
@@ -339,7 +321,7 @@ public function canShow($product, $where = 'catalog')
      */
     public function canUseCanonicalTag($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_USE_PRODUCT_CANONICAL_TAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -584,7 +566,7 @@ public function getSkipSaleableCheck()
      */
     public function getFieldsAutogenerationMasks()
     {
-        return $this->_coreConfig->getValue(Product::XML_PATH_AUTO_GENERATE_MASK, 'default');
+        return $this->scopeConfig->getValue(Product::XML_PATH_AUTO_GENERATE_MASK, 'default');
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 2ec3557b2a79f..f48cd19ea854d 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -95,11 +95,6 @@ abstract class AbstractType
      */
     protected $_filesystem;
 
-    /**
-     * @var \Magento\Core\Helper\Data
-     */
-    protected $_coreData;
-
     /**
      * @var \Magento\Core\Helper\File\Storage\Database
      */
@@ -165,7 +160,6 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Registry $coreRegistry
@@ -178,7 +172,6 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Registry $coreRegistry,
@@ -190,7 +183,6 @@ public function __construct(
         $this->_catalogProductType = $catalogProductType;
         $this->_coreRegistry = $coreRegistry;
         $this->_eventManager = $eventManager;
-        $this->_coreData = $coreData;
         $this->_fileStorageDb = $fileStorageDb;
         $this->_filesystem = $filesystem;
         $this->_logger = $logger;
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 04aaf4b495b31..f9dfa3dec43e9 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -15,7 +15,7 @@ class Onepage extends \Magento\Checkout\Block\Onepage\AbstractOnepage
 {
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -30,7 +30,7 @@ class Onepage extends \Magento\Checkout\Block\Onepage\AbstractOnepage
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -44,7 +44,7 @@ public function __construct(
     ) {
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $configCacheType,
             $customerSession,
             $resourceSession,
diff --git a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
index 941b0425c66f4..d01fba45ca5c0 100644
--- a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
@@ -64,9 +64,9 @@ abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
     protected $_countryCollectionFactory;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Directory\Helper\Data
      */
-    protected $_coreData;
+    protected $directoryHelper;
 
     /**
      * @var CustomerRepositoryInterface
@@ -90,7 +90,7 @@ abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -105,7 +105,7 @@ abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -117,7 +117,7 @@ public function __construct(
         \Magento\Customer\Model\Address\Mapper $addressMapper,
         array $data = []
     ) {
-        $this->_coreData = $coreData;
+        $this->directoryHelper = $directoryHelper;
         $this->_configCacheType = $configCacheType;
         $this->_customerSession = $customerSession;
         $this->_checkoutSession = $resourceSession;
@@ -282,7 +282,7 @@ public function getCountryHtmlSelect($type)
     {
         $countryId = $this->getAddress()->getCountryId();
         if (is_null($countryId)) {
-            $countryId = $this->_coreData->getDefaultCountry();
+            $countryId = $this->directoryHelper->getDefaultCountry();
         }
         $select = $this->getLayout()->createBlock(
             'Magento\Framework\View\Element\Html\Select'
diff --git a/app/code/Magento/Checkout/Block/Onepage/Billing.php b/app/code/Magento/Checkout/Block/Onepage/Billing.php
index 13730ef9d302e..6e5212822424c 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Billing.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Billing.php
@@ -35,7 +35,7 @@ class Billing extends \Magento\Checkout\Block\Onepage\AbstractOnepage
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -51,7 +51,7 @@ class Billing extends \Magento\Checkout\Block\Onepage\AbstractOnepage
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -67,7 +67,7 @@ public function __construct(
         $this->_addressFactory = $addressFactory;
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $configCacheType,
             $customerSession,
             $resourceSession,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Login.php b/app/code/Magento/Checkout/Block/Onepage/Login.php
index 1d37f5d8b7d09..b3a6047ca1770 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Login.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Login.php
@@ -39,7 +39,7 @@ class Login extends AbstractOnepage
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -59,7 +59,7 @@ class Login extends AbstractOnepage
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -81,7 +81,7 @@ public function __construct(
         $this->messageManager = $messageManager;
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $configCacheType,
             $customerSession,
             $resourceSession,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping.php b/app/code/Magento/Checkout/Block/Onepage/Shipping.php
index b17503ac8ab40..d172b464f029b 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping.php
@@ -28,7 +28,7 @@ class Shipping extends \Magento\Checkout\Block\Onepage\AbstractOnepage
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -44,7 +44,7 @@ class Shipping extends \Magento\Checkout\Block\Onepage\AbstractOnepage
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -60,7 +60,7 @@ public function __construct(
         $this->_addressFactory = $addressFactory;
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $configCacheType,
             $customerSession,
             $resourceSession,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
index 679f00970c0e2..3d39ed9eae113 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -27,7 +27,7 @@ class Available extends \Magento\Checkout\Block\Onepage\AbstractOnepage
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $resourceSession
@@ -42,7 +42,7 @@ class Available extends \Magento\Checkout\Block\Onepage\AbstractOnepage
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $resourceSession,
@@ -56,7 +56,7 @@ public function __construct(
     ) {
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $configCacheType,
             $customerSession,
             $resourceSession,
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 029bc7bfd56da..2b056aeac07fa 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -30,7 +30,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
     protected $_storeManager;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -49,7 +49,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      */
@@ -58,7 +58,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         CustomerCart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
     ) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 4092dff7c0e9a..33ceac1b31230 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -28,7 +28,7 @@ class Add extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param ProductRepositoryInterface $productRepository
@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         CustomerCart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         ProductRepositoryInterface $productRepository
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 48230baf5e14d..eebb127c786c5 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -20,7 +20,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -30,7 +30,7 @@ public function __construct(
         Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         Framework\View\Result\PageFactory $resultPageFactory
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index bd615f30205e2..b5b442ae9bb32 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -19,7 +19,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
@@ -29,7 +29,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index bfdb46f935339..1a9f88450bf2f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -20,7 +20,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
@@ -30,7 +30,7 @@ public function __construct(
         Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         CustomerCart $cart,
         Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 15b238c9a409f..46cd798d74e9d 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -21,7 +21,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -31,7 +31,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 50a888a0da021..6d75c57911608 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -42,7 +42,7 @@ class Onepage extends Action
     protected $_translateInline;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -89,7 +89,7 @@ class Onepage extends Action
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
@@ -108,7 +108,7 @@ public function __construct(
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Translate\InlineInterface $translateInline,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 54705d9d4d1da..3a7501b6ecc59 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -30,13 +30,6 @@ class Cart extends \Magento\Core\Helper\Url
      */
     const COUPON_CODE_MAX_LENGTH = 255;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Checkout\Model\Cart
      */
@@ -50,18 +43,15 @@ class Cart extends \Magento\Core\Helper\Url
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Cart $checkoutCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Cart $checkoutCart,
         \Magento\Checkout\Model\Session $checkoutSession
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_checkoutCart = $checkoutCart;
         $this->_checkoutSession = $checkoutSession;
         parent::__construct($context, $storeManager);
@@ -210,6 +200,6 @@ public function getIsVirtualQuote()
      */
     public function getShouldRedirectToCart($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 8d7fc660b514a..b3a064ad8163d 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -21,13 +21,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const XML_PATH_CUSTOMER_MUST_BE_LOGGED = 'checkout/options/customer_must_be_logged';
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -60,7 +53,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -70,7 +62,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -78,7 +69,6 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         PriceCurrencyInterface $priceCurrency
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_storeManager = $storeManager;
         $this->_checkoutSession = $checkoutSession;
         $this->_localeDate = $localeDate;
@@ -141,7 +131,7 @@ public function convertPrice($price, $format = true)
      */
     public function canOnepageCheckout()
     {
-        return (bool)$this->_scopeConfig->getValue(
+        return (bool)$this->scopeConfig->getValue(
             'checkout/options/onepage_checkout_enabled',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -215,14 +205,14 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
     {
         $this->inlineTranslation->suspend();
 
-        $template = $this->_scopeConfig->getValue(
+        $template = $this->scopeConfig->getValue(
             'checkout/payment_failed/template',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
         );
 
         $copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
-        $copyMethod = $this->_scopeConfig->getValue(
+        $copyMethod = $this->scopeConfig->getValue(
             'checkout/payment_failed/copy_method',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
@@ -232,19 +222,19 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
             $bcc = $copyTo;
         }
 
-        $_receiver = $this->_scopeConfig->getValue(
+        $_receiver = $this->scopeConfig->getValue(
             'checkout/payment_failed/receiver',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
         );
         $sendTo = [
             [
-                'email' => $this->_scopeConfig->getValue(
+                'email' => $this->scopeConfig->getValue(
                     'trans_email/ident_' . $_receiver . '/email',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
                 ),
-                'name' => $this->_scopeConfig->getValue(
+                'name' => $this->scopeConfig->getValue(
                     'trans_email/ident_' . $_receiver . '/name',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
@@ -293,11 +283,11 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
                     'customerEmail' => $checkout->getCustomerEmail(),
                     'billingAddress' => $checkout->getBillingAddress(),
                     'shippingAddress' => $checkout->getShippingAddress(),
-                    'shippingMethod' => $this->_scopeConfig->getValue(
+                    'shippingMethod' => $this->scopeConfig->getValue(
                         'carriers/' . $shippingMethod . '/title',
                         \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ),
-                    'paymentMethod' => $this->_scopeConfig->getValue(
+                    'paymentMethod' => $this->scopeConfig->getValue(
                         'payment/' . $paymentMethod . '/title',
                         \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ),
@@ -305,7 +295,7 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
                     'total' => $total,
                 ]
             )->setFrom(
-                $this->_scopeConfig->getValue(
+                $this->scopeConfig->getValue(
                     'checkout/payment_failed/identity',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
@@ -332,7 +322,7 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
      */
     protected function _getEmails($configPath, $storeId)
     {
-        $data = $this->_scopeConfig->getValue(
+        $data = $this->scopeConfig->getValue(
             $configPath,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
@@ -356,7 +346,7 @@ public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store
         if ($store === null) {
             $store = $quote->getStoreId();
         }
-        $guestCheckout = $this->_scopeConfig->isSetFlag(
+        $guestCheckout = $this->scopeConfig->isSetFlag(
             self::XML_PATH_GUEST_CHECKOUT,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -393,7 +383,7 @@ public function isContextCheckout()
      */
     public function isCustomerMustBeLogged()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
index f251a32c3dd1e..4a9c60dacf5d4 100644
--- a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
@@ -20,7 +20,7 @@
 class AbstractCollection extends AbstractSearchResult
 {
     /**
-     * @var StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -46,7 +46,7 @@ class AbstractCollection extends AbstractSearchResult
      * @param EntityFactoryInterface $entityFactory
      * @param ManagerInterface $eventManager
      * @param SearchResultIteratorFactory $resultIteratorFactory
-     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param SearchResultProcessorFactory $searchResultProcessorFactory
      */
     public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index 0a37cf81d4757..69dc4cfd7558d 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -34,7 +34,7 @@ class Collection extends AbstractSearchResult
      * @param EntityFactoryInterface $entityFactory
      * @param ManagerInterface $eventManager
      * @param SearchResultIteratorFactory $resultIteratorFactory
-     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param SearchResultProcessorFactory $searchResultProcessorFactory
      */
     public function __construct(
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 9c79b10dc0ab2..9148d14af7a0d 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -153,6 +153,11 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     protected $productFactory;
 
+    /**
+     * @var \Magento\Core\Helper\Data
+     */
+    protected $_coreData;
+
     /**
      * @codingStandardsIgnoreStart/End
      *
@@ -160,12 +165,12 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Psr\Log\LoggerInterface $logger
      * @param ProductRepositoryInterface $productRepository
+     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\ConfigurableProduct\Model\Resource\Product\Type\ConfigurableFactory $typeConfigurableFactory
      * @param \Magento\Eav\Model\EntityFactory $entityFactory
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
@@ -184,12 +189,12 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Registry $coreRegistry,
         \Psr\Log\LoggerInterface $logger,
         ProductRepositoryInterface $productRepository,
+        \Magento\Core\Helper\Data $coreData,
         \Magento\ConfigurableProduct\Model\Resource\Product\Type\ConfigurableFactory $typeConfigurableFactory,
         \Magento\Eav\Model\EntityFactory $entityFactory,
         \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
@@ -212,12 +217,12 @@ public function __construct(
         $this->_catalogProductTypeConfigurable = $catalogProductTypeConfigurable;
         $this->_scopeConfig = $scopeConfig;
         $this->stockConfiguration = $stockConfiguration;
+        $this->_coreData = $coreData;
         parent::__construct(
             $catalogProductOption,
             $eavConfig,
             $catalogProductType,
             $eventManager,
-            $coreData,
             $fileStorageDb,
             $filesystem,
             $coreRegistry,
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
index 86a94346806e1..6dbdf85f4b0a2 100644
--- a/app/code/Magento/Contact/Helper/Data.php
+++ b/app/code/Magento/Contact/Helper/Data.php
@@ -16,13 +16,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const XML_PATH_ENABLED = 'contact/contact/enabled';
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * Customer session
      *
@@ -37,17 +30,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerViewHelper $customerViewHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         CustomerViewHelper $customerViewHelper
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_customerSession = $customerSession;
         $this->_customerViewHelper = $customerViewHelper;
         parent::__construct($context);
@@ -60,7 +50,7 @@ public function __construct(
      */
     public function isEnabled()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
index a1d291261f636..5714806172e3b 100644
--- a/app/code/Magento/Cookie/Helper/Cookie.php
+++ b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -35,15 +35,9 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_website;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
      *
      * @throws \InvalidArgumentException
@@ -51,11 +45,9 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         array $data = []
     ) {
         parent::__construct($context);
-        $this->_scopeConfig = $scopeConfig;
         $this->_currentStore = isset($data['current_store']) ? $data['current_store'] : $storeManager->getStore();
 
         if (!$this->_currentStore instanceof \Magento\Store\Model\Store) {
@@ -77,7 +69,7 @@ public function __construct(
     public function isUserNotAllowSaveCookie()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
@@ -115,7 +107,7 @@ protected function _getAcceptedSaveCookiesWebsites()
      */
     public function getCookieRestrictionLifetime()
     {
-        return (int)$this->_scopeConfig->getValue(
+        return (int)$this->scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION_LIFETIME,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
diff --git a/app/code/Magento/Core/App/Action/Plugin/LastUrl.php b/app/code/Magento/Core/App/Action/Plugin/LastUrl.php
deleted file mode 100644
index 51fcba3eb69ab..0000000000000
--- a/app/code/Magento/Core/App/Action/Plugin/LastUrl.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Generic frontend controller
- */
-namespace Magento\Core\App\Action\Plugin;
-
-class LastUrl
-{
-    /**
-     * Session namespace to refer in other places
-     */
-    const SESSION_NAMESPACE = 'frontend';
-
-    /**
-     * @var \Magento\Framework\Session\Generic
-     */
-    protected $_session;
-
-    /**
-     * @var \Magento\Framework\UrlInterface
-     */
-    protected $_url;
-
-    /**
-     * Namespace for session.
-     *
-     * @var string
-     */
-    protected $_sessionNamespace = self::SESSION_NAMESPACE;
-
-    /**
-     * @param \Magento\Framework\Session\Generic $session
-     * @param \Magento\Framework\UrlInterface $url
-     */
-    public function __construct(\Magento\Framework\Session\Generic $session, \Magento\Framework\UrlInterface $url)
-    {
-        $this->_session = $session;
-        $this->_url = $url;
-    }
-
-    /**
-     * Process request
-     *
-     * @param \Magento\Framework\App\Action\Action $subject
-     * @param callable $proceed
-     * @param \Magento\Framework\App\RequestInterface $request
-     *
-     * @return mixed
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function aroundDispatch(
-        \Magento\Framework\App\Action\Action $subject,
-        \Closure $proceed,
-        \Magento\Framework\App\RequestInterface $request
-    ) {
-        $result = $proceed($request);
-        $this->_session->setLastUrl($this->_url->getUrl('*/*/*', ['_current' => true]));
-        return $result;
-    }
-}
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index 21809fba96716..cb5585737f20f 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -5,205 +5,11 @@
  */
 namespace Magento\Core\Helper;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-
 /**
  * Core data helper
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    /**
-     * Currency cache context
-     */
-    const CONTEXT_CURRENCY = 'current_currency';
-
-    /**
-     * Store cache context
-     */
-    const CONTEXT_STORE = 'store';
-
-    /**#@+
-     * Paths for various config settings
-     */
-    const XML_PATH_DEFAULT_LOCALE = 'general/locale/code';
-    const XML_PATH_DEFAULT_TIMEZONE = 'general/locale/timezone';
-    const XML_PATH_DEFAULT_COUNTRY = 'general/country/default';
-    const XML_PATH_DEV_ALLOW_IPS = 'dev/restrict/allow_ips';
-    const XML_PATH_CONNECTION_TYPE = 'global/resources/default_setup/connection/type';
-    /**#@- */
-
-    /**
-     * Const for correct dividing decimal values
-     */
-    const DIVIDE_EPSILON = 10000;
-
-    /**
-     * @var string[]
-     */
-    protected $_allowedFormats = [
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_FULL,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_LONG,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
-    ];
-
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $_appState;
-
-    /**
-     * @var boolean
-     */
-    protected $_dbCompatibleMode;
-
-    /**
-     * @var PriceCurrencyInterface
-     */
-    protected $_priceCurrency;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param PriceCurrencyInterface $priceCurrency
-     * @param bool $dbCompatibleMode
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        PriceCurrencyInterface $priceCurrency,
-        $dbCompatibleMode = true
-    ) {
-        parent::__construct($context);
-        $this->_scopeConfig = $scopeConfig;
-        $this->_storeManager = $storeManager;
-        $this->_appState = $appState;
-        $this->_dbCompatibleMode = $dbCompatibleMode;
-        $this->_priceCurrency =  $priceCurrency;
-    }
-
-    /**
-     * Convert and format price value for current application store
-     *
-     * @param   float $value
-     * @param   bool $format
-     * @param   bool $includeContainer
-     * @return  float|string
-     */
-    public function currency($value, $format = true, $includeContainer = true)
-    {
-        return $format
-            ? $this->_priceCurrency->convertAndFormat($value, $includeContainer)
-            : $this->_priceCurrency->convert($value);
-    }
-
-    /**
-     * Convert and format price value for specified store
-     *
-     * @param   float $value
-     * @param   int|\Magento\Store\Model\Store $store
-     * @param   bool $format
-     * @param   bool $includeContainer
-     * @return  float|string
-     */
-    public function currencyByStore($value, $store = null, $format = true, $includeContainer = true)
-    {
-        if ($format) {
-            $value = $this->_priceCurrency->convertAndFormat(
-                $value,
-                $includeContainer,
-                PriceCurrencyInterface::DEFAULT_PRECISION,
-                $store
-            );
-        } else {
-            $value = $this->_priceCurrency->convert($value, $store);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Format and convert currency using current store option
-     *
-     * @param   float $value
-     * @param   bool $includeContainer
-     * @return  string
-     */
-    public function formatCurrency($value, $includeContainer = true)
-    {
-        return $this->_priceCurrency->convertAndFormat($value, $includeContainer);
-    }
-
-    /**
-     * Formats price
-     *
-     * @param float $price
-     * @param bool $includeContainer
-     * @return string
-     */
-    public function formatPrice($price, $includeContainer = true)
-    {
-        return $this->_priceCurrency->format($price, $includeContainer);
-    }
-
-    /**
-     * @param null $storeId
-     * @return bool
-     */
-    public function isDevAllowed($storeId = null)
-    {
-        $allow = true;
-
-        $allowedIps = $this->_scopeConfig->getValue(
-            self::XML_PATH_DEV_ALLOW_IPS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-        $remoteAddr = $this->_remoteAddress->getRemoteAddress();
-        if (!empty($allowedIps) && !empty($remoteAddr)) {
-            $allowedIps = preg_split('#\s*,\s*#', $allowedIps, null, PREG_SPLIT_NO_EMPTY);
-            if (array_search($remoteAddr, $allowedIps) === false
-                && array_search($this->_httpHeader->getHttpHost(), $allowedIps) === false
-            ) {
-                $allow = false;
-            }
-        }
-
-        return $allow;
-    }
-
-    /**
-     * Get information about available cache types
-     *
-     * @return array
-     */
-    public function getCacheTypes()
-    {
-        $types = [];
-        foreach ($this->_cacheConfig->getTypes() as $type => $node) {
-            if (array_key_exists('label', $node)) {
-                $types[$type] = $node['label'];
-            }
-        }
-        return $types;
-    }
-
     /**
      * Encode the mixed $valueToEncode into the JSON format
      *
@@ -231,29 +37,4 @@ public function jsonDecode($encodedValue, $objectDecodeType = \Zend_Json::TYPE_A
     {
         return \Zend_Json::decode($encodedValue, $objectDecodeType);
     }
-
-    /**
-     * Return default country code
-     *
-     * @param \Magento\Store\Model\Store|string|int $store
-     * @return string
-     */
-    public function getDefaultCountry($store = null)
-    {
-        return $this->_scopeConfig->getValue(
-            self::XML_PATH_DEFAULT_COUNTRY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $store
-        );
-    }
-
-    /**
-     * Check whether database compatible mode is used (configs enable it for MySQL by default).
-     *
-     * @return bool
-     */
-    public function useDbCompatibleMode()
-    {
-        return $this->_dbCompatibleMode;
-    }
 }
diff --git a/app/code/Magento/Core/Helper/File/Storage.php b/app/code/Magento/Core/Helper/File/Storage.php
index eb3972d44d364..530b4f6db7e56 100644
--- a/app/code/Magento/Core/Helper/File/Storage.php
+++ b/app/code/Magento/Core/Helper/File/Storage.php
@@ -46,29 +46,21 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_filesystemStorage;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $config;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\Core\Model\File\Storage $storage
      * @param \Magento\Core\Model\File\Storage\File $filesystemStorage
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb,
         \Magento\Core\Model\File\Storage $storage,
-        \Magento\Core\Model\File\Storage\File $filesystemStorage,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config
+        \Magento\Core\Model\File\Storage\File $filesystemStorage
     ) {
         $this->_filesystemStorage = $filesystemStorage;
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_storage = $storage;
-        $this->config = $config;
         parent::__construct($context);
     }
 
@@ -80,7 +72,7 @@ public function __construct(
     public function getCurrentStorageCode()
     {
         if (is_null($this->_currentStorage)) {
-            $this->_currentStorage = (int)$this->config->getValue(
+            $this->_currentStorage = (int)$this->scopeConfig->getValue(
                 \Magento\Core\Model\File\Storage::XML_PATH_STORAGE_MEDIA,
                 'default'
             );
diff --git a/app/code/Magento/Core/Helper/File/Storage/Database.php b/app/code/Magento/Core/Helper/File/Storage/Database.php
index 78920057ae53d..1a8f672b15ba9 100644
--- a/app/code/Magento/Core/Helper/File/Storage/Database.php
+++ b/app/code/Magento/Core/Helper/File/Storage/Database.php
@@ -57,29 +57,21 @@ class Database extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_fileStorage;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $config;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Core\Model\File\Storage\DatabaseFactory $dbStorageFactory
      * @param \Magento\Core\Model\File\Storage\File $fileStorage
      * @param Filesystem $filesystem
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Core\Model\File\Storage\DatabaseFactory $dbStorageFactory,
         \Magento\Core\Model\File\Storage\File $fileStorage,
-        Filesystem $filesystem,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config
+        Filesystem $filesystem
     ) {
         $this->_filesystem = $filesystem;
         $this->_dbStorageFactory = $dbStorageFactory;
         $this->_fileStorage = $fileStorage;
-        $this->config = $config;
         parent::__construct($context);
     }
 
@@ -92,7 +84,7 @@ public function __construct(
     public function checkDbUsage()
     {
         if (null === $this->_useDb) {
-            $currentStorage = (int)$this->config->getValue(
+            $currentStorage = (int)$this->scopeConfig->getValue(
                 \Magento\Core\Model\File\Storage::XML_PATH_STORAGE_MEDIA,
                 'default'
             );
diff --git a/app/code/Magento/Core/etc/config.xml b/app/code/Magento/Core/etc/config.xml
index da88a95fffa65..ddfb237c0eeee 100644
--- a/app/code/Magento/Core/etc/config.xml
+++ b/app/code/Magento/Core/etc/config.xml
@@ -14,9 +14,6 @@
             </pagination>
         </design>
         <dev>
-            <restrict>
-                <allow_ips />
-            </restrict>
             <debug>
                 <profiler>0</profiler>
             </debug>
@@ -110,8 +107,6 @@
             <locale>
                 <firstday>0</firstday>
                 <weekend>0,6</weekend>
-                <code>en_US</code>
-                <timezone>America/Los_Angeles</timezone>
             </locale>
             <file>
                 <protected_extensions>
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 660ff5429aea4..e454ca475c8d1 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -12,21 +12,11 @@
             <argument name="moduleName" xsi:type="string">Magento_Core</argument>
         </arguments>
     </type>
-    <type name="Magento\Core\App\Router\Base">
+    <type name="Magento\Framework\App\Router\Base">
         <arguments>
             <argument name="routerId" xsi:type="string">standard</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Router\NoRouteHandlerList">
-        <arguments>
-            <argument name="handlerClassesList" xsi:type="array">
-                <item name="default" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Core\App\Router\NoRouteHandler</item>
-                    <item name="sortOrder" xsi:type="string">100</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\DB\Helper">
         <arguments>
             <argument name="modulePrefix" xsi:type="string">core</argument>
@@ -50,9 +40,6 @@
             <argument name="fileStorage" xsi:type="object">Magento\Core\Model\File\Storage\File\Proxy</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Action\Action">
-        <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="30"/>
-    </type>
     <virtualType name="Magento\Core\Model\Session\Storage" type="Magento\Framework\Session\Storage">
         <arguments>
             <argument name="namespace" xsi:type="string">core</argument>
@@ -68,14 +55,14 @@
     </type>
     <type name="Magento\Framework\Stdlib\DateTime\Timezone">
         <arguments>
-            <argument name="defaultTimezonePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
+            <argument name="defaultTimezonePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
             <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Locale\Resolver">
         <plugin name="initLocale" type="Magento\Framework\Translate\Locale\Resolver\Plugin" sortOrder="10"/>
         <arguments>
-            <argument name="defaultLocalePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
+            <argument name="defaultLocalePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
             <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Core/etc/frontend/di.xml b/app/code/Magento/Core/etc/frontend/di.xml
index 724bc250b6656..a86435f16a24a 100644
--- a/app/code/Magento/Core/etc/frontend/di.xml
+++ b/app/code/Magento/Core/etc/frontend/di.xml
@@ -9,23 +9,4 @@
     <type name="Magento\Framework\App\FrontController">
         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
     </type>
-    <type name="Magento\Framework\App\Action\Action">
-        <plugin name="lastUrl" type="Magento\Core\App\Action\Plugin\LastUrl" sortOrder="70"/>
-    </type>
-    <type name="Magento\Framework\App\RouterList" shared="true">
-        <arguments>
-            <argument name="routerList" xsi:type="array">
-                <item name="standard" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Core\App\Router\Base</item>
-                    <item name="disable" xsi:type="boolean">false</item>
-                    <item name="sortOrder" xsi:type="string">20</item>
-                </item>
-                <item name="default" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Framework\App\Router\DefaultRouter</item>
-                    <item name="disable" xsi:type="boolean">false</item>
-                    <item name="sortOrder" xsi:type="string">100</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/CurrencySymbol/Helper/Data.php b/app/code/Magento/CurrencySymbol/Helper/Data.php
index 690ec4b6aa523..e3ae5efd76a48 100644
--- a/app/code/Magento/CurrencySymbol/Helper/Data.php
+++ b/app/code/Magento/CurrencySymbol/Helper/Data.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\CurrencySymbol\Helper;
 
-class Data extends \Magento\Core\Helper\Data
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * @var \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory
@@ -20,30 +20,15 @@ class Data extends \Magento\Core\Helper\Data
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory,
-        $dbCompatibleMode = true
+        \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
     ) {
         $this->_symbolFactory = $symbolFactory;
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index bd128398c5c3c..1b140b56c552e 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -7,7 +7,6 @@
         "magento/module-page-cache": "0.42.0-beta8",
         "magento/module-directory": "0.42.0-beta8",
         "magento/module-backend": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index b2e7476743729..d66cd086e5590 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -48,7 +48,7 @@ class Edit extends \Magento\Directory\Block\Data
      * Constructor
      *
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -64,7 +64,7 @@ class Edit extends \Magento\Directory\Block\Data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
@@ -83,7 +83,7 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $jsonEncoder,
             $configCacheType,
             $regionCollectionFactory,
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
index 703848d814d36..ecbb711a685f0 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -33,11 +33,6 @@ class Addresses extends GenericMetadata
      */
     protected $_jsonEncoder;
 
-    /**
-     * @var \Magento\Core\Helper\Data
-     */
-    protected $_coreData;
-
     /**
      * @var \Magento\Customer\Model\Options
      */
@@ -82,7 +77,6 @@ class Addresses extends GenericMetadata
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param \Magento\Store\Model\System\Store $systemStore
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Customer\Model\Renderer\RegionFactory $regionFactory
      * @param \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory
@@ -106,7 +100,6 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
         \Magento\Store\Model\System\Store $systemStore,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Customer\Model\Renderer\RegionFactory $regionFactory,
         \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory,
@@ -123,7 +116,6 @@ public function __construct(
     ) {
         $this->options = $options;
         $this->_addressHelper = $addressHelper;
-        $this->_coreData = $coreData;
         $this->_jsonEncoder = $jsonEncoder;
         $this->_regionFactory = $regionFactory;
         $this->_metadataFormFactory = $metadataFormFactory;
@@ -239,10 +231,10 @@ public function initForm()
         $address = $this->addressDataFactory->create();
         if (!empty($account) && isset($account['store_id'])) {
             $address->setCountryId(
-                $this->_coreData->getDefaultCountry($this->_storeManager->getStore($account['store_id']))
+                $this->_directoryHelper->getDefaultCountry($this->_storeManager->getStore($account['store_id']))
             );
         } else {
-            $address->setCountryId($this->_coreData->getDefaultCountry());
+            $address->setCountryId($this->_directoryHelper->getDefaultCountry());
         }
 
         $addressForm = $this->_metadataFormFactory->create(
@@ -445,7 +437,7 @@ public function getDefaultCountries()
             $result[$website['value']] = $this->_storeManager->getWebsite(
                 $website['value']
             )->getConfig(
-                \Magento\Core\Helper\Data::XML_PATH_DEFAULT_COUNTRY
+                \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_COUNTRY
             );
         }
 
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 10745089fdefe..652927ef96bd6 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -27,7 +27,7 @@ class Register extends \Magento\Directory\Block\Data
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -41,7 +41,7 @@ class Register extends \Magento\Directory\Block\Data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
@@ -56,7 +56,7 @@ public function __construct(
         $this->_customerSession = $customerSession;
         parent::__construct(
             $context,
-            $coreData,
+            $directoryHelper,
             $jsonEncoder,
             $configCacheType,
             $regionCollectionFactory,
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 71cb915a35b37..5290c64b6837b 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerExtractor;
@@ -28,7 +28,7 @@ class EditPost extends \Magento\Customer\Controller\Account
     /** @var CustomerRepositoryInterface  */
     protected $customerRepository;
 
-    /** @var FormKeyValidator */
+    /** @var Validator */
     protected $formKeyValidator;
 
     /** @var CustomerExtractor */
@@ -41,7 +41,7 @@ class EditPost extends \Magento\Customer\Controller\Account
      * @param PageFactory $resultPageFactory
      * @param AccountManagementInterface $customerAccountManagement
      * @param CustomerRepositoryInterface $customerRepository
-     * @param FormKeyValidator $formKeyValidator
+     * @param Validator $formKeyValidator
      * @param CustomerExtractor $customerExtractor
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -52,7 +52,7 @@ public function __construct(
         PageFactory $resultPageFactory,
         AccountManagementInterface $customerAccountManagement,
         CustomerRepositoryInterface $customerRepository,
-        FormKeyValidator $formKeyValidator,
+        Validator $formKeyValidator,
         CustomerExtractor $customerExtractor
     ) {
         $this->customerAccountManagement = $customerAccountManagement;
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index b7948e9f95bee..d26c805150181 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -17,7 +17,7 @@
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
-use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Data\Form\FormKey\Validator;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -39,7 +39,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
     /** @var CustomerUrl */
     protected $customerUrl;
 
-    /** @var FormKeyValidator */
+    /** @var Validator */
     protected $formKeyValidator;
 
     /**
@@ -52,7 +52,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
      * @param AccountManagementInterface $customerAccountManagement
      * @param DecoderInterface $urlDecoder
      * @param CustomerUrl $customerHelperData
-     * @param FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -66,7 +66,7 @@ public function __construct(
         AccountManagementInterface $customerAccountManagement,
         DecoderInterface $urlDecoder,
         CustomerUrl $customerHelperData,
-        FormKeyValidator $formKeyValidator
+        Validator $formKeyValidator
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php
index 8d54a8f62c665..60b2c38fd2676 100644
--- a/app/code/Magento/Customer/Controller/Address.php
+++ b/app/code/Magento/Customer/Controller/Address.php
@@ -20,7 +20,7 @@ class Address extends \Magento\Framework\App\Action\Action
     protected $_customerSession;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -72,7 +72,7 @@ class Address extends \Magento\Framework\App\Action\Action
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory
@@ -87,7 +87,7 @@ class Address extends \Magento\Framework\App\Action\Action
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Customer\Model\Metadata\FormFactory $formFactory,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index 7ecad26719fc5..cfb5fc0580777 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -21,7 +21,7 @@ class Index extends \Magento\Customer\Controller\Address
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory
@@ -37,7 +37,7 @@ class Index extends \Magento\Customer\Controller\Address
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Customer\Model\Metadata\FormFactory $formFactory,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 398522e04a458..ae4e51e579525 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -71,9 +71,6 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManager;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
-    protected $_scopeConfig;
-
     /** @var CustomerMetadataInterface */
     protected $_customerMetadataService;
 
@@ -87,7 +84,6 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CustomerMetadataInterface $customerMetadataService
      * @param AddressMetadataInterface $addressMetadataService
      * @param \Magento\Customer\Model\Address\Config $addressConfig
@@ -96,14 +92,12 @@ public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\View\Element\BlockFactory $blockFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         CustomerMetadataInterface $customerMetadataService,
         AddressMetadataInterface $addressMetadataService,
         \Magento\Customer\Model\Address\Config $addressConfig
     ) {
         $this->_blockFactory = $blockFactory;
         $this->_storeManager = $storeManager;
-        $this->_scopeConfig = $scopeConfig;
         $this->_customerMetadataService = $customerMetadataService;
         $this->_addressMetadataService = $addressMetadataService;
         $this->_addressConfig = $addressConfig;
@@ -165,7 +159,7 @@ public function getConfig($key, $store = null)
         $store = $this->_storeManager->getStore($store);
         $websiteId = $store->getWebsiteId();
         if (!isset($this->_config[$websiteId])) {
-            $this->_config[$websiteId] = $this->_scopeConfig->getValue(
+            $this->_config[$websiteId] = $this->scopeConfig->getValue(
                 'customer/address',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
@@ -317,7 +311,7 @@ public function convertStreetLines($origStreets, $toCount)
      */
     public function isVatValidationEnabled($store = null)
     {
-        return (bool)$this->_scopeConfig->getValue(
+        return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_VAT_VALIDATION_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -331,7 +325,7 @@ public function isVatValidationEnabled($store = null)
      */
     public function isDisableAutoGroupAssignDefaultValue()
     {
-        return (bool)$this->_scopeConfig->getValue(
+        return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -345,7 +339,7 @@ public function isDisableAutoGroupAssignDefaultValue()
      */
     public function hasValidateOnEachTransaction($store = null)
     {
-        return (bool)$this->_scopeConfig->getValue(
+        return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_VIV_ON_EACH_TRANSACTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -360,7 +354,7 @@ public function hasValidateOnEachTransaction($store = null)
      */
     public function getTaxCalculationAddressType($store = null)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -374,7 +368,7 @@ public function getTaxCalculationAddressType($store = null)
      */
     public function isVatAttributeVisible()
     {
-        return (bool)$this->_scopeConfig->getValue(
+        return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_VAT_FRONTEND_VISIBILITY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index fe286e314ec45..7e187a71e5c08 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -23,7 +23,7 @@ class Street extends \Magento\Framework\App\Config\Value
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
diff --git a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
index 9fcc813836edf..753a8cb84af76 100644
--- a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
+++ b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
@@ -9,7 +9,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Standard extends \Magento\Core\App\Router\Base
+class Standard extends \Magento\Framework\App\Router\Base
 {
     /**
      * Routers that must not been matched
@@ -47,11 +47,9 @@ class Standard extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\Config $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\RouterListInterface $routerList
      * @param \Magento\DesignEditor\Helper\Data $designEditorHelper
      * @param \Magento\DesignEditor\Model\State $designEditorState
@@ -66,11 +64,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\Config $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\RouterListInterface $routerList,
         \Magento\DesignEditor\Helper\Data $designEditorHelper,
         \Magento\DesignEditor\Model\State $designEditorState,
@@ -83,11 +79,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $storeManager,
-            $scopeConfig,
-            $urlSecurityInfo,
             $routerId,
-            $nameBuilder
+            $nameBuilder,
+            $pathConfig
         );
         $this->_routerList = $routerList;
         $this->_designEditorHelper = $designEditorHelper;
diff --git a/app/code/Magento/Developer/Helper/Data.php b/app/code/Magento/Developer/Helper/Data.php
new file mode 100644
index 0000000000000..3ea7fc415ad49
--- /dev/null
+++ b/app/code/Magento/Developer/Helper/Data.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Developer\Helper;
+
+/**
+ * Developer config data helper
+ */
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * Dev allow ips config path
+     */
+    const XML_PATH_DEV_ALLOW_IPS = 'dev/restrict/allow_ips';
+
+    /**
+     * Check if the client remote address is allowed developer ip
+     *
+     * @param string|null $storeId
+     * @return bool
+     */
+    public function isDevAllowed($storeId = null)
+    {
+        $allow = true;
+
+        $allowedIps = $this->scopeConfig->getValue(
+            self::XML_PATH_DEV_ALLOW_IPS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        $remoteAddr = $this->_remoteAddress->getRemoteAddress();
+        if (!empty($allowedIps) && !empty($remoteAddr)) {
+            $allowedIps = preg_split('#\s*,\s*#', $allowedIps, null, PREG_SPLIT_NO_EMPTY);
+            if (array_search($remoteAddr, $allowedIps) === false
+                && array_search($this->_httpHeader->getHttpHost(), $allowedIps) === false
+            ) {
+                $allow = false;
+            }
+        }
+
+        return $allow;
+    }
+}
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index 9e40d6f9cd1a7..33f9eea54015b 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -10,6 +10,8 @@
 
 namespace Magento\Developer\Model\TemplateEngine\Plugin;
 
+use Magento\Store\Model\ScopeInterface;
+
 class DebugHints
 {
     /**#@+
@@ -24,31 +26,31 @@ class DebugHints
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
-    private $_objectManager;
+    private $objectManager;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
-    private $_scopeConfig;
+    private $scopeConfig;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Developer\Helper\Data
      */
-    private $_coreData;
+    private $devHelper;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Developer\Helper\Data $devHelper
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Core\Helper\Data $coreData
+        \Magento\Developer\Helper\Data $devHelper
     ) {
-        $this->_objectManager = $objectManager;
-        $this->_scopeConfig = $scopeConfig;
-        $this->_coreData = $coreData;
+        $this->objectManager = $objectManager;
+        $this->scopeConfig = $scopeConfig;
+        $this->devHelper = $devHelper;
     }
 
     /**
@@ -64,9 +66,13 @@ public function afterCreate(
         \Magento\Framework\View\TemplateEngineFactory $subject,
         \Magento\Framework\View\TemplateEngineInterface $invocationResult
     ) {
-        if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
-            $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            return $this->_objectManager->create(
+        if ($this->scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, ScopeInterface::SCOPE_STORE) &&
+            $this->devHelper->isDevAllowed()) {
+            $showBlockHints = $this->scopeConfig->getValue(
+                self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
+                ScopeInterface::SCOPE_STORE
+            );
+            return $this->objectManager->create(
                 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
                 ['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
             );
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index fd564c192f618..64536fc34b6c8 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Developer/etc/config.xml b/app/code/Magento/Developer/etc/config.xml
new file mode 100644
index 0000000000000..a669e0d6b6d84
--- /dev/null
+++ b/app/code/Magento/Developer/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Core/etc/config.xsd">
+    <default>
+        <dev>
+            <restrict>
+                <allow_ips />
+            </restrict>
+        </dev>
+    </default>
+</config>
diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
index 0028445116cb6..032fc573cebf8 100644
--- a/app/code/Magento/Directory/Block/Data.php
+++ b/app/code/Magento/Directory/Block/Data.php
@@ -32,13 +32,13 @@ class Data extends \Magento\Framework\View\Element\Template
     protected $_jsonEncoder;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Directory\Helper\Data
      */
-    protected $_coreData;
+    protected $directoryHelper;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -47,7 +47,7 @@ class Data extends \Magento\Framework\View\Element\Template
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
@@ -55,7 +55,7 @@ public function __construct(
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->_coreData = $coreData;
+        $this->directoryHelper = $directoryHelper;
         $this->_jsonEncoder = $jsonEncoder;
         $this->_configCacheType = $configCacheType;
         $this->_regionCollectionFactory = $regionCollectionFactory;
@@ -179,7 +179,7 @@ public function getCountryId()
     {
         $countryId = $this->getData('country_id');
         if (is_null($countryId)) {
-            $countryId = $this->_coreData->getDefaultCountry();
+            $countryId = $this->directoryHelper->getDefaultCountry();
         }
         return $countryId;
     }
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 9f9f9977bef05..e75bb9ede1ee0 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -26,6 +26,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const XML_PATH_DISPLAY_ALL_STATES = 'general/region/display_all';
 
+    /**#@+
+     * Path to config value, which is default country
+     */
+    const XML_PATH_DEFAULT_COUNTRY = 'general/country/default';
+    const XML_PATH_DEFAULT_LOCALE = 'general/locale/code';
+    const XML_PATH_DEFAULT_TIMEZONE = 'general/locale/timezone';
+    /**#@-*/
+
     /**
      * Country collection
      *
@@ -86,11 +94,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_currencyFactory;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_config;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
@@ -99,7 +102,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Core\Helper\Data $coreHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -108,8 +110,7 @@ public function __construct(
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
         \Magento\Core\Helper\Data $coreHelper,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config
+        \Magento\Directory\Model\CurrencyFactory $currencyFactory
     ) {
         parent::__construct($context);
         $this->_configCacheType = $configCacheType;
@@ -118,7 +119,6 @@ public function __construct(
         $this->_coreHelper = $coreHelper;
         $this->_storeManager = $storeManager;
         $this->_currencyFactory = $currencyFactory;
-        $this->_config = $config;
     }
 
     /**
@@ -226,7 +226,7 @@ public function getCountriesWithOptionalZip($asJson = false)
     {
         if (null === $this->_optZipCountries) {
             $value = trim(
-                $this->_config->getValue(
+                $this->scopeConfig->getValue(
                     self::OPTIONAL_ZIP_COUNTRIES_CONFIG_PATH,
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
@@ -260,7 +260,7 @@ public function isZipCodeOptional($countryCode)
     public function getCountriesWithStatesRequired($asJson = false)
     {
         $value = trim(
-            $this->_config->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+            $this->scopeConfig->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
         );
         $countryList = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
         if ($asJson) {
@@ -276,7 +276,7 @@ public function getCountriesWithStatesRequired($asJson = false)
      */
     public function isShowNonRequiredState()
     {
-        return (bool)$this->_config->getValue(
+        return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_DISPLAY_ALL_STATES,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -304,6 +304,21 @@ public function isRegionRequired($countryId)
      */
     public function getBaseCurrencyCode()
     {
-        return $this->_config->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE, 'default');
+        return $this->scopeConfig->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE, 'default');
+    }
+
+    /**
+     * Return default country code
+     *
+     * @param \Magento\Store\Model\Store|string|int $store
+     * @return string
+     */
+    public function getDefaultCountry($store = null)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_DEFAULT_COUNTRY,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
     }
 }
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 8232d9220b412..3aa697742a416 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -31,7 +31,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
     protected $logger;
 
     /**
-     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CurrencyFactory $currencyFactory
      * @param Logger $logger
      */
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
index ad10c72243849..60328d17d8c19 100644
--- a/app/code/Magento/Directory/etc/config.xml
+++ b/app/code/Magento/Directory/etc/config.xml
@@ -34,7 +34,7 @@
                 <allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW</allow>
                 <default>US</default>
             </country>
-            <local>
+            <locale>
                 <datetime_format_long>%A, %B %e %Y [%I:%M %p]</datetime_format_long>
                 <datetime_format_medium>%a, %b %e %Y [%I:%M %p]</datetime_format_medium>
                 <datetime_format_short>%m/%d/%y [%I:%M %p]</datetime_format_short>
@@ -42,7 +42,9 @@
                 <date_format_medium>%a, %b %e %Y</date_format_medium>
                 <date_format_short>%m/%d/%y</date_format_short>
                 <language>en</language>
-            </local>
+                <code>en_US</code>
+                <timezone>America/Los_Angeles</timezone>
+            </locale>
         </general>
     </default>
 </config>
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 544d9c091faf6..59b2e55e590cd 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -16,9 +16,9 @@
 class Links extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $coreData;
+    protected $pricingHelper;
 
     /**
      * @var EncoderInterface
@@ -27,17 +27,17 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
 
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param EncoderInterface $encoder
      * @param array $data
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         EncoderInterface $encoder,
         array $data = []
     ) {
-        $this->coreData = $coreData;
+        $this->pricingHelper = $pricingHelper;
         $this->encoder = $encoder;
         parent::__construct($context, $data);
     }
@@ -87,7 +87,7 @@ public function getLinks()
     public function getCurrencyPrice($price)
     {
         $store = $this->getProduct()->getStore();
-        return $this->coreData->currencyByStore($price, $store, false);
+        return $this->pricingHelper->currencyByStore($price, $store, false);
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 8d4df3c04791a..07e47d9987896 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -21,27 +21,17 @@ class Configuration extends \Magento\Framework\App\Helper\AbstractHelper impleme
      *
      * @var \Magento\Catalog\Helper\Product\Configuration
      */
-    protected $_productConfigur = null;
-
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
+    protected $productConfig = null;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Catalog\Helper\Product\Configuration $productConfigur
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Catalog\Helper\Product\Configuration $productConfigur,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Catalog\Helper\Product\Configuration $productConfig
     ) {
-        $this->_productConfigur = $productConfigur;
-        $this->_scopeConfig = $scopeConfig;
+        $this->productConfig = $productConfig;
         parent::__construct($context);
     }
 
@@ -79,7 +69,7 @@ public function getLinksTitle($product)
         if (strlen($title)) {
             return $title;
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -90,7 +80,7 @@ public function getLinksTitle($product)
      */
     public function getOptions(\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface $item)
     {
-        $options = $this->_productConfigur->getOptions($item);
+        $options = $this->productConfig->getOptions($item);
 
         $links = $this->getLinks($item);
         if ($links) {
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index faab224de0f9e..9f9b87957b2d7 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -14,25 +14,6 @@
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        parent::__construct($context);
-    }
-
     /**
      * Check is link shareable or not
      *
@@ -49,7 +30,7 @@ public function getIsShareable($link)
                 $shareable = (bool)$link->getIsShareable();
                 break;
             case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
-                $shareable = (bool)$this->_scopeConfig->isSetFlag(
+                $shareable = (bool)$this->scopeConfig->isSetFlag(
                     \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 4351cf3dccbf5..3c2496ba37a81 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -89,20 +89,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_downloadableFile;
 
-    /**
-     * Core data
-     *
-     * @var \Magento\Core\Helper\Data
-     */
-    protected $_coreData;
-
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Framework\Filesystem
      */
@@ -124,29 +110,23 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
      * @param File $downloadableFile
      * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Filesystem $filesystem
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param Filesystem\File\ReadFactory $fileReadFactory
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Downloadable\Helper\File $downloadableFile,
         \Magento\Core\Helper\File\Storage\Database $coreFileStorageDb,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Session\SessionManagerInterface $session,
         \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory
     ) {
         parent::__construct($context);
-        $this->_coreData = $coreData;
         $this->_downloadableFile = $downloadableFile;
         $this->_coreFileStorageDb = $coreFileStorageDb;
-        $this->_scopeConfig = $scopeConfig;
         $this->_filesystem = $filesystem;
         $this->_session = $session;
         $this->fileReadFactory = $fileReadFactory;
@@ -302,6 +282,6 @@ public function output()
      */
     public function getContentDisposition($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index a7a9a7b3e62ef..632f84ffdec8d 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -59,6 +59,11 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
      */
     private $typeHandler;
 
+    /**
+     * @var \Magento\Core\Helper\Data
+     */
+    protected $_coreData;
+
     /**
      * Construct
      *
@@ -66,12 +71,12 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Psr\Log\LoggerInterface $logger
      * @param ProductRepositoryInterface $productRepository
+     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Downloadable\Model\Resource\SampleFactory $sampleResFactory
      * @param \Magento\Downloadable\Model\Resource\Link $linkResource
      * @param \Magento\Downloadable\Model\Resource\Link\CollectionFactory $linksFactory
@@ -86,12 +91,12 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Registry $coreRegistry,
         \Psr\Log\LoggerInterface $logger,
         ProductRepositoryInterface $productRepository,
+        \Magento\Core\Helper\Data $coreData,
         \Magento\Downloadable\Model\Resource\SampleFactory $sampleResFactory,
         \Magento\Downloadable\Model\Resource\Link $linkResource,
         \Magento\Downloadable\Model\Resource\Link\CollectionFactory $linksFactory,
@@ -107,12 +112,12 @@ public function __construct(
         $this->_sampleFactory = $sampleFactory;
         $this->_linkFactory = $linkFactory;
         $this->typeHandler = $typeHandler;
+        $this->_coreData = $coreData;
         parent::__construct(
             $catalogProductOption,
             $eavConfig,
             $catalogProductType,
             $eventManager,
-            $coreData,
             $fileStorageDb,
             $filesystem,
             $coreRegistry,
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index 851c189bc9f06..142b97d0f13a2 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -30,13 +30,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_entityTypeFrontendClasses = [];
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\Config
      */
@@ -50,16 +43,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Eav\Model\Entity\Attribute\Config $attributeConfig
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Eav\Model\Entity\Attribute\Config $attributeConfig,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Eav\Model\Config $eavConfig
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_attributeConfig = $attributeConfig;
         $this->_eavConfig = $eavConfig;
         parent::__construct($context);
@@ -129,7 +119,7 @@ public function getAttributeLockedFields($entityTypeCode)
      */
     public function getInputTypesValidatorData()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
index db241f94df5eb..418675bb8a317 100644
--- a/app/code/Magento/Email/Model/Source/Variables.php
+++ b/app/code/Magento/Email/Model/Source/Variables.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Email\Model\Source;
 
+use Magento\Store\Model\Store;
+
 /**
  * Store Contact Information source model
  *
@@ -26,10 +28,10 @@ public function __construct()
     {
         $this->_configVariables = [
             [
-                'value' => \Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL,
+                'value' => Store::XML_PATH_UNSECURE_BASE_URL,
                 'label' => __('Base Unsecure URL'),
             ],
-            ['value' => \Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'label' => __('Base Secure URL')],
+            ['value' => Store::XML_PATH_SECURE_BASE_URL, 'label' => __('Base Secure URL')],
             ['value' => 'trans_email/ident_general/name', 'label' => __('General Contact Name')],
             ['value' => 'trans_email/ident_general/email', 'label' => __('General Contact Email')],
             ['value' => 'trans_email/ident_sales/name', 'label' => __('Sales Representative Contact Name')],
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 7672d3f08763e..a54b8c5db8c53 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -12,7 +12,7 @@
  * Gift Message helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Message extends \Magento\Core\Helper\Data
+class Message extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Gift messages allow section in configuration
@@ -63,45 +63,39 @@ class Message extends \Magento\Core\Helper\Data
      */
     protected $skipMessageCheck = [];
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $_storeManager;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\GiftMessage\Model\MessageFactory $giftMessageFactory
      * @param \Magento\Framework\Escaper $escaper
      * @param array $skipMessageCheck
-     * @param bool $dbCompatibleMode
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\GiftMessage\Model\MessageFactory $giftMessageFactory,
         \Magento\Framework\Escaper $escaper,
-        $skipMessageCheck = [],
-        $dbCompatibleMode = true
+        $skipMessageCheck = []
     ) {
         $this->_escaper = $escaper;
         $this->productRepository = $productRepository;
         $this->_layoutFactory = $layoutFactory;
         $this->_giftMessageFactory = $giftMessageFactory;
         $this->skipMessageCheck = $skipMessageCheck;
+        $this->_storeManager = $storeManager;
+
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
@@ -148,7 +142,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
         if ($type == 'items') {
             $items = $entity->getAllItems();
             if (!is_array($items) || empty($items)) {
-                return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+                return $this->scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
             }
             if ($entity instanceof \Magento\Quote\Model\Quote) {
                 $_type = $entity->getIsMultiShipping() ? 'address_item' : 'item';
@@ -183,7 +177,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
                 $store
             );
         } else {
-            return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+            return $this->scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         }
         return false;
     }
@@ -197,7 +191,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
      */
     protected function _getDependenceFromStoreConfig($productGiftMessageAllow, $store = null)
     {
-        $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        $result = $this->scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         if ($productGiftMessageAllow === '' || is_null($productGiftMessageAllow)) {
             return $result;
         } else {
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 8b2a08d923f70..81c5993b4db8e 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -9,13 +9,15 @@
         "magento/module-multishipping": "0.42.0-beta8",
         "magento/module-sales": "0.42.0-beta8",
         "magento/module-backend": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/module-customer": "0.42.0-beta8",
         "magento/module-eav": "0.42.0-beta8",
         "magento/module-quote": "0.42.0-beta8",
         "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
+    "suggest": {
+        "magento/module-core": "0.42.0-beta8"
+    },
     "type": "magento2-module",
     "version": "0.42.0-beta8",
     "license": [
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index f2a97d5a07b09..31f88b3128334 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -67,16 +67,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_config;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Framework\Registry
      */
@@ -84,19 +74,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Registry $registry
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Registry $registry
     ) {
         parent::__construct($context);
-        $this->_config = $config;
-        $this->_scopeConfig = $scopeConfig;
         $this->_registry = $registry;
     }
 
@@ -107,7 +91,7 @@ public function __construct(
      */
     public function isGoogleAdwordsActive()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ACTIVE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) &&
@@ -125,7 +109,7 @@ public function isGoogleAdwordsActive()
      */
     public function getLanguageCodes()
     {
-        return (array)$this->_config->getValue(self::XML_PATH_LANGUAGES, 'default');
+        return (array)$this->scopeConfig->getValue(self::XML_PATH_LANGUAGES, 'default');
     }
 
     /**
@@ -136,7 +120,7 @@ public function getLanguageCodes()
      */
     public function convertLanguageCodeToLocaleCode($language)
     {
-        $convertArray = (array)$this->_config->getValue(self::XML_PATH_LANGUAGE_CONVERT, 'default');
+        $convertArray = (array)$this->scopeConfig->getValue(self::XML_PATH_LANGUAGE_CONVERT, 'default');
         return isset($convertArray[$language]) ? $convertArray[$language] : $language;
     }
 
@@ -147,7 +131,7 @@ public function convertLanguageCodeToLocaleCode($language)
      */
     public function getConversionJsSrc()
     {
-        return (string)$this->_config->getValue(self::XML_PATH_CONVERSION_JS_SRC, 'default');
+        return (string)$this->scopeConfig->getValue(self::XML_PATH_CONVERSION_JS_SRC, 'default');
     }
 
     /**
@@ -158,7 +142,7 @@ public function getConversionJsSrc()
     public function getConversionImgSrc()
     {
         return sprintf(
-            $this->_config->getValue(self::XML_PATH_CONVERSION_IMG_SRC, 'default'),
+            $this->scopeConfig->getValue(self::XML_PATH_CONVERSION_IMG_SRC, 'default'),
             $this->getConversionId(),
             $this->getConversionLabel()
         );
@@ -171,7 +155,7 @@ public function getConversionImgSrc()
      */
     public function getConversionId()
     {
-        return (int)$this->_scopeConfig->getValue(
+        return (int)$this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_ID,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -184,7 +168,7 @@ public function getConversionId()
      */
     public function getConversionLanguage()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_LANGUAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -197,7 +181,7 @@ public function getConversionLanguage()
      */
     public function getConversionFormat()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_FORMAT,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -210,7 +194,7 @@ public function getConversionFormat()
      */
     public function getConversionColor()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_COLOR,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -223,7 +207,7 @@ public function getConversionColor()
      */
     public function getConversionLabel()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_LABEL,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -236,7 +220,7 @@ public function getConversionLabel()
      */
     public function getConversionValueType()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_VALUE_TYPE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -259,7 +243,7 @@ public function isDynamicConversionValue()
      */
     public function getConversionValueConstant()
     {
-        return (double)$this->_scopeConfig->getValue(
+        return (double)$this->scopeConfig->getValue(
             self::XML_PATH_CONVERSION_VALUE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 49b29bc28cf3e..0a1c89bc7166a 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -23,25 +23,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const XML_PATH_ACCOUNT = 'google/analytics/account';
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        parent::__construct($context);
-    }
-
     /**
      * Whether GA is ready to use
      *
@@ -50,7 +31,7 @@ public function __construct(
      */
     public function isGoogleAnalyticsAvailable($store = null)
     {
-        $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
-        return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        $accountId = $this->scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $accountId && $this->scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 8010a5fc27292..c76a3bff747fd 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -22,11 +22,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_activeForCmsFlag;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\GoogleAnalytics\Helper\Data
      */
@@ -34,15 +29,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\GoogleAnalytics\Helper\Data $analyticsHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\GoogleAnalytics\Helper\Data $analyticsHelper
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_analyticsHelper = $analyticsHelper;
         parent::__construct($context);
     }
@@ -55,7 +47,7 @@ public function __construct(
      */
     public function isGoogleExperimentEnabled($store = null)
     {
-        return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php b/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
index c62f9909c95f8..600c91e1d4e6a 100644
--- a/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
@@ -15,23 +15,23 @@
 class Grouped extends \Magento\GroupedProduct\Block\Product\View\Type\Grouped
 {
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Pricing\Helper\Data
      */
-    protected $_coreHelper;
+    protected $pricingHelper;
 
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         array $data = []
     ) {
-        $this->_coreHelper = $coreHelper;
+        $this->pricingHelper = $pricingHelper;
         parent::__construct(
             $context,
             $arrayUtils,
@@ -150,6 +150,6 @@ public function getIsLastFieldset()
     public function getCurrencyPrice($price)
     {
         $store = $this->getProduct()->getStore();
-        return $this->_coreHelper->currencyByStore($price, $store, false);
+        return $this->pricingHelper->currencyByStore($price, $store, false);
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 5037941f97ddb..4de7c99dff626 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -85,7 +85,6 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Registry $coreRegistry
@@ -104,7 +103,6 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Core\Helper\Data $coreData,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDb,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Registry $coreRegistry,
@@ -126,7 +124,6 @@ public function __construct(
             $eavConfig,
             $catalogProductType,
             $eventManager,
-            $coreData,
             $fileStorageDb,
             $filesystem,
             $coreRegistry,
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index 43ec77d4f66f1..2694d4a0201df 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -13,7 +13,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Data extends \Magento\Core\Helper\Data
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**#@+
      * XML path for config data
@@ -31,30 +31,15 @@ class Data extends \Magento\Core\Helper\Data
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\File\Size $fileSize
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\File\Size $fileSize,
-        $dbCompatibleMode = true
+        \Magento\Framework\File\Size $fileSize
     ) {
         $this->_fileSize = $fileSize;
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
@@ -81,7 +66,7 @@ public function getMaxUploadSizeMessage()
      */
     public function getLocalValidPaths()
     {
-        $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $paths = $this->scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
         return $paths;
     }
 
@@ -92,6 +77,6 @@ public function getLocalValidPaths()
      */
     public function getBunchSize()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index c185f28109727..052642b91eef4 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -16,8 +16,8 @@
  */
 ?>
 <?php
-    /** @var $_coreHelper \Magento\Core\Helper\Data */
-    $_coreHelper = $this->helper('Magento\Core\Helper\Data');
+    /** @var $pricingHelper \Magento\Framework\Pricing\Helper\Data */
+    $pricingHelper = $this->helper('Magento\Framework\Pricing\Helper\Data');
     /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
     $_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
 
@@ -28,7 +28,7 @@
 ?>
 <div class="price-box msrp">
     <?php if ($_product->getMsrp()): ?>
-        <?php $_msrpPrice = $_coreHelper->currency($_product->getMsrp(), true, false) ?>
+        <?php $_msrpPrice = $pricingHelper->currency($_product->getMsrp(), true, false) ?>
         <span class="old-price" ><?php echo $_msrpPrice ?></span>
     <?php endif; ?>
     <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 907aaa4d0c121..c820c0fa0ff85 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -15,7 +15,7 @@
 class OverviewPost extends \Magento\Multishipping\Controller\Checkout
 {
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $formKeyValidator;
 
@@ -27,7 +27,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -35,7 +35,7 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $accountManagement,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
     ) {
         $this->formKeyValidator = $formKeyValidator;
         parent::__construct(
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index d7458c1e1a047..ea29050b81daa 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -22,13 +22,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**#@-*/
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $scopeConfig;
-
     /**
      * Checkout session
      *
@@ -40,15 +33,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Construct
      *
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession
     ) {
-        $this->scopeConfig = $scopeConfig;
         $this->checkoutSession = $checkoutSession;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 9fd0fb9fa4a08..866f8dde5ef68 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -11,7 +11,7 @@
 class Save extends \Magento\Newsletter\Controller\Manage
 {
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $formKeyValidator;
 
@@ -35,7 +35,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
      *
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CustomerRepository $customerRepository
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
@@ -43,7 +43,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         CustomerRepository $customerRepository,
         \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index b6c18f3bbb58c..5c618e1f65f8c 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/module-customer": "0.42.0-beta8",
         "magento/module-widget": "0.42.0-beta8",
         "magento/module-backend": "0.42.0-beta8",
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 6f77f919472e8..b21bb8defdea4 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -24,13 +24,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const XML_PATH_PAYMENT_METHODS = 'payment';
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Payment\Model\Config
      */
@@ -66,7 +59,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Construct
      *
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param LayoutFactory $layoutFactory
      * @param \Magento\Payment\Model\Method\Factory $paymentMethodFactory
      * @param \Magento\Store\Model\App\Emulation $appEmulation
@@ -75,7 +67,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         LayoutFactory $layoutFactory,
         \Magento\Payment\Model\Method\Factory $paymentMethodFactory,
         \Magento\Store\Model\App\Emulation $appEmulation,
@@ -83,7 +74,6 @@ public function __construct(
         \Magento\Framework\App\Config\Initial $initialConfig
     ) {
         parent::__construct($context);
-        $this->_scopeConfig = $scopeConfig;
         $this->_layout = $layoutFactory->create();
         $this->_methodFactory = $paymentMethodFactory;
         $this->_appEmulation = $appEmulation;
@@ -110,7 +100,7 @@ protected function getMethodModelConfigName($code)
      */
     public function getMethodInstance($code)
     {
-        $class = $this->_scopeConfig->getValue(
+        $class = $this->scopeConfig->getValue(
             $this->getMethodModelConfigName($code),
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -135,7 +125,7 @@ public function getStoreMethods($store = null, $quote = null)
         $methods = $this->getPaymentMethods();
 
         foreach (array_keys($methods) as $code) {
-            $model = $this->_scopeConfig->getValue(
+            $model = $this->scopeConfig->getValue(
                 $this->getMethodModelConfigName($code),
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
@@ -323,7 +313,7 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
      */
     public function isZeroSubTotal($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ACTIVE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -338,7 +328,7 @@ public function isZeroSubTotal($store = null)
      */
     public function getZeroSubTotalOrderStatus($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ORDER_STATUS,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -353,7 +343,7 @@ public function getZeroSubTotalOrderStatus($store = null)
      */
     public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index b5b23229d7270..6c0e38b8e980e 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -11,7 +11,7 @@
 
 use Magento\Store\Model\ScopeInterface;
 
-class Data extends \Magento\Core\Helper\Data
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const XML_PATH_ENABLED = 'persistent/options/enabled';
 
@@ -44,34 +44,18 @@ class Data extends \Magento\Core\Helper\Data
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Module\Dir\Reader $modulesReader
      * @param \Magento\Framework\Escaper $escaper
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Dir\Reader $modulesReader,
-        \Magento\Framework\Escaper $escaper,
-        $dbCompatibleMode = true
+        \Magento\Framework\Escaper $escaper
     ) {
         $this->_modulesReader = $modulesReader;
         $this->_escaper = $escaper;
-
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
@@ -83,7 +67,7 @@ public function __construct(
      */
     public function isEnabled($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ENABLED,
             ScopeInterface::SCOPE_STORE,
             $store
@@ -98,7 +82,7 @@ public function isEnabled($store = null)
      */
     public function isRememberMeEnabled($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_REMEMBER_ME_ENABLED,
             ScopeInterface::SCOPE_STORE,
             $store
@@ -113,7 +97,7 @@ public function isRememberMeEnabled($store = null)
      */
     public function isRememberMeCheckedDefault($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_REMEMBER_ME_DEFAULT,
             ScopeInterface::SCOPE_STORE,
             $store
@@ -128,7 +112,7 @@ public function isRememberMeCheckedDefault($store = null)
      */
     public function isShoppingCartPersist($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_PERSIST_SHOPPING_CART,
             ScopeInterface::SCOPE_STORE,
             $store
@@ -144,7 +128,7 @@ public function isShoppingCartPersist($store = null)
     public function getLifeTime($store = null)
     {
         $lifeTime = intval(
-            $this->_scopeConfig->getValue(
+            $this->scopeConfig->getValue(
                 self::XML_PATH_LIFE_TIME,
                 ScopeInterface::SCOPE_STORE,
                 $store
@@ -161,7 +145,7 @@ public function getLifeTime($store = null)
      */
     public function getClearOnLogout()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_LOGOUT_CLEAR,
             ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Persistent/Helper/Session.php b/app/code/Magento/Persistent/Helper/Session.php
index 57a880e30f431..f3b5b8252b425 100644
--- a/app/code/Magento/Persistent/Helper/Session.php
+++ b/app/code/Magento/Persistent/Helper/Session.php
@@ -8,7 +8,7 @@
 /**
  * Persistent Shopping Cart Data Helper
  */
-class Session extends \Magento\Core\Helper\Data
+class Session extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Instance of Session Model
@@ -47,37 +47,22 @@ class Session extends \Magento\Core\Helper\Data
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param Data $persistentData
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Persistent\Model\SessionFactory $sessionFactory
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Persistent\Helper\Data $persistentData,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Persistent\Model\SessionFactory $sessionFactory,
-        $dbCompatibleMode = true
+        \Magento\Persistent\Model\SessionFactory $sessionFactory
     ) {
         $this->_persistentData = $persistentData;
         $this->_checkoutSession = $checkoutSession;
         $this->_sessionFactory = $sessionFactory;
 
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
index 4ffb1cae8b9ea..bfdac45a7843a 100644
--- a/app/code/Magento/ProductAlert/Helper/Data.php
+++ b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -28,13 +28,6 @@ class Data extends \Magento\Core\Helper\Url
      */
     protected $_coreRegistry = null;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Framework\View\LayoutInterface
      */
@@ -45,18 +38,15 @@ class Data extends \Magento\Core\Helper\Url
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\View\LayoutInterface $layout
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_layout = $layout;
-        $this->_scopeConfig = $scopeConfig;
         parent::__construct($context, $storeManager);
     }
 
@@ -135,7 +125,7 @@ public function createBlock($block)
      */
     public function isStockAlertAllowed()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\ProductAlert\Model\Observer::XML_PATH_STOCK_ALLOW,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -148,7 +138,7 @@ public function isStockAlertAllowed()
      */
     public function isPriceAlertAllowed()
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\ProductAlert\Model\Observer::XML_PATH_PRICE_ALLOW,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index b44a29ec6c42f..4cdf51a7af84a 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -91,7 +91,7 @@ class Product extends \Magento\Framework\App\Action\Action
     /**
      * Core form key validator
      *
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -107,7 +107,7 @@ class Product extends \Magento\Framework\App\Action\Action
      * @param \Magento\Catalog\Model\Design $catalogDesign
      * @param \Magento\Framework\Session\Generic $reviewSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -122,7 +122,7 @@ public function __construct(
         \Magento\Catalog\Model\Design $catalogDesign,
         \Magento\Framework\Session\Generic $reviewSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
     ) {
         $this->_storeManager = $storeManager;
         $this->_coreRegistry = $coreRegistry;
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index a514519405b27..096c8d3901373 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -22,13 +22,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $filter;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * Escaper
      *
@@ -38,17 +31,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Filter\FilterManager $filter
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\Filter\FilterManager $filter
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_escaper = $escaper;
         $this->filter = $filter;
         parent::__construct($context);
@@ -84,7 +74,7 @@ public function getDetailHtml($origDetail)
      */
     public function getIsGuestAllowToWrite()
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 5310f1b5882fd..93d0b2261c532 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -5,7 +5,6 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta8",
         "magento/module-catalog": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/module-customer": "0.42.0-beta8",
         "magento/module-eav": "0.42.0-beta8",
         "magento/module-theme": "0.42.0-beta8",
@@ -16,7 +15,8 @@
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-cookie": "0.42.0-beta8"
+        "magento/module-cookie": "0.42.0-beta8",
+        "magento/module-core": "0.42.0-beta8"
     },
     "type": "magento2-module",
     "version": "0.42.0-beta8",
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index ca5f98286d6b9..1b3cb7e709b50 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -35,7 +35,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
      * @param \Magento\Customer\Model\Options $options
@@ -55,7 +55,7 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
         \Magento\Customer\Model\Options $options,
@@ -76,7 +76,7 @@ public function __construct(
             $priceCurrency,
             $formFactory,
             $dataObjectProcessor,
-            $coreData,
+            $directoryHelper,
             $jsonEncoder,
             $customerFormFactory,
             $options,
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index b139f03143526..c5c8b603ea78b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -29,11 +29,11 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
     protected $_jsonEncoder;
 
     /**
-     * Core data
+     * Directory helper
      *
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Directory\Helper\Data
      */
-    protected $_coreData;
+    protected $directoryHelper;
 
     /**
      * Customer options
@@ -84,7 +84,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
      * @param \Magento\Customer\Model\Options $options
@@ -96,7 +96,6 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @internal param \Magento\Framework\Api\ExtensibleDataObjectConverter $convertor
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -105,7 +104,7 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
         \Magento\Customer\Model\Options $options,
@@ -117,7 +116,7 @@ public function __construct(
         array $data = []
     ) {
         $this->options = $options;
-        $this->_coreData = $coreData;
+        $this->directoryHelper = $directoryHelper;
         $this->_jsonEncoder = $jsonEncoder;
         $this->_customerFormFactory = $customerFormFactory;
         $this->_addressHelper = $addressHelper;
@@ -175,7 +174,7 @@ public function getAddressCollection()
      */
     public function getAddressCollectionJson()
     {
-        $defaultCountryId = $this->_coreData->getDefaultCountry($this->getStore());
+        $defaultCountryId = $this->directoryHelper->getDefaultCountry($this->getStore());
         $emptyAddressForm = $this->_customerFormFactory->create(
             'customer_address',
             'adminhtml_customer_address',
@@ -260,7 +259,9 @@ protected function _prepareForm()
             }
         }
         if (is_null($this->_form->getElement('country_id')->getValue())) {
-            $this->_form->getElement('country_id')->setValue($this->_coreData->getDefaultCountry($this->getStore()));
+            $this->_form->getElement('country_id')->setValue(
+                $this->directoryHelper->getDefaultCountry($this->getStore())
+            );
         }
 
         // Set custom renderer for VAT field if needed
diff --git a/app/code/Magento/Sales/Helper/Data.php b/app/code/Magento/Sales/Helper/Data.php
index 80a5f59a03e2c..4c0864b096086 100644
--- a/app/code/Magento/Sales/Helper/Data.php
+++ b/app/code/Magento/Sales/Helper/Data.php
@@ -12,7 +12,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Data extends \Magento\Core\Helper\Data
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Check allow to send new order confirmation email
@@ -22,7 +22,7 @@ class Data extends \Magento\Core\Helper\Data
      */
     public function canSendNewOrderConfirmationEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\OrderIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -48,7 +48,7 @@ public function canSendNewOrderEmail($store = null)
      */
     public function canSendOrderCommentEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -63,7 +63,7 @@ public function canSendOrderCommentEmail($store = null)
      */
     public function canSendNewShipmentEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -78,7 +78,7 @@ public function canSendNewShipmentEmail($store = null)
      */
     public function canSendShipmentCommentEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -93,7 +93,7 @@ public function canSendShipmentCommentEmail($store = null)
      */
     public function canSendNewInvoiceEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -108,7 +108,7 @@ public function canSendNewInvoiceEmail($store = null)
      */
     public function canSendInvoiceCommentEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -123,7 +123,7 @@ public function canSendInvoiceCommentEmail($store = null)
      */
     public function canSendNewCreditmemoEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -138,7 +138,7 @@ public function canSendNewCreditmemoEmail($store = null)
      */
     public function canSendCreditmemoCommentEmail($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index 48424133a1981..f194cb9b55ba9 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -12,7 +12,7 @@
  * Sales module base helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Guest extends \Magento\Core\Helper\Data
+class Guest extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
      * Core registry
@@ -66,12 +66,14 @@ class Guest extends \Magento\Core\Helper\Data
      */
     const COOKIE_LIFETIME = 600;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $_storeManager;
+
     /**
      * @param App\Helper\Context $context
-     * @param App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
@@ -79,39 +81,31 @@ class Guest extends \Magento\Core\Helper\Data
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
-     * @param bool $dbCompatibleMode
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         App\Helper\Context $context,
-        App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
-        $dbCompatibleMode = true
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
     ) {
         $this->coreRegistry = $coreRegistry;
+        $this->_storeManager = $storeManager;
         $this->customerSession = $customerSession;
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->messageManager = $messageManager;
         $this->orderFactory = $orderFactory;
         $this->resultRedirectFactory = $resultRedirectFactory;
+
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index f93c02fccdef0..56ee37c0e0891 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -11,7 +11,7 @@
 /**
  * Sales module base helper
  */
-class Reorder extends \Magento\Core\Helper\Data
+class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
 
@@ -22,30 +22,15 @@ class Reorder extends \Magento\Core\Helper\Data
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param bool $dbCompatibleMode
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        \Magento\Customer\Model\Session $customerSession,
-        $dbCompatibleMode = true
+        \Magento\Customer\Model\Session $customerSession
     ) {
         $this->_customerSession = $customerSession;
         parent::__construct(
-            $context,
-            $scopeConfig,
-            $storeManager,
-            $appState,
-            $priceCurrency,
-            $dbCompatibleMode
+            $context
         );
     }
 
@@ -65,7 +50,7 @@ public function isAllow()
      */
     public function isAllowed($store = null)
     {
-        if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
+        if ($this->scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 2b3282ae12e64..a9e4701d2b14e 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -47,24 +47,14 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_couponParameters;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $couponParameters
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         array $couponParameters
     ) {
-        $this->_scopeConfig = $scopeConfig;
         $this->_couponParameters = $couponParameters;
         parent::__construct($context);
     }
@@ -90,7 +80,7 @@ public function getFormatsList()
      */
     public function getDefaultLength()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -100,7 +90,7 @@ public function getDefaultLength()
      */
     public function getDefaultFormat()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -110,7 +100,7 @@ public function getDefaultFormat()
      */
     public function getDefaultPrefix()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -120,7 +110,7 @@ public function getDefaultPrefix()
      */
     public function getDefaultSuffix()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -130,7 +120,7 @@ public function getDefaultSuffix()
      */
     public function getDefaultDashInterval()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index 603f9317fe2b3..94958da6a1538 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -54,13 +54,6 @@ class Data extends AbstractHelper
      */
     protected $string;
 
-    /**
-     * Core store config
-     *
-     * @var ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * Query factory
      *
@@ -88,7 +81,6 @@ class Data extends AbstractHelper
      *
      * @param Context $context
      * @param String $string
-     * @param ScopeConfigInterface $scopeConfig
      * @param QueryFactory $queryFactory
      * @param Escaper $escaper
      * @param FilterManager $filter
@@ -97,14 +89,12 @@ class Data extends AbstractHelper
     public function __construct(
         Context $context,
         String $string,
-        ScopeConfigInterface $scopeConfig,
         QueryFactory $queryFactory,
         Escaper $escaper,
         FilterManager $filter,
         StoreManagerInterface $storeManager
     ) {
         $this->string = $string;
-        $this->_scopeConfig = $scopeConfig;
         $this->_queryFactory = $queryFactory;
         $this->_escaper = $escaper;
         $this->filter = $filter;
@@ -190,7 +180,7 @@ public function getSearchTermUrl()
      */
     public function getMinQueryLength($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             SearchQuery::XML_PATH_MIN_QUERY_LENGTH,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -205,7 +195,7 @@ public function getMinQueryLength($store = null)
      */
     public function getMaxQueryLength($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             SearchQuery::XML_PATH_MAX_QUERY_LENGTH,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index 0a68112d86f64..6cad9f9de9b6d 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -52,13 +52,12 @@ class QueryFactory implements QueryFactoryInterface
     public function __construct(
         Context $context,
         ObjectManagerInterface $objectManager,
-        StdlibString $string,
-        ScopeConfigInterface $scopeConfig
+        StdlibString $string
     ) {
         $this->request = $context->getRequest();
         $this->objectManager = $objectManager;
         $this->string = $string;
-        $this->scopeConfig = $scopeConfig;
+        $this->scopeConfig = $context->getScopeConfig();
     }
 
     /**
diff --git a/app/code/Magento/Sendfriend/Controller/Product.php b/app/code/Magento/Sendfriend/Controller/Product.php
index ebd8af5fc96ab..b34e10e7ebde9 100644
--- a/app/code/Magento/Sendfriend/Controller/Product.php
+++ b/app/code/Magento/Sendfriend/Controller/Product.php
@@ -24,7 +24,7 @@ class Product extends \Magento\Framework\App\Action\Action
     protected $_coreRegistry = null;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -39,14 +39,14 @@ class Product extends \Magento\Framework\App\Action\Action
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Sendfriend\Model\Sendfriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Sendfriend\Model\Sendfriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
     ) {
diff --git a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
index 3dd70be8122f0..ca75b288bd989 100644
--- a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
@@ -19,7 +19,7 @@ class Sendmail extends \Magento\Sendfriend\Controller\Product
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Sendfriend\Model\Sendfriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
@@ -27,7 +27,7 @@ class Sendmail extends \Magento\Sendfriend\Controller\Product
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Sendfriend\Model\Sendfriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
diff --git a/app/code/Magento/Sendfriend/Helper/Data.php b/app/code/Magento/Sendfriend/Helper/Data.php
index e7befbc90105f..28d367383b94e 100644
--- a/app/code/Magento/Sendfriend/Helper/Data.php
+++ b/app/code/Magento/Sendfriend/Helper/Data.php
@@ -33,25 +33,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const CHECK_COOKIE = 0;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        parent::__construct($context);
-    }
-
     /**
      * Check is enabled Module
      *
@@ -60,7 +41,7 @@ public function __construct(
      */
     public function isEnabled($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -71,7 +52,7 @@ public function isEnabled($store = null)
      */
     public function isAllowForGuest($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -82,7 +63,7 @@ public function isAllowForGuest($store = null)
      */
     public function getMaxRecipients($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -93,7 +74,7 @@ public function getMaxRecipients($store = null)
      */
     public function getMaxEmailPerPeriod($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -114,7 +95,7 @@ public function getPeriod()
      */
     public function getLimitBy($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -125,7 +106,7 @@ public function getLimitBy($store = null)
      */
     public function getEmailTemplate($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
index 75f6f030cf8a2..3ec6934c77599 100644
--- a/app/code/Magento/Sendfriend/composer.json
+++ b/app/code/Magento/Sendfriend/composer.json
@@ -5,7 +5,6 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta8",
         "magento/module-catalog": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
         "magento/module-customer": "0.42.0-beta8",
         "magento/module-theme": "0.42.0-beta8",
         "magento/framework": "0.42.0-beta8",
diff --git a/app/code/Magento/Shipping/Helper/Carrier.php b/app/code/Magento/Shipping/Helper/Carrier.php
index 370c083fbe0c8..31465cc7dfe4c 100644
--- a/app/code/Magento/Shipping/Helper/Carrier.php
+++ b/app/code/Magento/Shipping/Helper/Carrier.php
@@ -22,25 +22,15 @@ class Carrier extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $localeResolver;
 
-    /**
-     * Store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $scopeConfig;
-
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\Locale\ResolverInterface $localeResolver
     ) {
         $this->localeResolver = $localeResolver;
-        $this->scopeConfig = $scopeConfig;
         parent::__construct($context);
     }
 
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index c7cddf2cab81c..8eb59b34cc5b9 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -20,20 +20,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_allowedHashKeys = ['ship_id', 'order_id', 'track_id'];
 
-    /**
-     * Core data
-     *
-     * @var \Magento\Core\Helper\Data
-     */
-    protected $_coreData = null;
-
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -41,18 +27,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
-        $this->_coreData = $coreData;
-        $this->_scopeConfig = $scopeConfig;
         $this->_storeManager = $storeManager;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index 2f12675550375..e3265d359c736 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -63,25 +63,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**#@-*/
     const XML_PATH_PRODUCT_IMAGES_INCLUDE = 'sitemap/product/image_include';
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        parent::__construct($context);
-    }
-
     /**
      * Get maximum sitemap.xml URLs number
      *
@@ -90,7 +71,7 @@ public function __construct(
      */
     public function getMaximumLinesNumber($storeId)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_MAX_LINES,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -105,7 +86,7 @@ public function getMaximumLinesNumber($storeId)
      */
     public function getMaximumFileSize($storeId)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_MAX_FILE_SIZE,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -120,7 +101,7 @@ public function getMaximumFileSize($storeId)
      */
     public function getCategoryChangefreq($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_CATEGORY_CHANGEFREQ,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -135,7 +116,7 @@ public function getCategoryChangefreq($storeId)
      */
     public function getProductChangefreq($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_PRODUCT_CHANGEFREQ,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -150,7 +131,7 @@ public function getProductChangefreq($storeId)
      */
     public function getPageChangefreq($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_PAGE_CHANGEFREQ,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -165,7 +146,7 @@ public function getPageChangefreq($storeId)
      */
     public function getCategoryPriority($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_CATEGORY_PRIORITY,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -180,7 +161,7 @@ public function getCategoryPriority($storeId)
      */
     public function getProductPriority($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_PRODUCT_PRIORITY,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -195,7 +176,7 @@ public function getProductPriority($storeId)
      */
     public function getPagePriority($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_PAGE_PRIORITY,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -210,7 +191,7 @@ public function getPagePriority($storeId)
      */
     public function getEnableSubmissionRobots($storeId)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_SUBMISSION_ROBOTS,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -225,7 +206,7 @@ public function getEnableSubmissionRobots($storeId)
      */
     public function getProductImageIncludePolicy($storeId)
     {
-        return (string)$this->_scopeConfig->getValue(
+        return (string)$this->scopeConfig->getValue(
             self::XML_PATH_PRODUCT_IMAGES_INCLUDE,
             ScopeInterface::SCOPE_STORE,
             $storeId
@@ -240,8 +221,8 @@ public function getProductImageIncludePolicy($storeId)
     public function getValidPaths()
     {
         return array_merge(
-            $this->_scopeConfig->getValue(self::XML_PATH_SITEMAP_VALID_PATHS, ScopeInterface::SCOPE_STORE),
-            $this->_scopeConfig->getValue(self::XML_PATH_PUBLIC_FILES_VALID_PATHS, ScopeInterface::SCOPE_STORE)
+            $this->scopeConfig->getValue(self::XML_PATH_SITEMAP_VALID_PATHS, ScopeInterface::SCOPE_STORE),
+            $this->scopeConfig->getValue(self::XML_PATH_PUBLIC_FILES_VALID_PATHS, ScopeInterface::SCOPE_STORE)
         );
     }
 }
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 9ac06a3058ba9..b418c7b2118df 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Store\App\Action\Plugin;
 
+use Magento\Framework\App\Http\Context as HttpContext;
+
 /**
  * Class ContextPlugin
  */
@@ -63,13 +65,13 @@ public function aroundDispatch(
     ) {
         $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
         $this->httpContext->setValue(
-            \Magento\Core\Helper\Data::CONTEXT_CURRENCY,
+            HttpContext::CONTEXT_CURRENCY,
             $this->session->getCurrencyCode(),
             $defaultStore->getDefaultCurrency()->getCode()
         );
 
         $this->httpContext->setValue(
-            \Magento\Core\Helper\Data::CONTEXT_STORE,
+            HttpContext::CONTEXT_STORE,
             $this->httpRequest->getParam(
                 '___store',
                 $defaultStore->getStoreCodeFromCookie()
diff --git a/app/code/Magento/Store/Block/Store/Switcher.php b/app/code/Magento/Store/Block/Store/Switcher.php
index 81cba0a463f18..ade36b90e339c 100644
--- a/app/code/Magento/Store/Block/Store/Switcher.php
+++ b/app/code/Magento/Store/Block/Store/Switcher.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\Store\Block\Store;
 
+use Magento\Directory\Helper\Data;
+
 class Switcher extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -88,7 +90,7 @@ protected function _loadData()
                 continue;
             }
             $store->setLocaleCode($this->_scopeConfig->getValue(
-                \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+                Data::XML_PATH_DEFAULT_LOCALE,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store->getId()
             ));
@@ -107,7 +109,7 @@ public function getStoreCount()
     {
         $stores = [];
         $localeCode = $this->_scopeConfig->getValue(
-            \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+            Data::XML_PATH_DEFAULT_LOCALE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         foreach ($this->_groups as $group) {
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index ffbcfec3868b8..33ac7e98f477a 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -9,6 +9,7 @@
  */
 namespace Magento\Store\Block;
 
+use Magento\Directory\Helper\Data;
 use Magento\Store\Model\Group;
 
 class Switcher extends \Magento\Framework\View\Element\Template
@@ -94,7 +95,7 @@ public function getRawStores()
                     continue;
                 }
                 $localeCode = $this->_scopeConfig->getValue(
-                    \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+                    Data::XML_PATH_DEFAULT_LOCALE,
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $store
                 );
@@ -126,7 +127,7 @@ public function getGroups()
 
             $groups = [];
             $localeCode = $this->_scopeConfig->getValue(
-                \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+                Data::XML_PATH_DEFAULT_LOCALE,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             foreach ($rawGroups as $group) {
diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
new file mode 100644
index 0000000000000..aa895ee18b66c
--- /dev/null
+++ b/app/code/Magento/Store/Model/PathConfig.php
@@ -0,0 +1,81 @@
+<?php
+/***
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Model;
+
+class PathConfig implements \Magento\Framework\App\Router\PathConfigInterface
+{
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
+    private $scopeConfig;
+    /** @var \Magento\Framework\Url\SecurityInfoInterface */
+    private $urlSecurityInfo;
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
+        StoreManagerInterface $storeManager
+    ) {
+
+        $this->scopeConfig = $scopeConfig;
+        $this->urlSecurityInfo = $urlSecurityInfo;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @return string
+     */
+    public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
+    {
+        $alias = $request->getAlias(\Magento\Framework\Url::REWRITE_REQUEST_PATH_ALIAS) ?: $request->getPathInfo();
+        return $this->storeManager->getStore()->getBaseUrl('link', true) . ltrim($alias, '/');
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function shouldBeSecure($path)
+    {
+        return parse_url(
+            $this->scopeConfig->getValue(
+                Store::XML_PATH_UNSECURE_BASE_URL,
+                ScopeInterface::SCOPE_STORE
+            ),
+            PHP_URL_SCHEME
+        ) === 'https'
+        || $this->scopeConfig->isSetFlag(
+            Store::XML_PATH_SECURE_IN_FRONTEND,
+            ScopeInterface::SCOPE_STORE
+        ) && parse_url(
+            $this->scopeConfig->getValue(
+                Store::XML_PATH_SECURE_BASE_URL,
+                ScopeInterface::SCOPE_STORE
+            ),
+            PHP_URL_SCHEME
+        ) == 'https' && $this->urlSecurityInfo->isSecure($path);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getDefaultPath()
+    {
+        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+    }
+}
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index a3e374c9d3cde..15d22e1cc17ed 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -6,7 +6,9 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Http\Context;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Store model
@@ -53,7 +55,7 @@ class Store extends AbstractModel implements
     const XML_PATH_UNSECURE_BASE_URL = 'web/unsecure/base_url';
 
     const XML_PATH_SECURE_BASE_URL = 'web/secure/base_url';
-
+    
     const XML_PATH_SECURE_IN_FRONTEND = 'web/secure/use_in_frontend';
 
     const XML_PATH_SECURE_IN_ADMINHTML = 'web/secure/use_in_adminhtml';
@@ -541,7 +543,9 @@ public function getBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LIN
             $secure = is_null($secure) ? $this->isCurrentlySecure() : (bool)$secure;
             switch ($type) {
                 case \Magento\Framework\UrlInterface::URL_TYPE_WEB:
-                    $path = $secure ? self::XML_PATH_SECURE_BASE_URL : self::XML_PATH_UNSECURE_BASE_URL;
+                    $path = $secure
+                        ? self::XML_PATH_SECURE_BASE_URL
+                        : self::XML_PATH_UNSECURE_BASE_URL;
                     $url = $this->_getConfig($path);
                     break;
 
@@ -839,7 +843,7 @@ public function setCurrentCurrencyCode($code)
             $this->_getSession()->setCurrencyCode($code);
 
             $this->_httpContext->setValue(
-                \Magento\Core\Helper\Data::CONTEXT_CURRENCY,
+                Context::CONTEXT_CURRENCY,
                 $code,
                 $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode()
             );
@@ -855,7 +859,7 @@ public function setCurrentCurrencyCode($code)
     public function getCurrentCurrencyCode()
     {
         // try to get currently set code among allowed
-        $code = $this->_httpContext->getValue(\Magento\Core\Helper\Data::CONTEXT_CURRENCY);
+        $code = $this->_httpContext->getValue(Context::CONTEXT_CURRENCY);
         $code = is_null($code) ? $this->_getSession()->getCurrencyCode() : $code;
         if (empty($code)) {
             $code = $this->getDefaultCurrencyCode();
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index bdb2be6dbf61f..9312f451613d9 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -56,8 +56,10 @@
     </type>
     <preference for="Magento\Framework\App\Config\Scope\ReaderPoolInterface" type="Magento\Store\Model\Config\Reader\ReaderPool"/>
     <preference for="Magento\Framework\App\ScopeResolverInterface" type="Magento\Store\Model\Resolver\Store" />
+    <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\Action\Action">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
+        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
     </type>
     <type name="Magento\Framework\Url\SecurityInfo">
         <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
@@ -166,6 +168,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Router\NoRouteHandlerList">
+        <arguments>
+            <argument name="handlerClassesList" xsi:type="array">
+                <item name="default" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Framework\App\Router\NoRouteHandler</item>
+                    <item name="sortOrder" xsi:type="string">100</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\App\AreaList">
         <arguments>
             <argument name="areas" xsi:type="array">
diff --git a/app/code/Magento/Store/etc/frontend/di.xml b/app/code/Magento/Store/etc/frontend/di.xml
index fc38b7d95f761..173e999d5111e 100644
--- a/app/code/Magento/Store/etc/frontend/di.xml
+++ b/app/code/Magento/Store/etc/frontend/di.xml
@@ -12,4 +12,20 @@
     <type name="Magento\Framework\App\Action\Action">
         <plugin name="contextPlugin" type="Magento\Store\App\Action\Plugin\Context" sortOrder="10"/>
     </type>
+    <type name="Magento\Framework\App\RouterList" shared="true">
+        <arguments>
+            <argument name="routerList" xsi:type="array">
+                <item name="standard" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Framework\App\Router\Base</item>
+                    <item name="disable" xsi:type="boolean">false</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+                <item name="default" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Framework\App\Router\DefaultRouter</item>
+                    <item name="disable" xsi:type="boolean">false</item>
+                    <item name="sortOrder" xsi:type="string">100</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 003b0dc7fac1f..f1c63e3f5eede 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -65,13 +65,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_coreRegistry;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -135,7 +128,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context                         $context
      * @param \Magento\Core\Helper\Data                                     $coreData
      * @param \Magento\Framework\Registry                                   $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface            $scopeConfig
      * @param Config                                                        $taxConfig
      * @param \Magento\Store\Model\StoreManagerInterface                    $storeManager
      * @param \Magento\Framework\Locale\FormatInterface                     $localeFormat
@@ -154,7 +146,6 @@ public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Core\Helper\Data $coreData,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         Config $taxConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
@@ -170,7 +161,6 @@ public function __construct(
     ) {
         parent::__construct($context);
         $this->priceCurrency = $priceCurrency;
-        $this->_scopeConfig = $scopeConfig;
         $this->_config = $taxConfig;
         $this->_coreData = $coreData;
         $this->_coreRegistry = $coreRegistry;
@@ -545,7 +535,7 @@ public function discountTax($store = null)
      */
     public function getTaxBasedOn($store = null)
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             Config::CONFIG_XML_PATH_BASED_ON,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -560,7 +550,7 @@ public function getTaxBasedOn($store = null)
      */
     public function applyTaxOnCustomPrice($store = null)
     {
-        return (int) $this->_scopeConfig->getValue(
+        return (int) $this->scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -575,7 +565,7 @@ public function applyTaxOnCustomPrice($store = null)
      */
     public function applyTaxOnOriginalPrice($store = null)
     {
-        return (int) $this->_scopeConfig->getValue(
+        return (int) $this->scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -708,7 +698,7 @@ protected function _getTaxRateSubtotals($order)
      */
     public function getDefaultCustomerTaxClass()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::CONFIG_DEFAULT_CUSTOMER_TAX_CLASS,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -721,7 +711,7 @@ public function getDefaultCustomerTaxClass()
      */
     public function getDefaultProductTaxClass()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::CONFIG_DEFAULT_PRODUCT_TAX_CLASS,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Translation/Model/Inline/Config.php b/app/code/Magento/Translation/Model/Inline/Config.php
index 9545445dd9651..e624ce75acf9b 100644
--- a/app/code/Magento/Translation/Model/Inline/Config.php
+++ b/app/code/Magento/Translation/Model/Inline/Config.php
@@ -15,23 +15,23 @@ class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
-    protected $_scopeConfig;
+    protected $scopeConfig;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Developer\Helper\Data
      */
-    protected $_helper;
+    protected $devHelper;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Core\Helper\Data $helper
+     * @param \Magento\Developer\Helper\Data $helper
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Core\Helper\Data $helper
+        \Magento\Developer\Helper\Data $helper
     ) {
-        $this->_scopeConfig = $scopeConfig;
-        $this->_helper = $helper;
+        $this->scopeConfig = $scopeConfig;
+        $this->devHelper = $helper;
     }
 
     /**
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function isActive($scope = null)
     {
-        return $this->_scopeConfig->isSetFlag(
+        return $this->scopeConfig->isSetFlag(
             'dev/translate_inline/active',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $scope
@@ -51,6 +51,6 @@ public function isActive($scope = null)
      */
     public function isDevAllowed($scope = null)
     {
-        return $this->_helper->isDevAllowed($scope);
+        return $this->devHelper->isDevAllowed($scope);
     }
 }
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 3858cad42dcd1..a7b048a018184 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta8",
-        "magento/module-core": "0.42.0-beta8",
+        "magento/module-developer": "0.42.0-beta8",
         "magento/module-store": "0.42.0-beta8",
         "magento/module-theme": "0.42.0-beta8",
         "magento/framework": "0.42.0-beta8",
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
new file mode 100644
index 0000000000000..ce3a9209a317e
--- /dev/null
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Version\Controller\Index;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Magento Version controller
+ */
+class Index extends Action
+{
+    const PRODUCT_NAME = "Magento";
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    protected $productMetadata;
+
+    /**
+     * @param Context $context
+     * @param ProductMetadataInterface $productMetadata
+     */
+    public function __construct(Context $context, ProductMetadataInterface $productMetadata)
+    {
+        $this->productMetadata = $productMetadata;
+        parent::__construct($context);
+    }
+
+    /**
+     * Sets the response body with ProductName/Version (Edition). E.g.: Magento/0.42.0-beta3 (Community)
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        $this->getResponse()->setBody(
+            self::PRODUCT_NAME . '/' .
+            $this->productMetadata->getVersion() . ' (' .
+            $this->productMetadata->getEdition() . ')'
+        );
+    }
+}
diff --git a/app/code/Magento/Version/LICENSE.txt b/app/code/Magento/Version/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Version/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Version/LICENSE_AFL.txt b/app/code/Magento/Version/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..87943b95d43a5
--- /dev/null
+++ b/app/code/Magento/Version/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Version/README.md b/app/code/Magento/Version/README.md
new file mode 100644
index 0000000000000..f07074e629b78
--- /dev/null
+++ b/app/code/Magento/Version/README.md
@@ -0,0 +1 @@
+Magento\Version Allows to get Magento version and edition by HTTP GET request
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
new file mode 100644
index 0000000000000..e3cdba1456cf8
--- /dev/null
+++ b/app/code/Magento/Version/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/module-version",
+    "description": "N/A",
+    "require": {
+        "php": "~5.4.11|~5.5.0|~5.6.0",
+        "magento/framework": "0.42.0-beta7",
+        "magento/magento-composer-installer": "*"
+    },
+    "type": "magento2-module",
+    "version": "0.42.0-beta8",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "extra": {
+        "map": [
+            [
+                "*",
+                "Magento/Version"
+            ]
+        ]
+    }
+}
diff --git a/app/code/Magento/Version/etc/frontend/routes.xml b/app/code/Magento/Version/etc/frontend/routes.xml
new file mode 100644
index 0000000000000..f9a5753198040
--- /dev/null
+++ b/app/code/Magento/Version/etc/frontend/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
+    <router id="standard">
+        <route id="magento_version" frontName="magento_version">
+            <module name="Magento_Version" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Version/etc/module.xml b/app/code/Magento/Version/etc/module.xml
new file mode 100644
index 0000000000000..56a1330f13953
--- /dev/null
+++ b/app/code/Magento/Version/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+    <module name="Magento_Version" schema_version="2.0.0">
+    </module>
+</config>
diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
index 5c976aab52de3..fa77209470341 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
-use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Wishlist\Controller\IndexInterface;
@@ -26,20 +26,20 @@ class Allcart extends Action\Action implements IndexInterface
     protected $itemCarrier;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $formKeyValidator;
 
     /**
      * @param Context $context
      * @param WishlistProviderInterface $wishlistProvider
-     * @param FormKeyValidator $formKeyValidator
+     * @param Validator $formKeyValidator
      * @param ItemCarrier $itemCarrier
      */
     public function __construct(
         Context $context,
         WishlistProviderInterface $wishlistProvider,
-        FormKeyValidator $formKeyValidator,
+        Validator $formKeyValidator,
         ItemCarrier $itemCarrier
     ) {
         $this->wishlistProvider = $wishlistProvider;
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index c989d815bda47..ab34d992829ef 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -47,13 +47,13 @@ class Send extends Action\Action implements IndexInterface
     protected $_customerSession;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
     /**
      * @param Action\Context $context
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param \Magento\Wishlist\Model\Config $wishlistConfig
@@ -63,7 +63,7 @@ class Send extends Action\Action implements IndexInterface
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
         \Magento\Wishlist\Model\Config $wishlistConfig,
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 3a35fced9d37c..98674b21e40dd 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -19,7 +19,7 @@ class Update extends Action\Action implements IndexInterface
     protected $wishlistProvider;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -30,13 +30,13 @@ class Update extends Action\Action implements IndexInterface
 
     /**
      * @param Action\Context $context
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
         \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
     ) {
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index d0216995de92a..6b5b6567d25ea 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -60,13 +60,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_coreRegistry;
 
-    /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Customer\Model\Session
      */
@@ -100,7 +93,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -111,7 +103,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -120,7 +111,6 @@ public function __construct(
         WishlistProviderInterface $wishlistProvider
     ) {
         $this->_coreRegistry = $coreRegistry;
-        $this->_scopeConfig = $scopeConfig;
         $this->_customerSession = $customerSession;
         $this->_wishlistFactory = $wishlistFactory;
         $this->_storeManager = $storeManager;
@@ -200,13 +190,13 @@ public function getWishlist()
     public function getItemCount()
     {
         $storedDisplayType = $this->_customerSession->getWishlistDisplayType();
-        $currentDisplayType = $this->_scopeConfig->getValue(
+        $currentDisplayType = $this->scopeConfig->getValue(
             self::XML_PATH_WISHLIST_LINK_USE_QTY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $storedDisplayOutOfStockProducts = $this->_customerSession->getDisplayOutOfStockProducts();
-        $currentDisplayOutOfStockProducts = $this->_scopeConfig->getValue(
+        $currentDisplayOutOfStockProducts = $this->scopeConfig->getValue(
             self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
@@ -428,7 +418,7 @@ public function getListUrl($wishlistId = null)
      */
     public function isAllow()
     {
-        if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->_scopeConfig->getValue(
+        if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->scopeConfig->getValue(
             'wishlist/general/active',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
@@ -511,7 +501,7 @@ public function calculate()
         $count = 0;
         if ($this->getCustomer()) {
             $collection = $this->getWishlistItemCollection()->setInStockFilter(true);
-            if ($this->_scopeConfig->getValue(
+            if ($this->scopeConfig->getValue(
                 self::XML_PATH_WISHLIST_LINK_USE_QTY,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
@@ -521,13 +511,13 @@ public function calculate()
                 $count = $collection->getSize();
             }
             $this->_customerSession->setWishlistDisplayType(
-                $this->_scopeConfig->getValue(
+                $this->scopeConfig->getValue(
                     self::XML_PATH_WISHLIST_LINK_USE_QTY,
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $this->_customerSession->setDisplayOutOfStockProducts(
-                $this->_scopeConfig->getValue(
+                $this->scopeConfig->getValue(
                     self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
@@ -545,7 +535,7 @@ public function calculate()
      */
     public function isDisplayQty()
     {
-        return $this->_scopeConfig->getValue(
+        return $this->scopeConfig->getValue(
             self::XML_PATH_WISHLIST_LINK_USE_QTY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index 511e865aa5934..35feb3eaa70aa 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -29,7 +29,6 @@ class Rss extends \Magento\Wishlist\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -43,7 +42,6 @@ class Rss extends \Magento\Wishlist\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -59,7 +57,6 @@ public function __construct(
         parent::__construct(
             $context,
             $coreRegistry,
-            $scopeConfig,
             $customerSession,
             $wishlistFactory,
             $storeManager,
@@ -120,7 +117,7 @@ public function getCustomer()
     public function isRssAllow()
     {
         return $this->_moduleManager->isEnabled('Magento_Rss')
-            && $this->_scopeConfig->isSetFlag(
+            && $this->scopeConfig->isSetFlag(
                 'rss/wishlist/active',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 51412bed13d36..d2059b691f88d 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -88,6 +88,7 @@
     <preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Null"/>
     <preference for="Magento\Framework\App\Resource\ConnectionAdapterInterface" type="Magento\Framework\Model\Resource\Type\Db\Pdo\Mysql"/>
     <preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
+    <preference for="Magento\Framework\App\ProductMetadataInterface" type="Magento\Framework\App\ProductMetadata"/>
     <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
     <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
     <preference for="Magento\Framework\Module\Updater\SetupInterface" type="Magento\Framework\Module\DataSetup" />
diff --git a/composer.json b/composer.json
index f99537244fadc..37f7f854a97d4 100644
--- a/composer.json
+++ b/composer.json
@@ -131,6 +131,7 @@
         "magento/module-url-rewrite": "self.version",
         "magento/module-user": "self.version",
         "magento/module-usps": "self.version",
+        "magento/module-version": "self.version",
         "magento/module-webapi": "self.version",
         "magento/module-weee": "self.version",
         "magento/module-widget": "self.version",
diff --git a/composer.lock b/composer.lock
index bc524f1d93ccd..80c86b5780cdc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9b096e4e628bfa98cd54ea65aa9e8b6c",
+    "hash": "45de8d62464b6aa233df364df25bfe06",
     "packages": [
         {
             "name": "composer/composer",
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
index 40736b2271662..37c04f524e18c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
@@ -28,7 +28,6 @@ protected function setUp()
             '',
             false
         );
-        $coreData = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
         $fileStorageDb = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
         $filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
         $registry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
@@ -40,7 +39,6 @@ protected function setUp()
                 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Eav\Model\Config'),
                 $catalogProductType,
                 $eventManager,
-                $coreData,
                 $fileStorageDb,
                 $filesystem,
                 $registry,
diff --git a/dev/tests/integration/testsuite/Magento/Core/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Core/Helper/DataTest.php
index 32f6963805c52..30eafeedb611b 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Helper/DataTest.php
@@ -28,59 +28,6 @@ protected function setUp()
         $this->_dateTime->setTimezone(new \DateTimeZone(self::DATE_TIMEZONE));
     }
 
-    public function testCurrency()
-    {
-        $price = 10.00;
-        $priceHtml = '<span class="price">$10.00</span>';
-        $this->assertEquals($priceHtml, $this->_helper->currency($price));
-        $this->assertEquals($priceHtml, $this->_helper->formatCurrency($price));
-    }
-
-    public function testFormatPrice()
-    {
-        $price = 10.00;
-        $priceHtml = '<span class="price">$10.00</span>';
-        $this->assertEquals($priceHtml, $this->_helper->formatPrice($price));
-    }
-
-    /**
-     * @magentoAppIsolation enabled
-     */
-    public function testIsDevAllowedDefault()
-    {
-        $this->assertTrue($this->_helper->isDevAllowed());
-    }
-
-    /**
-     * @magentoConfigFixture current_store dev/restrict/allow_ips 192.168.0.1
-     * @magentoAppIsolation enabled
-     */
-    public function testIsDevAllowedTrue()
-    {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\TestFramework\Request $request */
-        $request = $objectManager->get('Magento\TestFramework\Request');
-        $request->setServer(['REMOTE_ADDR' => '192.168.0.1']);
-
-        $this->assertTrue($this->_helper->isDevAllowed());
-    }
-
-    /**
-     * @magentoConfigFixture current_store dev/restrict/allow_ips 192.168.0.1
-     * @magentoAppIsolation enabled
-     */
-    public function testIsDevAllowedFalse()
-    {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\TestFramework\Request $request */
-        $request = $objectManager->get('Magento\TestFramework\Request');
-        $request->setServer(['REMOTE_ADDR' => '192.168.0.3']);
-
-        $this->assertFalse($this->_helper->isDevAllowed());
-    }
-
     public function testJsonEncodeDecode()
     {
         $data = ['one' => 1, 'two' => 'two'];
@@ -88,9 +35,4 @@ public function testJsonEncodeDecode()
         $this->assertEquals($jsonData, $this->_helper->jsonEncode($data));
         $this->assertEquals($data, $this->_helper->jsonDecode($jsonData));
     }
-
-    public function testGetDefaultCountry()
-    {
-        $this->assertEquals('US', $this->_helper->getDefaultCountry());
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
index 92b884b1d254d..e08486410020a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
@@ -45,7 +45,8 @@ public function testGetDefaultGroupWithStoreId($testGroup, $storeId)
      * @magentoDataFixture Magento/Core/_files/second_third_store.php
      */
     public function testGetDefaultGroupWithNonDefaultStoreId()
-    {        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
+    {   
+        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
         $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
         $nonDefaultStore = $storeManager->getStore('secondstore');
         $nonDefaultStoreId = $nonDefaultStore->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Developer/Helper/DataTest.php
new file mode 100644
index 0000000000000..bce3a75d549c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Developer/Helper/DataTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Developer\Helper;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Developer\Helper\Data
+     */
+    protected $helper = null;
+
+    protected function setUp()
+    {
+        $this->helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Developer\Helper\Data'
+        );
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testIsDevAllowedDefault()
+    {
+        $this->assertTrue($this->helper->isDevAllowed());
+    }
+
+    /**
+     * @magentoConfigFixture current_store dev/restrict/allow_ips 192.168.0.1
+     * @magentoAppIsolation enabled
+     */
+    public function testIsDevAllowedTrue()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\TestFramework\Request $request */
+        $request = $objectManager->get('Magento\TestFramework\Request');
+        $request->setServer(['REMOTE_ADDR' => '192.168.0.1']);
+
+        $this->assertTrue($this->helper->isDevAllowed());
+    }
+
+    /**
+     * @magentoConfigFixture current_store dev/restrict/allow_ips 192.168.0.1
+     * @magentoAppIsolation enabled
+     */
+    public function testIsDevAllowedFalse()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\TestFramework\Request $request */
+        $request = $objectManager->get('Magento\TestFramework\Request');
+        $request->setServer(['REMOTE_ADDR' => '192.168.0.3']);
+
+        $this->assertFalse($this->helper->isDevAllowed());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Directory/Helper/DataTest.php
new file mode 100644
index 0000000000000..a7bcfe487ba24
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/Helper/DataTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Directory\Helper;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    protected $helper;
+
+    protected function setUp()
+    {
+        $this->helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Directory\Helper\Data'
+        );
+    }
+
+    public function testGetDefaultCountry()
+    {
+        $this->assertEquals('US', $this->helper->getDefaultCountry());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Core/App/Router/BaseTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Router/BaseTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Core/App/Router/BaseTest.php
rename to dev/tests/integration/testsuite/Magento/Framework/App/Router/BaseTest.php
index 1d8ff169cae08..c4fa6c52bcbf5 100644
--- a/dev/tests/integration/testsuite/Magento/Core/App/Router/BaseTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Router/BaseTest.php
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Router;
+namespace Magento\Framework\App\Router;
 
 class BaseTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\App\Router\Base
+     * @var \Magento\Framework\App\Router\Base
      */
     protected $_model;
 
@@ -16,7 +16,7 @@ protected function setUp()
     {
         $options = ['routerId' => 'standard'];
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Core\App\Router\Base',
+            'Magento\Framework\App\Router\Base',
             $options
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Pricing/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Framework/Pricing/Helper/DataTest.php
new file mode 100644
index 0000000000000..b8fa0e52ff01d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Pricing/Helper/DataTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Pricing\Helper;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $helper;
+
+    protected function setUp()
+    {
+        $this->helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Framework\Pricing\Helper\Data'
+        );
+    }
+
+    public function testCurrency()
+    {
+        $price = 10.00;
+        $priceHtml = '<span class="price">$10.00</span>';
+        $this->assertEquals($priceHtml, $this->helper->currency($price));
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 34adcfe1e31a3..ed30362e6210e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2209,6 +2209,7 @@
         'Magento\Store\App\FrontController\Plugin\RequestPreprocessor'
     ],
     ['Magento\Core\App\Response\Redirect', 'Magento\Store\App\Response\Redirect'],
+    ['Magento\Core\App\Router\Base', 'Magento\Framework\App\Router\Base'],
     ['Magento\Core\Block\Store\Switcher', 'Magento\Store\Block\Store\Switcher'],
     ['Magento\Core\Block\Switcher', 'Magento\Store\Block\Switcher'],
     ['Magento\Core\Helper\Cookie', 'Magento\Store\Helper\Cookie'],
@@ -2287,6 +2288,7 @@
     ['Magento\Core\Model\App\Area\CacheIdentifierPlugin', 'Magento\PageCache\App\CacheIdentifierPlugin'],
     ['Magento\Core\Model\App\Area', 'Magento\Framework\App\Area'],
     ['Magento\Core\Model\App\Area\DesignExceptions', 'Magento\Framework\View\DesignExceptions'],
+    ['Magento\Core\App\Action\FormKeyValidator', 'Magento\Framework\Data\Form\FormKey\Validator'],
     ['Magento\Checkout\Block\Adminhtml\Agreement', 'Magento\CheckoutAgreements\Block\Adminhtml\Agreement'],
     ['Magento\Checkout\Block\Adminhtml\Agreement\Edit', 'Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit'],
     [
@@ -2901,6 +2903,9 @@
     ['Magento\Sales\Model\Quote\Address\Total\Nominal'],
     ['Magento\Core\Model\Url\RouteParamsResolver', 'Magento\Framework\Url\RouteParamsResolver'],
     ['Magento\Core\Model\Url\SecurityInfo', 'Magento\Framework\Url\SecurityInfo'],
+    ['Magento\Core\App\Action\Plugin\Design', 'Magento\Framework\App\Action\Plugin\Design'],
+    ['Magento\Core\App\Action\Plugin\LastUrl'],
+    ['Magento\Core\App\Router\NoRouteHandler', 'Magento/Framework/App/Router/NoRouteHandler'],
     ['Magento\Sales\Model\Quote\Address\Total\Nominal\Collector'],
     ['Magento\Sales\Model\Quote\Address\Total\Nominal\Shipping'],
     ['Magento\Sales\Model\Quote\Address\Total\Nominal\Subtotal'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index a648097786fb8..80acb1a7e464f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -64,6 +64,7 @@
     ['DEFAULT_TIMEZONE', 'Magento\Framework\Locale', 'Magento_Core_Model_LocaleInterface::DEFAULT_TIMEZONE'],
     ['DEFAULT_STORE_ID', 'Magento\Catalog\Model\AbstractModel', 'Magento\Store\Model\Store::DEFAULT_STORE_ID'],
     ['DEFAULT_VALUE_TABLE_PREFIX'],
+    ['DIVIDE_EPSILON', 'Magento\Core\Helper\Data'],
     ['ENTITY_PRODUCT', 'Magento\Review\Model\Review'],
     ['EXCEPTION_CODE_IS_GROUPED_PRODUCT'],
     ['FALLBACK_MAP_DIR', 'Magento\Core\Model\Design\PackageInterface'],
@@ -162,6 +163,7 @@
     ['XML_PATH_CACHE_BETA_TYPES'],
     ['XML_PATH_CHECK_EXTENSIONS', 'Magento\Install\Model\Config'],
     ['XML_PATH_CONNECTION_TYPE', 'Magento\Framework\App\Resource\Config'],
+    ['XML_PATH_CONNECTION_TYPE', 'Magento\Core\Helper\Data'],
     ['XML_PATH_COUNTRY_DEFAULT', 'Magento\Paypal\Model\System\Config\Backend\MerchantCountry'],
     [
         'XML_PATH_DEBUG_TEMPLATE_HINTS',
@@ -174,11 +176,23 @@
         'Magento\Core\Model\TemplateEngine\Plugin::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS'
     ],
     ['XML_PATH_DEFAULT_COUNTRY', 'Magento\Framework\Locale'],
-    ['XML_PATH_DEFAULT_LOCALE', 'Magento\Framework\Locale', 'Magento_Core_Model_LocaleInterface::XML_PATH_DEFAULT_LOCALE'],
+    ['XML_PATH_DEFAULT_COUNTRY', 'Magento\Core\Helper\Data', 'Magento\Directory\Helper\Data::XML_PATH_DEFAULT_COUNTRY'],
+    ['XML_PATH_DEFAULT_LOCALE', 'Magento\Framework\Locale', 'Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE'],
+    ['XML_PATH_DEFAULT_LOCALE', 'Magento\Core\Helper\Data', 'Magento\Directory\Helper\Data::XML_PATH_DEFAULT_LOCALE'],
     [
         'XML_PATH_DEFAULT_TIMEZONE',
         'Magento\Framework\Locale',
-        'Magento_Core_Model_LocaleInterface::XML_PATH_DEFAULT_TIMEZONE'
+        'Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE'
+    ],
+    [
+        'XML_PATH_DEFAULT_TIMEZONE',
+        'Magento\Core\Helper\Data',
+        'Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE'
+    ],
+    [
+        'XML_PATH_DEV_ALLOW_IPS',
+        'Magento\Core\Helper\Data',
+        'Magento\Developer\Helper\Data::XML_PATH_DEV_ALLOW_IPS'
     ],
     ['XML_PATH_INSTALL_DATE', 'Mage_Core_Model_App', 'Mage_Core_Model_Config_Primary::XML_PATH_INSTALL_DATE'],
     ['XML_PATH_LOCALE_INHERITANCE', 'Mage_Core_Model_Translate'],
@@ -665,8 +679,10 @@
     ['REFERER_QUERY_PARAM_NAME', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Url::REFERER_QUERY_PARAM_NAME'],
     ['XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD'],
     ['XML_PATH_SUPPORT_EMAIL', 'Magento\Customer\Helper\Data'],
-    ['CONTEXT_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_GROUP'],
     ['CONTEXT_AUTH', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_AUTH'],
+    ['CONTEXT_CURRENCY', 'Magento\Customer\Helper\Data', 'Magento\Framework\App\Http\Context::CONTEXT_CURRENCY'],
+    ['CONTEXT_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_GROUP'],
+    ['CONTEXT_STORE', 'Magento\Customer\Helper\Data', 'Magento\Framework\App\Http\Context::CONTEXT_STORE'],
     ['DEBUG_CONNECT', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_CONNECT'],
     ['DEBUG_TRANSACTION', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_TRANSACTION'],
     ['DEBUG_QUERY', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_QUERY'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 935783e6f050e..c3354aa3b2033 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -323,6 +323,8 @@
     ['createDirIfNotExists', '', 'mkdir()'],
     ['createEntityTables', 'Magento\Eav\Model\Entity\Setup'],
     ['createOrderItem', 'Magento\CatalogInventory\Model\Observer'],
+    ['currency', 'Magento\Core\Helper\Data', 'Magento\Framework\Pricing\Helper\Data::currency'],
+    ['currencyByStore', 'Magento\Core\Helper\Data', 'Magento\Framework\Pricing\Helper\Data::currencyByStore'],
     ['debugRequest', 'Magento\Paypal\Model\Api\Standard'],
     ['decodeFilter', 'Magento\Backend\Helper\Data'],
     ['decorateArray', 'Magento\Core\Helper\Data', 'Magento\Framework\Stdlib\ArrayUtils::decorateArray'],
@@ -371,6 +373,12 @@
         '\Magento\ImportExport\Model\Export\ConfigInterface::getEntityTypes()'
     ],
     ['forsedSave'],
+    [
+        'formatCurrency',
+        'Magento\Core\Helper\Data',
+        '\Magento\Framework\Pricing\PriceCurrencyInterface::convertAndFormat'
+    ],
+    ['formatPrice', 'Magento\Core\Helper\Data', '\Magento\Framework\Pricing\PriceCurrencyInterface::format'],
     ['generateBlocks', '', 'generateElements()'],
     ['getAbsolutePath', '', 'normalizePath'],
     ['getAccount', 'Magento\GoogleAnalytics\Block\Ga'],
@@ -395,6 +403,7 @@
     ['getBlockClassName', 'Magento\Core\Model\Config'],
     ['getButtonsHtml', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'],
     ['getCache', 'Magento\Core\Model\Config'],
+    ['getCacheTypes', 'Magento\Core\Helper\Data', '\Magento\Framework\App\Cache\TypeListInterface::getTypeLabels'],
     ['getCacheBetaTypes'],
     ['getChangeLocaleUrl', 'Magento\Backend\Block\Page\Footer'],
     ['getCheckoutMehod', 'Magento\Checkout\Model\Type\Onepage'],
@@ -424,6 +433,7 @@
     ['getDebug', 'Magento\Ogone\Model\Api'],
     ['getDebug', 'Magento\Paypal\Model\Api\AbstractApi'],
     ['getDefaultBasePath', 'Magento\Store\Model\Store'],
+    ['getDefaultCountry', 'Magento\Core\Helper\Data', 'Magento\Directory\Helper\Data::getDefaultCountry'],
     ['getDeleteUrl', 'Magento\Backend\Block\Catalog\Product\Edit'],
     ['getDirectOutput', 'Magento\Framework\View\Element\Template'],
     ['getDirectOutput', 'Magento\Framework\View\Layout'],
@@ -695,6 +705,7 @@
     ['isAllowedGuestCheckout', 'Magento\Quote\Model\Quote'],
     ['isApplicableToQuote', 'Magento\Payment\Model\Method\AbstractMethod'],
     ['isCheckoutAvailable', 'Magento\Multishipping\Model\Checkout\Type\Multishipping'],
+    ['isDevAllowed', 'Magento\Core\Helper\Data', '\Magento\Developer\Helper\Data::isDevAllowed'],
     ['isDirectOutput', 'Magento\Framework\View\Layout'],
     ['isDirectOutput', 'Magento\Framework\View\LayoutInterface'],
     ['isFulAmountCovered'],
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
index 290d926e37e6c..7feb50c7553d7 100644
--- a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class BaseurlTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -111,13 +113,13 @@ public function testgetValueUrlWithDefaultUnsecureAndSecureBaseUrl()
     {
         $map = [
             [
-                \Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL,
+                Store::XML_PATH_UNSECURE_BASE_URL,
                 'default',
                 null,
                 \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER,
             ],
             [
-                \Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL,
+                Store::XML_PATH_SECURE_BASE_URL,
                 'default',
                 null,
                 \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
index 6bb7a7479fb46..37ac4f3e3df41 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Model\Config\Backend;
 
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
+
 class BaseurlTest extends \PHPUnit_Framework_TestCase
 {
     public function testSaveMergedJsCssMustBeCleaned()
@@ -43,7 +46,7 @@ public function testSaveMergedJsCssMustBeCleaned()
         );
         $mergeService->expects($this->once())->method('cleanMergedJsCss');
 
-        $model->setValue('http://example.com/')->setPath(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL);
+        $model->setValue('http://example.com/')->setPath(Store::XML_PATH_UNSECURE_BASE_URL);
         $model->afterSave();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Helper/Catalog/Product/ConfigurationTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Helper/Catalog/Product/ConfigurationTest.php
index a319cfda39419..4b30448c0ff2e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Helper/Catalog/Product/ConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Helper/Catalog/Product/ConfigurationTest.php
@@ -9,8 +9,8 @@
 
 class ConfigurationTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Magento\Core\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $coreData;
+    /** @var \Magento\Framework\Pricing\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    protected $pricingHelper;
 
     /** @var \Magento\Catalog\Helper\Product\Configuration|\PHPUnit_Framework_MockObject_MockObject */
     protected $productConfiguration;
@@ -26,7 +26,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->coreData = $this->getMock('Magento\Core\Helper\Data', ['currency'], [], '', false);
+        $this->pricingHelper = $this->getMock('Magento\Framework\Pricing\Helper\Data', ['currency'], [], '', false);
         $this->productConfiguration = $this->getMock('Magento\Catalog\Helper\Product\Configuration', [], [], '', false);
         $this->escaper = $this->getMock('Magento\Framework\Escaper', ['escapeHtml'], [], '', false);
         $this->item = $this->getMock(
@@ -37,7 +37,7 @@ protected function setUp()
         $this->helper = (new ObjectManager($this))->getObject(
             'Magento\Bundle\Helper\Catalog\Product\Configuration',
             [
-                'coreData' => $this->coreData,
+                'pricingHelper' => $this->pricingHelper,
                 'productConfiguration' => $this->productConfiguration,
                 'escaper' => $this->escaper,
             ]
@@ -163,7 +163,7 @@ public function testGetOptions()
         $collection2 = $this->getMock('Magento\Bundle\Model\Resource\Selection\Collection', [], [], '', false);
 
         $this->escaper->expects($this->once())->method('escapeHtml')->with('name')->will($this->returnValue('name'));
-        $this->coreData->expects($this->once())->method('currency')->with(15)
+        $this->pricingHelper->expects($this->once())->method('currency')->with(15)
             ->will($this->returnValue('<span class="price">$15.00</span>'));
         $priceModel->expects($this->once())->method('getSelectionFinalTotalPrice')->will($this->returnValue(15));
         $selectionQty->expects($this->any())->method('getValue')->will($this->returnValue(1));
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
index 8ae170be9e8eb..f152d0885b51b 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
@@ -8,7 +8,7 @@
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Captcha\Helper\Adminhtml\Data|PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Captcha\Helper\Adminhtml\Data | |PHPUnit_Framework_MockObject_MockObject
      */
     protected $_model;
 
@@ -17,11 +17,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $backendConfig = $this->getMockBuilder(
-            'Magento\Backend\App\ConfigInterface'
-        )->disableOriginalConstructor()->setMethods(
-            ['getValue', 'setValue', 'isSetFlag']
-        )->getMock();
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Captcha\Helper\Adminhtml\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+
+        $backendConfig = $arguments['backendConfig'];
         $backendConfig->expects(
             $this->any()
         )->method(
@@ -32,20 +32,13 @@ protected function setUp()
             $this->returnValue('1')
         );
 
-        $filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $filesystemMock = $arguments['filesystem'];
         $directoryMock = $this->getMock('Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
 
         $filesystemMock->expects($this->any())->method('getDirectoryWrite')->will($this->returnValue($directoryMock));
         $directoryMock->expects($this->any())->method('getAbsolutePath')->will($this->returnArgument(0));
 
-        $this->_model = new \Magento\Captcha\Helper\Adminhtml\Data(
-            $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false),
-            $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false),
-            $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'),
-            $filesystemMock,
-            $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false),
-            $backendConfig
-        );
+        $this->_model = $objectManagerHelper->getObject($className, $arguments);
     }
 
     public function testGetConfig()
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index c8613bafb5973..3191a9726faf9 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -14,22 +14,35 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected $_filesystem;
 
-    protected function setUp()
-    {
-        $this->_filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
-    }
+    /**
+     * @var \Magento\Captcha\Helper\Data
+     */
+    protected $helper;
 
-    protected function _getHelper($store, $config, $factory)
-    {
-        $storeManager = $this->getMockBuilder(
-            'Magento\Store\Model\StoreManager'
-        )->disableOriginalConstructor()->getMock();
-        $storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($this->_getWebsiteStub()));
-        $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
 
-        $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
+    /**
+     * @var \Magento\Captcha\Model\CaptchaFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $factoryMock;
 
-        return new \Magento\Captcha\Helper\Data($context, $storeManager, $config, $this->_filesystem, $factory);
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Captcha\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->configMock = $context->getScopeConfig();
+        $this->_filesystem = $arguments['filesystem'];
+        $storeManager = $arguments['storeManager'];
+        $storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($this->_getWebsiteStub()));
+        $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_getStoreStub()));
+        $this->factoryMock = $arguments['factory'];
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
@@ -37,9 +50,7 @@ protected function _getHelper($store, $config, $factory)
      */
     public function testGetCaptcha()
     {
-        $store = $this->_getStoreStub();
-        $config = $this->_getConfigStub();
-        $config->expects(
+        $this->configMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -49,8 +60,7 @@ public function testGetCaptcha()
             $this->returnValue('zend')
         );
 
-        $factoryMock = $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false);
-        $factoryMock->expects(
+        $this->factoryMock->expects(
             $this->once()
         )->method(
             'create'
@@ -67,8 +77,7 @@ public function testGetCaptcha()
             )
         );
 
-        $helper = $this->_getHelper($store, $config, $factoryMock);
-        $this->assertInstanceOf('Magento\Captcha\Model\DefaultModel', $helper->getCaptcha('user_create'));
+        $this->assertInstanceOf('Magento\Captcha\Model\DefaultModel', $this->helper->getCaptcha('user_create'));
     }
 
     /**
@@ -76,9 +85,7 @@ public function testGetCaptcha()
      */
     public function testGetConfigNode()
     {
-        $store = $this->_getStoreStub();
-        $config = $this->_getConfigStub();
-        $config->expects(
+        $this->configMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -89,9 +96,7 @@ public function testGetConfigNode()
             $this->returnValue('1')
         );
 
-        $factoryMock = $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false);
-        $object = $this->_getHelper($store, $config, $factoryMock);
-        $object->getConfig('enable');
+        $this->helper->getConfig('enable');
     }
 
     public function testGetFonts()
@@ -109,12 +114,9 @@ public function testGetFonts()
             ->with(DirectoryList::LIB_INTERNAL)
             ->will($this->returnValue($libDirMock));
 
-        $factoryMock = $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false);
-
-        $config = $this->_getConfigStub();
         $configData = ['font_code' => ['label' => 'Label', 'path' => $fontPath]];
 
-        $config->expects(
+        $this->configMock->expects(
             $this->any()
         )->method(
             'getValue'
@@ -125,8 +127,7 @@ public function testGetFonts()
             $this->returnValue($configData)
         );
 
-        $object = $this->_getHelper($this->_getStoreStub(), $config, $factoryMock);
-        $fonts = $object->getFonts();
+        $fonts = $this->helper->getFonts();
         $this->assertArrayHasKey('font_code', $fonts);
         // fixture
         $this->assertArrayHasKey('label', $fonts['font_code']);
@@ -141,8 +142,6 @@ public function testGetFonts()
      */
     public function testGetImgDir()
     {
-        $factoryMock = $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false);
-
         $dirWriteMock = $this->getMock(
             'Magento\Framework\Filesystem\Directory\Write',
             ['changePermissions', 'create', 'getAbsolutePath'],
@@ -171,9 +170,8 @@ public function testGetImgDir()
             $this->returnValue(TESTS_TEMP_DIR . '/captcha/base')
         );
 
-        $object = $this->_getHelper($this->_getStoreStub(), $this->_getConfigStub(), $factoryMock);
         $this->assertFileNotExists(TESTS_TEMP_DIR . '/captcha');
-        $result = $object->getImgDir();
+        $result = $this->helper->getImgDir();
         $this->assertStringStartsWith(TESTS_TEMP_DIR, $result);
         $this->assertStringEndsWith('captcha/base/', $result);
     }
@@ -184,20 +182,7 @@ public function testGetImgDir()
      */
     public function testGetImgUrl()
     {
-        $factoryMock = $this->getMock('Magento\Captcha\Model\CaptchaFactory', [], [], '', false);
-        $object = $this->_getHelper($this->_getStoreStub(), $this->_getConfigStub(), $factoryMock);
-        $this->assertEquals($object->getImgUrl(), 'http://localhost/pub/media/captcha/base/');
-    }
-
-    /**
-     * Create Config Stub
-     *
-     * @return \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected function _getConfigStub()
-    {
-        $config = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        return $config;
+        $this->assertEquals($this->helper->getImgUrl(), 'http://localhost/pub/media/captcha/base/');
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
index f947c4d0f5838..bfb04bc0dd15b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
@@ -69,7 +69,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $backendUrl;
 
-    /** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
     protected $formKeyValidator;
 
     /** @var \Magento\Framework\App\Action\Title|\PHPUnit_Framework_MockObject_MockObject */
@@ -171,7 +171,7 @@ protected function prepareContext()
         $this->auth = $this->getMock('Magento\Backend\Model\Auth', [], [], '', false);
         $this->helper = $this->getMock('Magento\Backend\Helper\Data', [], [], '', false);
         $this->backendUrl = $this->getMock('Magento\Backend\Model\UrlInterface', [], [], '', false);
-        $this->formKeyValidator = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
+        $this->formKeyValidator = $this->getMock('Magento\Framework\Data\Form\FormKey\Validator', [], [], '', false);
         $this->title = $this->getMock('Magento\Framework\App\Action\Title', [], [], '', false);
         $this->localeResolver = $this->getMock('Magento\Framework\Locale\ResolverInterface', [], [], '', false);
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
index 4fbc2520073e6..f49f862539d30 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -44,7 +44,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
-    /** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
     protected $formKeyValidatorMock;
 
     /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
@@ -95,7 +95,9 @@ protected function setUp()
         $this->listCompareMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ListCompare', [], [], '', false);
         $this->catalogSession = $this->getMock('Magento\Catalog\Model\Session', ['setBeforeCompareUrl'], [], '', false);
         $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
-        $this->formKeyValidatorMock = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
+        $this->formKeyValidatorMock = $this->getMockBuilder('Magento\Framework\Data\Form\FormKey\Validator')
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->redirectFactoryMock = $this->getMock(
             'Magento\Framework\Controller\Result\RedirectFactory',
             ['create'],
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
index 5a10ccecd87ef..5887e06477865 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
@@ -11,64 +11,24 @@
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\CatalogSearch\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogSearch\Helper\Data
      */
     protected $_model;
 
     /**
-     * @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_contextMock;
-
-    /**
-     * @var \Magento\Framework\Stdlib\String|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_stringMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_queryFactoryMock;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $_scopeConfigMock;
 
-    /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_escaperMock;
-
-    /**
-     * @var \Magento\Framework\Filter\FilterManager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_filterManagerMock;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_storeManagerMock;
-
     public function setUp()
     {
-        $this->_contextMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->_stringMock = $this->getMock('Magento\Framework\Stdlib\String');
-        $this->_queryFactoryMock = $this->getMock('Magento\Search\Model\QueryFactory', [], [], '', false);
-        $this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_escaperMock = $this->getMock('Magento\Framework\Escaper');
-        $this->_filterManagerMock = $this->getMock('Magento\Framework\Filter\FilterManager', [], [], '', false);
-        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
-
-        $this->_model = new \Magento\CatalogSearch\Helper\Data(
-            $this->_contextMock,
-            $this->_stringMock,
-            $this->_scopeConfigMock,
-            $this->_queryFactoryMock,
-            $this->_escaperMock,
-            $this->_filterManagerMock,
-            $this->_storeManagerMock
-        );
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\CatalogSearch\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->_scopeConfigMock = $context->getScopeConfig();
+        $this->_model = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index c01449d988414..cde734fb3fd8c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -24,11 +24,6 @@ class CartTest extends \PHPUnit_Framework_TestCase
      */
     protected $requestMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storeManagerMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -56,13 +51,6 @@ class CartTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->urlBuilderMock = $this->getMock('Magento\Framework\UrlInterface');
-        $this->urlEncoder = $this->getMockBuilder('Magento\Framework\Url\EncoderInterface')->getMock();
-        $this->urlEncoder->expects($this->any())
-            ->method('encode')
-            ->willReturnCallback(function ($url) {
-                return strtr(base64_encode($url), '+/=', '-_,');
-            });
         $this->requestMock = $this->getMock(
             '\Magento\Framework\App\RequestInterface',
             [
@@ -73,26 +61,32 @@ protected function setUp()
                 'getActionName',
                 'setModuleName',
                 'getModuleName',
-                'getCookie'
+                'getCookie',
+                'isAjax',
             ]
         );
-        $contextMock = $this->getMock('\Magento\Framework\App\Helper\Context', [], [], '', false);
-        $contextMock->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilderMock));
-        $contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
-        $contextMock->expects($this->any())->method('getUrlEncoder')->will($this->returnValue($this->urlEncoder));
-        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
-        $this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
-        $this->scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->cartMock = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
-        $this->checkoutSessionMock = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
-
-        $this->helper = new Cart(
-            $contextMock,
-            $this->storeManagerMock,
-            $this->scopeConfigMock,
-            $this->cartMock,
-            $this->checkoutSessionMock
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $objectManagerHelper->getObject(
+            'Magento\Framework\App\Helper\Context',
+            [
+                'httpRequest' => $this->requestMock,
+            ]
         );
+        $className = 'Magento\Checkout\Helper\Cart';
+        $arguments = $objectManagerHelper->getConstructArguments($className, ['context' => $context]);
+        $this->urlBuilderMock = $context->getUrlBuilder();
+        $this->urlEncoder = $context->getUrlEncoder();
+        $this->urlEncoder->expects($this->any())
+            ->method('encode')
+            ->willReturnCallback(function ($url) {
+                return strtr(base64_encode($url), '+/=', '-_,');
+            });
+        $this->scopeConfigMock = $context->getScopeConfig();
+        $this->cartMock = $arguments['checkoutCart'];
+        $this->checkoutSessionMock = $arguments['checkoutSession'];
+
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     public function testGetCart()
@@ -208,52 +202,25 @@ public function testGetAddUrl()
      */
     public function testGetDeletePostJson($id, $url, $isAjax, $expectedPostData)
     {
-        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
-        $coreData = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
-        $scopeConfig = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface');
-        $checkoutCart = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
-        $checkoutSession = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
-
-        $context = $this->getMock('\Magento\Framework\App\Helper\Context', [], [], '', false);
-        $urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
-        $context->expects($this->once())
-            ->method('getUrlBuilder')
-            ->will($this->returnValue($urlBuilder));
-        $context->expects($this->any())
-            ->method('getUrlEncoder')
-            ->willReturn($this->urlEncoder);
-
         $item = $this->getMock('Magento\Quote\Model\Quote\Item', [], [], '', false);
-        $request = $this->getMock('\Magento\Framework\App\Request\Http', [], [], '', false);
-        $context->expects($this->once())
-            ->method('getRequest')
-            ->will($this->returnValue($request));
-
-        $helper = new Cart(
-            $context,
-            $storeManager,
-            $scopeConfig,
-            $checkoutCart,
-            $checkoutSession
-        );
 
         $item->expects($this->once())
             ->method('getId')
             ->will($this->returnValue($id));
 
-        $request->expects($this->once())
+        $this->requestMock->expects($this->once())
             ->method('isAjax')
             ->will($this->returnValue($isAjax));
 
-        $urlBuilder->expects($this->any())
+        $this->urlBuilderMock->expects($this->any())
             ->method('getCurrentUrl')
             ->will($this->returnValue($url));
 
-        $urlBuilder->expects($this->once())
+        $this->urlBuilderMock->expects($this->once())
             ->method('getUrl')
             ->will($this->returnValue($url));
 
-        $result = $helper->getDeletePostJson($item);
+        $result = $this->helper->getDeletePostJson($item);
         $this->assertEquals($expectedPostData, $result);
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
index 9e88e7178acf6..a9c9873c82477 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
@@ -48,32 +48,21 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected  $_collectionFactory;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected  $_storeManager;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $_eventManager;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected  $_context;
-
     protected function setUp()
     {
-        $this->_translator = $this->getMockBuilder('Magento\Framework\Translate\Inline\StateInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->_context = $this->getMock('\Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->_eventManager = $this->getMockForAbstractClass('\Magento\Framework\Event\ManagerInterface');
-        $this->_context->expects($this->once())
-            ->method('getEventManager')
-            ->will($this->returnValue($this->_eventManager));
-        $this->_scopeConfig = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Checkout\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->_translator = $arguments['inlineTranslation'];
+        $this->_eventManager = $context->getEventManager();
+        $this->_scopeConfig = $context->getScopeConfig();
         $this->_scopeConfig->expects($this->any())
             ->method('getValue')
             ->will(
@@ -131,35 +120,15 @@ protected function setUp()
                 )
             );
 
-        $this->_storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+        $this->_checkoutSession = $arguments['checkoutSession'];
+        $localeDate = $arguments['localeDate'];
+        $localeDate->expects($this->any())->method('date')->will($this->returnValue('Oct 02, 2013'));
 
-        $this->_checkoutSession = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
+        $this->_transportBuilder = $arguments['transportBuilder'];
 
-        $localeDate = $this->getMock(
-            '\Magento\Framework\Stdlib\DateTime\TimezoneInterface',
-            [],
-            [],
-            '',
-            false
-        );
-        $localeDate->expects($this->any())->method('date')->will($this->returnValue('Oct 02, 2013'));
+        $this->priceCurrency = $arguments['priceCurrency'];
 
-        $this->_transportBuilder = $this->getMockBuilder('Magento\Framework\Mail\Template\TransportBuilder')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
-
-        $this->_helper = new Data(
-            $this->_context,
-            $this->_scopeConfig,
-            $this->_storeManager,
-            $this->_checkoutSession,
-            $localeDate,
-            $this->_transportBuilder,
-            $this->_translator,
-            $this->priceCurrency
-        );
+        $this->_helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
index c253e3b094826..1820329bb2432 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
@@ -32,18 +32,15 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->_scopeConfig = $this->getMockForAbstractClass(
-            '\Magento\Framework\App\Config\ScopeConfigInterface', ['getValue'], '', false
-        );
-        $this->_customerSession = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
-        $this->_customerViewHelper = $this->getMock('\Magento\Customer\Helper\View', [], [], '', false);
-
-        $this->_helper = new Data(
-            $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false),
-            $this->_scopeConfig,
-            $this->_customerSession,
-            $this->_customerViewHelper
-        );
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = '\Magento\Contact\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->_scopeConfig = $context->getScopeConfig();
+        $this->_customerSession = $arguments['customerSession'];
+        $this->_customerViewHelper = $arguments['customerViewHelper'];
+        $this->_helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     public function testIsEnabled()
diff --git a/dev/tests/unit/testsuite/Magento/Cookie/Helper/CookieTest.php b/dev/tests/unit/testsuite/Magento/Cookie/Helper/CookieTest.php
index ebaf9af4b0c62..cb579f56ac301 100644
--- a/dev/tests/unit/testsuite/Magento/Cookie/Helper/CookieTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cookie/Helper/CookieTest.php
@@ -18,7 +18,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase
     protected $_request;
 
     /**
-     * @var \Magento\Core\Helper\Context
+     * @var \Magento\Framework\App\Helper\Context
      */
     protected $_context;
 
@@ -28,13 +28,20 @@ public function testIsUserNotAllowSaveCookie()
         $this->assertFalse($this->_object->isUserNotAllowSaveCookie());
         $request = $this->getMock('\Magento\Framework\App\Request\Http', ['getCookie'], [], '', false, false);
         $request->expects($this->any())->method('getCookie')->will($this->returnValue(json_encode([])));
-        $context =
-            $this->getMock('Magento\Framework\App\Helper\Context', ['getRequest'], [], '', false, false);
+        $scopeConfig = $this->_getConfigStub();
+        $context = $this->getMock(
+            'Magento\Framework\App\Helper\Context',
+            ['getRequest', 'getScopeConfig'],
+            [],
+            '',
+            false,
+            false
+        );
         $context->expects($this->once())->method('getRequest')->will($this->returnValue($request));
+        $context->expects($this->once())->method('getScopeConfig')->will($this->returnValue($scopeConfig));
         $this->_object = new \Magento\Cookie\Helper\Cookie(
             $context,
             $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false, false),
-            $this->_getConfigStub(),
             ['current_store' => $this->_getStoreStub(), 'website' => $this->_getWebsiteStub()]
         );
         $this->assertTrue($this->_object->isUserNotAllowSaveCookie());
@@ -50,9 +57,6 @@ public function testGetCookieRestrictionLifetime()
     {
         $this->_request =
             $this->getMock('\Magento\Framework\App\Request\Http', ['getCookie'], [], '', false, false);
-        $this->_context =
-            $this->getMock('Magento\Framework\App\Helper\Context', ['getRequest'], [], '', false, false);
-        $this->_context->expects($this->once())->method('getRequest')->will($this->returnValue($this->_request));
         $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $storeStub = $this->_getStoreStub();
         $scopeConfig->expects(
@@ -64,10 +68,20 @@ public function testGetCookieRestrictionLifetime()
         )->with(
             $this->equalTo('web/cookie/cookie_restriction_lifetime')
         );
+        $this->_context = $this->getMock(
+            'Magento\Framework\App\Helper\Context',
+            ['getRequest', 'getScopeConfig'],
+            [],
+            '',
+            false,
+            false
+        );
+        $this->_context->expects($this->once())->method('getRequest')->will($this->returnValue($this->_request));
+        $this->_context->expects($this->once())->method('getScopeConfig')->will($this->returnValue($scopeConfig));
+        
         $this->_object = new \Magento\Cookie\Helper\Cookie(
             $this->_context,
             $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false, false),
-            $scopeConfig,
             ['current_store' => $storeStub, 'website' => $this->_getWebsiteStub()]
         );
         $this->assertEquals($this->_object->getCookieRestrictionLifetime(), 60 * 60 * 24 * 365);
@@ -75,15 +89,22 @@ public function testGetCookieRestrictionLifetime()
 
     protected function _initMock()
     {
+        $scopeConfig = $this->_getConfigStub();
         $this->_request =
             $this->getMock('\Magento\Framework\App\Request\Http', ['getCookie'], [], '', false, false);
-        $this->_context =
-            $this->getMock('Magento\Framework\App\Helper\Context', ['getRequest'], [], '', false, false);
+        $this->_context = $this->getMock(
+            'Magento\Framework\App\Helper\Context',
+            ['getRequest', 'getScopeConfig'],
+            [],
+            '',
+            false,
+            false
+        );
         $this->_context->expects($this->once())->method('getRequest')->will($this->returnValue($this->_request));
+        $this->_context->expects($this->once())->method('getScopeConfig')->will($this->returnValue($scopeConfig));
         $this->_object = new \Magento\Cookie\Helper\Cookie(
             $this->_context,
             $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false, false),
-            $this->_getConfigStub(),
             ['current_store' => $this->_getStoreStub(), 'website' => $this->_getWebsiteStub()]
         );
         return $this;
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/LastUrlTest.php b/dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/LastUrlTest.php
deleted file mode 100644
index ccf950a6c39fb..0000000000000
--- a/dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/LastUrlTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Core\App\Action\Plugin;
-
-class LastUrlTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAfterDispatch()
-    {
-        $session = $this->getMock('\Magento\Framework\Session\Generic', ['setLastUrl'], [], '', false);
-        $subjectMock = $this->getMock('Magento\Framework\App\Action\Action', [], [], '', false);
-        $closureMock = function () {
-            return 'result';
-        };
-        $requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
-        $url = $this->getMock('\Magento\Framework\Url', [], [], '', false);
-        $plugin = new \Magento\Core\App\Action\Plugin\LastUrl($session, $url);
-        $session->expects($this->once())->method('setLastUrl')->with('http://example.com');
-        $url->expects(
-            $this->once()
-        )->method(
-            'getUrl'
-        )->with(
-            '*/*/*',
-            ['_current' => true]
-        )->will(
-            $this->returnValue('http://example.com')
-        );
-        $this->assertEquals('result', $plugin->aroundDispatch($subjectMock, $closureMock, $requestMock));
-    }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
index 94808003006c0..dc79275ff84b6 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Core\Helper;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -14,220 +12,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected $objectManager;
 
-    /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $priceCurrencyMock;
-
     public function setUp()
     {
-        $this->priceCurrencyMock = $this->getMock('Magento\Framework\Pricing\PriceCurrencyInterface');
         $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
     }
 
-    /**
-     * @param string $amount
-     * @param bool $format
-     * @param bool $includeContainer
-     * @param string $result
-     * @dataProvider currencyDataProvider
-     */
-    public function testCurrency($amount, $format, $includeContainer, $result)
-    {
-        if ($format) {
-            $this->priceCurrencyMock->expects($this->once())
-                ->method('convertAndFormat')
-                ->with($amount, $includeContainer)
-                ->will($this->returnValue($result));
-        } else {
-            $this->priceCurrencyMock->expects($this->once())
-                ->method('convert')
-                ->with($amount)
-                ->will($this->returnValue($result));
-        }
-        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
-        $this->assertEquals($result, $helper->currency($amount, $format, $includeContainer));
-    }
-
-    public function currencyDataProvider()
-    {
-        return [
-            ['amount' => '100', 'format' => true, 'includeContainer' => true, 'result' => '100grn.'],
-            ['amount' => '115', 'format' => true, 'includeContainer' => false, 'result' => '1150'],
-            ['amount' => '120', 'format' => false, 'includeContainer' => null, 'result' => '1200'],
-        ];
-    }
-
-    /**
-     * @param string $amount
-     * @param string $store
-     * @param bool $format
-     * @param bool $includeContainer
-     * @param string $result
-     * @dataProvider currencyByStoreDataProvider
-     */
-    public function testCurrencyByStore($amount, $store, $format, $includeContainer, $result)
-    {
-        if ($format) {
-            $this->priceCurrencyMock->expects($this->once())
-                ->method('convertAndFormat')
-                ->with($amount, $includeContainer, PriceCurrencyInterface::DEFAULT_PRECISION, $store)
-                ->will($this->returnValue($result));
-        } else {
-            $this->priceCurrencyMock->expects($this->once())
-                ->method('convert')
-                ->with($amount, $store)
-                ->will($this->returnValue($result));
-        }
-        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
-        $this->assertEquals($result, $helper->currencyByStore($amount, $store, $format, $includeContainer));
-    }
-
-    public function currencyByStoreDataProvider()
-    {
-        return [
-            ['amount' => '10', 'store' => 1, 'format' => true, 'includeContainer' => true, 'result' => '10grn.'],
-            ['amount' => '115', 'store' => 4,  'format' => true, 'includeContainer' => false, 'result' => '1150'],
-            ['amount' => '120', 'store' => 5,  'format' => false, 'includeContainer' => null, 'result' => '1200'],
-        ];
-    }
-
-    public function testFormatCurrency()
-    {
-        $amount = '120';
-        $includeContainer = false;
-        $result = '10grn.';
-
-        $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndFormat')
-            ->with($amount, $includeContainer)
-            ->will($this->returnValue($result));
-
-        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
-        $this->assertEquals($result, $helper->formatCurrency($amount, $includeContainer));
-    }
-
-    public function testFormatPrice()
-    {
-        $amount = '120';
-        $includeContainer = false;
-        $result = '10grn.';
-
-        $this->priceCurrencyMock->expects($this->once())
-            ->method('format')
-            ->with($amount, $includeContainer)
-            ->will($this->returnValue($result));
-
-        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
-        $this->assertEquals($result, $helper->formatPrice($amount, $includeContainer));
-    }
-
-    /**
-     * @param array $allowedIps
-     * @param bool $expected
-     * @dataProvider isDevAllowedDataProvider
-     */
-    public function testIsDevAllowed($allowedIps, $expected, $callNum = 1)
-    {
-        $storeId = 'storeId';
-
-        $scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with(
-                Data::XML_PATH_DEV_ALLOW_IPS,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $storeId
-            )->will($this->returnValue($allowedIps));
-
-        $remoteAddressMock = $this->getMockBuilder('Magento\Framework\HTTP\PhpEnvironment\RemoteAddress')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $remoteAddressMock->expects($this->once())
-            ->method('getRemoteAddress')
-            ->will($this->returnValue('remoteAddress'));
-
-        $httpHeaderMock = $this->getMockBuilder('Magento\Framework\HTTP\Header')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $httpHeaderMock->expects($this->exactly($callNum))
-            ->method('getHttpHost')
-            ->will($this->returnValue('httpHost'));
-
-        $context = $this->objectManager->getObject(
-            'Magento\Framework\App\Helper\Context',
-            [
-                'remoteAddress' => $remoteAddressMock,
-                'httpHeader' => $httpHeaderMock,
-            ]
-        );
-        $helper = $this->getHelper(
-            [
-                'scopeConfig' => $scopeConfigMock,
-                'context' => $context,
-            ]
-        );
-        $this->assertEquals($expected, $helper->isDevAllowed($storeId));
-    }
-
-    public function isDevAllowedDataProvider()
-    {
-        return [
-            'allow_nothing' => [
-                '',
-                true,
-                0,
-            ],
-            'allow_remote_address' => [
-                'ip1, ip2, remoteAddress',
-                true,
-                0,
-            ],
-            'allow_http_host' => [
-                'ip1, ip2, httpHost',
-                true,
-            ],
-            'allow_neither' => [
-                'ip1, ip2, ip3',
-                false,
-            ],
-        ];
-    }
-
-    public function testGetCacheTypes()
-    {
-        $cachedTypes = [
-            'type1' => ['label' => 'node1', 'other' => 'other1'],
-            'type2' => ['label' => 'node2', 'other' => 'other2'],
-            'type3' => ['other' => 'other3'],
-        ];
-        $types = [
-            'type1' => 'node1',
-            'type2' => 'node2',
-        ];
-        $cacheConfigMock = $this->getMockBuilder('Magento\Framework\Cache\ConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $cacheConfigMock->expects($this->once())
-            ->method('getTypes')
-            ->will($this->returnValue($cachedTypes));
-        $context = $this->objectManager->getObject(
-            'Magento\Framework\App\Helper\Context',
-            [
-                'cacheConfig' => $cacheConfigMock,
-            ]
-        );
-        $helper = $this->getHelper(
-            [
-                'context' => $context,
-            ]
-        );
-
-        $this->assertEquals($types, $helper->getCacheTypes());
-    }
-
     public function testJsonEncode()
     {
         $valueToEncode = 'valueToEncode';
@@ -257,54 +46,6 @@ public function testJsonDecode()
         $this->assertEquals('"valueToDecode"', $helper->jsonEncode('valueToDecode'));
     }
 
-    public function testGetDefaultCountry()
-    {
-        $storeId = 'storeId';
-        $country = 'country';
-
-        $scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with(
-                Data::XML_PATH_DEFAULT_COUNTRY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $storeId
-            )->will($this->returnValue($country));
-
-        $helper = $this->getHelper(
-            [
-                'scopeConfig' => $scopeConfigMock,
-            ]
-        );
-        $this->assertEquals($country, $helper->getDefaultCountry($storeId));
-    }
-
-    /**
-     * @param bool $expected
-     * @param bool $dbCompatibleMode
-     * @dataProvider useDbCompatibleModelDataProvider
-     */
-    public function testUseDbCompatibleModel($expected, $dbCompatibleMode = null)
-    {
-        $arguments = [];
-        if (null !== $dbCompatibleMode) {
-            $arguments['dbCompatibleMode'] = $dbCompatibleMode;
-        }
-        $helper = $this->getHelper($arguments);
-        $this->assertEquals($expected, $helper->useDbCompatibleMode());
-    }
-
-    public function useDbCompatibleModelDataProvider()
-    {
-        return [
-            'default' => [true],
-            'false' => [false, false],
-            'true' => [true, true],
-        ];
-    }
-
     /**
      * Get helper instance
      *
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/File/Storage/DatabaseTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/File/Storage/DatabaseTest.php
index bbe4a01c7d747..1a6abb9190d9f 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/File/Storage/DatabaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/File/Storage/DatabaseTest.php
@@ -31,37 +31,30 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->dbStorageFactoryMock = $this->getMockBuilder('Magento\Core\Model\File\Storage\DatabaseFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
+        $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Core\Helper\File\Storage\Database';
+        $arguments = $this->objectManager->getConstructArguments(
+            $className,
+            ['dbStorageFactory' => $this->dbStorageFactoryMock]
+        );
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
         $mediaDirMock = $this->getMockForAbstractClass('\Magento\Framework\Filesystem\Directory\ReadInterface');
         $mediaDirMock->expects($this->any())
             ->method('getAbsolutePath')
             ->will($this->returnValue('media-dir'));
-        $this->filesystemMock = $this->getMockBuilder('Magento\Framework\Filesystem')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->filesystemMock = $arguments['filesystem'];
         $this->filesystemMock->expects($this->any())
             ->method('getDirectoryRead')
             ->with(DirectoryList::MEDIA)
             ->will($this->returnValue($mediaDirMock));
-        $this->fileStorageMock = $this->getMockBuilder('Magento\Core\Model\File\Storage\File')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->helper = $this->objectManager->getObject(
-            'Magento\Core\Helper\File\Storage\Database',
-            [
-                'filesystem' => $this->filesystemMock,
-                'fileStorage' => $this->fileStorageMock,
-                'dbStorageFactory' => $this->dbStorageFactoryMock,
-                'config' => $this->configMock,
-            ]
-        );
+        $this->fileStorageMock = $arguments['fileStorage'];
+        $this->configMock = $context->getScopeConfig();
+        $this->helper = $this->objectManager->getObject($className, $arguments);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/File/StorageTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/File/StorageTest.php
index c8f946f027987..09dc978bd39e5 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/File/StorageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/File/StorageTest.php
@@ -30,27 +30,15 @@ class StorageTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->filesystemStorageMock = $this->getMockBuilder('Magento\Core\Model\File\Storage\File')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->coreFileStorageDbMock = $this->getMockBuilder('Magento\Core\Helper\File\Storage\Database')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storageMock = $this->getMockBuilder('Magento\Core\Model\File\Storage')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->helper = $this->objectManager->getObject(
-            'Magento\Core\Helper\File\Storage',
-            [
-                'coreFileStorageDb' => $this->coreFileStorageDbMock,
-                'storage' => $this->storageMock,
-                'filesystemStorage' => $this->filesystemStorageMock,
-                'config' => $this->configMock,
-            ]
-        );
+        $className = 'Magento\Core\Helper\File\Storage';
+        $arguments = $this->objectManager->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->filesystemStorageMock = $arguments['filesystemStorage'];
+        $this->coreFileStorageDbMock = $arguments['coreFileStorageDb'];
+        $this->storageMock = $arguments['storage'];
+        $this->configMock = $context->getScopeConfig();
+        $this->helper = $this->objectManager->getObject($className, $arguments);
     }
 
     public function testGetCurrentStorageCode()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/NoRouteHandlerListTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/NoRouteHandlerListTest.php
index a2f1e0c128527..e62908fd4ff75 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/NoRouteHandlerListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/NoRouteHandlerListTest.php
@@ -21,7 +21,7 @@ protected function setUp()
     {
         $this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $handlersList = [
-            'default_handler' => ['class' => 'Magento\Core\App\Router\NoRouteHandler', 'sortOrder' => 100],
+            'default_handler' => ['class' => 'Magento\Framework\App\Router\NoRouteHandler', 'sortOrder' => 100],
             'backend_handler' => ['class' => 'Magento\Backend\App\Router\NoRouteHandler', 'sortOrder' => 10],
         ];
 
@@ -31,7 +31,7 @@ protected function setUp()
     public function testGetHandlers()
     {
         $backendHandlerMock = $this->getMock('Magento\Backend\App\Router\NoRouteHandler', [], [], '', false);
-        $defaultHandlerMock = $this->getMock('Magento\Core\App\Router\NoRouteHandler', [], [], '', false);
+        $defaultHandlerMock = $this->getMock('Magento\Framework\App\Router\NoRouteHandler', [], [], '', false);
 
         $this->_objectManagerMock->expects(
             $this->at(0)
@@ -48,7 +48,7 @@ public function testGetHandlers()
         )->method(
             'create'
         )->with(
-            'Magento\Core\App\Router\NoRouteHandler'
+            'Magento\Framework\App\Router\NoRouteHandler'
         )->will(
             $this->returnValue($defaultHandlerMock)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Form/RegisterTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Form/RegisterTest.php
index 2695f18d3dde6..976d1ac83b0df 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Form/RegisterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Form/RegisterTest.php
@@ -25,8 +25,8 @@ class RegisterTest extends \PHPUnit_Framework_TestCase
 
     const REGION_ID_ATTRIBUTE_VALUE = '12';
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Core\Helper\Data */
-    private $_coreData;
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Directory\Helper\Data */
+    private $directoryHelperMock;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Config\ScopeConfigInterface */
     private $_scopeConfig;
@@ -47,7 +47,7 @@ public function setUp()
     {
         $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->_moduleManager = $this->getMock('Magento\Framework\Module\Manager', [], [], '', false);
-        $this->_coreData = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
+        $this->directoryHelperMock = $this->getMock('Magento\Directory\Helper\Data', [], [], '', false);
         $this->_customerUrl = $this->getMock('Magento\Customer\Model\Url', [], [], '', false);
         $this->_customerSession = $this->getMock(
             'Magento\Customer\Model\Session',
@@ -62,7 +62,7 @@ public function setUp()
 
         $this->_block = new Register(
             $context,
-            $this->_coreData,
+            $this->directoryHelperMock,
             $this->getMockForAbstractClass('Magento\Framework\Json\EncoderInterface', [], '', false),
             $this->getMock('Magento\Framework\App\Cache\Type\Config', [], [], '', false),
             $this->getMock('Magento\Directory\Model\Resource\Region\CollectionFactory', [], [], '', false),
@@ -217,7 +217,7 @@ public function testGetCountryIdFormData()
      */
     public function testGetCountryIdParentNullData()
     {
-        $this->_coreData->expects(
+        $this->directoryHelperMock->expects(
             $this->once()
         )->method(
             'getDefaultCountry'
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php
index 6c96adaacd0c6..8d877a5f1af50 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php
@@ -133,7 +133,7 @@ protected function setUp()
             false
         );
         $this->_formKeyValidator = $this->getMock(
-            'Magento\Core\App\Action\FormKeyValidator',
+            'Magento\Framework\Data\Form\FormKey\Validator',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
index 667fdb0779ddd..fe478a2a523ba 100755
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
@@ -37,37 +37,19 @@ class AddressTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->context = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->blockFactory = $this->getMockBuilder(
-            'Magento\Framework\View\Element\BlockFactory'
-        )->disableOriginalConstructor()->getMock();
-        $this->storeManager = $this->getMockBuilder(
-            'Magento\Store\Model\StoreManagerInterface'
-        )->disableOriginalConstructor()->getMock();
-        $this->scopeConfig = $this->getMockBuilder(
-            'Magento\Framework\App\Config\ScopeConfigInterface'
-        )->disableOriginalConstructor()->getMock();
-        $this->customerMetadataService = $this->getMockBuilder(
-            'Magento\Customer\Api\CustomerMetadataInterface'
-        )->disableOriginalConstructor()->getMock();
-        $this->addressConfig = $this->getMockBuilder(
-            'Magento\Customer\Model\Address\Config'
-        )->disableOriginalConstructor()->getMock();
-
-        $this->addressMetadataService = $this->getMockBuilder('Magento\Customer\Api\AddressMetadataInterface')
-            ->getMock();
-
-        $this->helper = new \Magento\Customer\Helper\Address(
-            $this->context,
-            $this->blockFactory,
-            $this->storeManager,
-            $this->scopeConfig,
-            $this->customerMetadataService,
-            $this->addressMetadataService,
-            $this->addressConfig
-        );
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Customer\Helper\Address';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $this->context = $arguments['context'];
+        $this->blockFactory = $arguments['blockFactory'];
+        $this->storeManager = $arguments['storeManager'];
+        $this->scopeConfig = $this->context->getScopeConfig();
+        $this->customerMetadataService = $arguments['customerMetadataService'];
+        $this->addressConfig = $arguments['addressConfig'];
+        $this->addressMetadataService = $arguments['addressMetadataService'];
+
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
@@ -119,7 +101,6 @@ public function testGetRenderer($renderer, $blockFactory, $result)
             $this->context,
             $blockFactory,
             $this->storeManager,
-            $this->scopeConfig,
             $this->customerMetadataService,
             $this->addressMetadataService,
             $this->addressConfig
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
index 2eb10c274c9b3..4062acc756834 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
@@ -112,7 +112,7 @@ public function matchDataProvider()
         );
 
         // method "match" will be invoked for this router because it's first in the list
-        $matchedRouter = $this->getMock('Magento\Core\App\Router\Base', [], [], '', false);
+        $matchedRouter = $this->getMock('Magento\Framework\App\Router\Base', [], [], '', false);
         $matchedRouter->expects(
             $this->once()
         )->method(
@@ -128,7 +128,7 @@ public function matchDataProvider()
             ->will($this->returnValue($matchedController));
 
         // method "match" will not be invoked for this router because controller will be found by first router
-        $notMatchedRouter = $this->getMock('Magento\Core\App\Router\Base', [], [], '', false);
+        $notMatchedRouter = $this->getMock('Magento\Framework\App\Router\Base', [], [], '', false);
         $notMatchedRouter->expects($this->never())->method('match');
 
         $matchedRouters = array_merge(
diff --git a/dev/tests/unit/testsuite/Magento/Developer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Developer/Helper/DataTest.php
new file mode 100644
index 0000000000000..1b6fc89518b15
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Developer/Helper/DataTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Developer\Helper;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Developer\Helper\Data
+     */
+    protected $helper;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $remoteAddressMock;
+
+    /**
+     * @var \Magento\Framework\HTTP\Header | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $httpHeaderMock;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Developer\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfigMock = $context->getScopeConfig();
+        $this->remoteAddressMock = $context->getRemoteAddress();
+        $this->httpHeaderMock = $context->getHttpHeader();
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
+    }
+
+    /**
+     * @param array $allowedIps
+     * @param bool $expected
+     * @dataProvider isDevAllowedDataProvider
+     */
+    public function testIsDevAllowed($allowedIps, $expected, $callNum = 1)
+    {
+        $storeId = 'storeId';
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Developer\Helper\Data::XML_PATH_DEV_ALLOW_IPS,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeId
+            )->will($this->returnValue($allowedIps));
+
+        $this->remoteAddressMock->expects($this->once())
+            ->method('getRemoteAddress')
+            ->will($this->returnValue('remoteAddress'));
+
+        $this->httpHeaderMock->expects($this->exactly($callNum))
+            ->method('getHttpHost')
+            ->will($this->returnValue('httpHost'));
+
+        $this->assertEquals($expected, $this->helper->isDevAllowed($storeId));
+    }
+
+    public function isDevAllowedDataProvider()
+    {
+        return [
+            'allow_nothing' => [
+                '',
+                true,
+                0,
+            ],
+            'allow_remote_address' => [
+                'ip1, ip2, remoteAddress',
+                true,
+                0,
+            ],
+            'allow_http_host' => [
+                'ip1, ip2, httpHost',
+                true,
+            ],
+            'allow_neither' => [
+                'ip1, ip2, ip3',
+                false,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
index 9e576c4d8e069..5f380291300d7 100644
--- a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -10,22 +10,22 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
     /**
      * @var DebugHints
      */
-    protected $_model;
+    protected $model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_objectManager;
+    protected $objectManagerMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_scopeConfig;
+    protected $scopeConfigMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_coreData;
+    protected $devHelperMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -34,9 +34,9 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
-        $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_coreData = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+        $this->devHelperMock = $this->getMock('Magento\Developer\Helper\Data', [], [], '', false);
         $this->subjectMock = $this->getMock(
             'Magento\Framework\View\TemplateEngineFactory',
             [],
@@ -44,7 +44,7 @@ protected function setUp()
             '',
             false
         );
-        $this->_model = new DebugHints($this->_objectManager, $this->_scopeConfig, $this->_coreData);
+        $this->model = new DebugHints($this->objectManagerMock, $this->scopeConfigMock, $this->devHelperMock);
     }
 
     /**
@@ -53,11 +53,11 @@ protected function setUp()
      */
     public function testAfterCreateActive($showBlockHints)
     {
-        $this->_coreData->expects($this->once())->method('isDevAllowed')->will($this->returnValue(true));
+        $this->devHelperMock->expects($this->once())->method('isDevAllowed')->will($this->returnValue(true));
         $this->_setupConfigFixture(true, $showBlockHints);
         $engine = $this->getMock('Magento\Framework\View\TemplateEngineInterface');
         $engineDecorated = $this->getMock('Magento\Framework\View\TemplateEngineInterface');
-        $this->_objectManager->expects(
+        $this->objectManagerMock->expects(
             $this->once()
         )->method(
             'create'
@@ -67,7 +67,7 @@ public function testAfterCreateActive($showBlockHints)
         )->will(
             $this->returnValue($engineDecorated)
         );
-        $this->assertEquals($engineDecorated, $this->_model->afterCreate($this->subjectMock, $engine));
+        $this->assertEquals($engineDecorated, $this->model->afterCreate($this->subjectMock, $engine));
     }
 
     public function afterCreateActiveDataProvider()
@@ -82,11 +82,11 @@ public function afterCreateActiveDataProvider()
      */
     public function testAfterCreateInactive($isDevAllowed, $showTemplateHints)
     {
-        $this->_coreData->expects($this->any())->method('isDevAllowed')->will($this->returnValue($isDevAllowed));
+        $this->devHelperMock->expects($this->any())->method('isDevAllowed')->will($this->returnValue($isDevAllowed));
         $this->_setupConfigFixture($showTemplateHints, true);
-        $this->_objectManager->expects($this->never())->method('create');
+        $this->objectManagerMock->expects($this->never())->method('create');
         $engine = $this->getMock('Magento\Framework\View\TemplateEngineInterface', [], [], '', false);
-        $this->assertSame($engine, $this->_model->afterCreate($this->subjectMock, $engine));
+        $this->assertSame($engine, $this->model->afterCreate($this->subjectMock, $engine));
     }
 
     public function afterCreateInactiveDataProvider()
@@ -106,7 +106,7 @@ public function afterCreateInactiveDataProvider()
      */
     protected function _setupConfigFixture($showTemplateHints, $showBlockHints)
     {
-        $this->_scopeConfig->expects(
+        $this->scopeConfigMock->expects(
             $this->atLeastOnce()
         )->method(
             'getValue'
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
index e5c2914f36513..a136a575981b2 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
@@ -30,7 +30,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_config;
+    protected $scopeConfigMock;
 
     /**
      * @var \Magento\Directory\Helper\Data
@@ -40,7 +40,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
+        $context->expects($this->any())
+            ->method('getScopeConfig')
+            ->willReturn($this->scopeConfigMock);
 
         $configCacheType = $this->getMock('Magento\Framework\App\Cache\Type\Config', [], [], '', false);
 
@@ -82,8 +86,6 @@ public function setUp()
 
         $currencyFactory = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
 
-        $this->_config = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-
         $arguments = [
             'context' => $context,
             'configCacheType' => $configCacheType,
@@ -92,7 +94,6 @@ public function setUp()
             'coreHelper' => $this->_coreHelper,
             'storeManager' => $storeManager,
             'currencyFactory' => $currencyFactory,
-            'config' => $this->_config
         ];
         $this->_object = $objectManager->getObject('Magento\Directory\Helper\Data', $arguments);
     }
@@ -173,7 +174,7 @@ public function testGetRegionJson()
      */
     public function testGetCountriesWithStatesRequired($configValue, $expected)
     {
-        $this->_config->expects(
+        $this->scopeConfigMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -194,7 +195,7 @@ public function testGetCountriesWithStatesRequired($configValue, $expected)
      */
     public function testGetCountriesWithOptionalZip($configValue, $expected)
     {
-        $this->_config->expects(
+        $this->scopeConfigMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -218,4 +219,20 @@ public static function countriesCommaListDataProvider()
             'normal_list' => ['Country1,Country2', ['Country1', 'Country2']]
         ];
     }
+
+    public function testGetDefaultCountry()
+    {
+        $storeId = 'storeId';
+        $country = 'country';
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                Data::XML_PATH_DEFAULT_COUNTRY,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeId
+            )->will($this->returnValue($country));
+
+        $this->assertEquals($country, $this->_object->getDefaultCountry($storeId));
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Eav/Helper/DataTest.php
index 97804541fa6a7..5e07c73950f46 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Helper/DataTest.php
@@ -28,12 +28,12 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $context = $this->getMock('\Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->attributeConfig = $this->getMock('\Magento\Eav\Model\Entity\Attribute\Config', [], [], '', false);
-        $scopeConfig = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
-        $eavConfig = $this->getMock('\Magento\Eav\Model\Config', [], [], '', false);
-        $this->_helper = new Data($context, $this->attributeConfig, $scopeConfig, $eavConfig);
-        $this->_eavConfig = $eavConfig;
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = '\Magento\Eav\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        $this->attributeConfig = $arguments['attributeConfig'];
+        $this->_eavConfig = $arguments['eavConfig'];
+        $this->_helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     public function testGetAttributeMetadata()
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/DesignTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Action/Plugin/DesignTest.php
similarity index 84%
rename from dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/DesignTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/App/Action/Plugin/DesignTest.php
index c9a042eb98ccd..ba49e4be237f5 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Action/Plugin/DesignTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Action/Plugin/DesignTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Action\Plugin;
+namespace Magento\Framework\App\Action\Plugin;
 
 class DesignTest extends \PHPUnit_Framework_TestCase
 {
@@ -15,7 +15,7 @@ public function testAroundDispatch()
             return 'Expected';
         };
         $requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
-        $plugin = new \Magento\Core\App\Action\Plugin\Design($designLoaderMock);
+        $plugin = new \Magento\Framework\App\Action\Plugin\Design($designLoaderMock);
         $designLoaderMock->expects($this->once())->method('load');
         $this->assertEquals('Expected', $plugin->aroundDispatch($subjectMock, $closureMock, $requestMock));
     }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/TypeListTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/TypeListTest.php
index a367863f3ee1f..f24cb9d8143ec 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/TypeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/TypeListTest.php
@@ -104,6 +104,14 @@ public function testGetTypes()
         $this->assertEquals($expectation, $this->_typeList->getTypes());
     }
 
+    public function testGetTypeLabels()
+    {
+        $expectation = [
+            self::TYPE_KEY => $this->_typesArray[self::TYPE_KEY]['label'],
+        ];
+        $this->assertEquals($expectation, $this->_typeList->getTypeLabels());
+    }
+
     public function testGetInvalidated()
     {
         $expectation = [self::TYPE_KEY => $this->_getPreparedType()];
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/ProductMetadataTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/ProductMetadataTest.php
new file mode 100644
index 0000000000000..1a13096996393
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/ProductMetadataTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+use \Magento\TestFramework\Helper\ObjectManager;
+
+class ProductMetadataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\App\ProductMetadata
+     */
+    protected $productMetadata;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->productMetadata = $objectManager->getObject('Magento\Framework\App\ProductMetadata');
+    }
+
+    public function testGetVersion()
+    {
+        $productVersion = $this->productMetadata->getVersion();
+        $this->assertNotEmpty($productVersion, 'Empty product version');
+        preg_match('/^([0-9\.]+)/', $productVersion, $matches);
+        $this->assertArrayHasKey(1, $matches, 'Invalid product version');
+        $this->assertNotEmpty($matches, 'Empty product version');
+    }
+
+    public function testGetEdition()
+    {
+        $productEdition = $this->productMetadata->getEdition();
+        $this->assertNotEmpty($productEdition, 'Empty product edition');
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Router/BaseTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Router/BaseTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Core/App/Router/BaseTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/App/Router/BaseTest.php
index d070429502693..954f341a06258 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Router/BaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Router/BaseTest.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Tests Magento\Core\App\Router\Base
+ * Tests Magento\Framework\App\Router\Base
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Router;
+namespace Magento\Framework\App\Router;
 
 class BaseTest extends \Magento\Test\BaseTestCase
 {
     /**
-     * @var \Magento\Core\App\Router\Base
+     * @var \Magento\Framework\App\Router\Base
      */
     private $model;
 
@@ -89,7 +89,7 @@ public function setUp()
             'nameBuilder' => $this->nameBuilderMock,
             'defaultPath' => $this->defaultPathMock,
         ];
-        $this->model = $this->objectManager->getObject('Magento\Core\App\Router\Base', $mocks);
+        $this->model = $this->objectManager->getObject('Magento\Framework\App\Router\Base', $mocks);
     }
 
     public function testMatch()
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Router/DefaultRouterTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Router/DefaultRouterTest.php
index d1a8bfccb0268..eab2e95741a29 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Router/DefaultRouterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Router/DefaultRouterTest.php
@@ -27,7 +27,7 @@ public function testMatch()
                 $this->getMockForAbstractClass('Magento\Framework\App\Action\AbstractAction', [], '', false)
             )
         );
-        $noRouteHandler = $this->getMock('Magento\Core\App\Router\NoRouteHandler', [], [], '', false);
+        $noRouteHandler = $this->getMock('Magento\Framework\App\Router\NoRouteHandler', [], [], '', false);
         $noRouteHandler->expects($this->any())->method('process')->will($this->returnValue(true));
         $noRouteHandlerList = $this->getMock('Magento\Framework\App\Router\NoRouteHandlerList', [], [], '', false);
         $noRouteHandlerList->expects($this->any())->method('getHandlers')->will($this->returnValue([$noRouteHandler]));
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Router/NoRouteHandlerTest.php
similarity index 93%
rename from dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/App/Router/NoRouteHandlerTest.php
index e8abb17855396..0666e04cf91d5 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Router/NoRouteHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests Magento\Core\App\Router\NoRouteHandler
+ * Tests Magento\Framework\App\Router\NoRouteHandler
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
@@ -8,12 +8,12 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Core\App\Router;
+namespace Magento\Framework\App\Router;
 
 class NoRouteHandlerTest extends \Magento\Test\BaseTestCase
 {
     /**
-     * @var \Magento\Core\App\Router\NoRouteHandler
+     * @var \Magento\Framework\App\Router\NoRouteHandler
      */
     private $model;
 
@@ -44,7 +44,7 @@ public function setUp()
             'Magento\Framework\App\RequestInterface',
             $requestMethods
         );
-        $this->model = $this->objectManager->getObject('Magento\Core\App\Router\NoRouteHandler',
+        $this->model = $this->objectManager->getObject('Magento\Framework\App\Router\NoRouteHandler',
             [
                 'config' => $this->configMock,
             ]
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Action/FormKeyValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/FormKey/ValidatorTest.php
similarity index 85%
rename from dev/tests/unit/testsuite/Magento/Core/App/Action/FormKeyValidatorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Data/Form/FormKey/ValidatorTest.php
index 39c0de565a750..d151597563a43 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Action/FormKeyValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/FormKey/ValidatorTest.php
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Action;
+namespace Magento\Framework\Data\Form\FormKey;
 
-class FormKeyValidatorTest extends \PHPUnit_Framework_TestCase
+class ValidatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_model;
 
@@ -32,7 +32,7 @@ protected function setUp()
             false
         );
         $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
-        $this->_model = new \Magento\Core\App\Action\FormKeyValidator($this->_formKeyMock);
+        $this->_model = new \Magento\Framework\Data\Form\FormKey\Validator($this->_formKeyMock);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Definition/CompiledTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Definition/CompiledTest.php
new file mode 100644
index 0000000000000..2ba924c77f85a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Definition/CompiledTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Definition;
+
+class CompiledTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetParametersWithUndefinedDefinition()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $undefinedDefinitionSignature = new \stdClass();
+        $className = 'undefinedDefinition';
+        $readerMock = $this->getMock(
+            '\Magento\Framework\Code\Reader\ClassReader',
+            ['getConstructor'],
+            [],
+            '',
+            false
+        );
+        $readerMock->expects($this->once())
+            ->method('getConstructor')
+            ->with($className)
+            ->willReturn($undefinedDefinitionSignature);
+        $model = $objectManager->getObject(
+            'Magento\Framework\ObjectManager\Definition\CompiledStub',
+            [
+                'definitions' => [[], []],
+                'reader' => $readerMock
+            ]
+        );
+        $this->assertEquals($undefinedDefinitionSignature, $model->getParameters($className));
+    }
+}
+
+/**
+ * Stub class for abstract Magento\Framework\ObjectManager\Definition
+ */
+class CompiledStub extends Compiled
+{
+
+    /**
+     * Unpack signature
+     *
+     * @param string $signature
+     * @return mixed
+     */
+    protected function _unpack($signature)
+    {
+        return unserialize($signature);
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Helper/DataTest.php
new file mode 100644
index 0000000000000..c1f8b211cc83b
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Helper/DataTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Pricing\Helper;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\TestFramework\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $priceCurrencyMock;
+
+    public function setUp()
+    {
+        $this->priceCurrencyMock = $this->getMock('Magento\Framework\Pricing\PriceCurrencyInterface');
+        $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+    }
+
+    /**
+     * @param string $amount
+     * @param bool $format
+     * @param bool $includeContainer
+     * @param string $result
+     * @dataProvider currencyDataProvider
+     */
+    public function testCurrency($amount, $format, $includeContainer, $result)
+    {
+        if ($format) {
+            $this->priceCurrencyMock->expects($this->once())
+                ->method('convertAndFormat')
+                ->with($amount, $includeContainer)
+                ->will($this->returnValue($result));
+        } else {
+            $this->priceCurrencyMock->expects($this->once())
+                ->method('convert')
+                ->with($amount)
+                ->will($this->returnValue($result));
+        }
+        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
+        $this->assertEquals($result, $helper->currency($amount, $format, $includeContainer));
+    }
+
+    public function currencyDataProvider()
+    {
+        return [
+            ['amount' => '100', 'format' => true, 'includeContainer' => true, 'result' => '100grn.'],
+            ['amount' => '115', 'format' => true, 'includeContainer' => false, 'result' => '1150'],
+            ['amount' => '120', 'format' => false, 'includeContainer' => null, 'result' => '1200'],
+        ];
+    }
+
+    /**
+     * @param string $amount
+     * @param string $store
+     * @param bool $format
+     * @param bool $includeContainer
+     * @param string $result
+     * @dataProvider currencyByStoreDataProvider
+     */
+    public function testCurrencyByStore($amount, $store, $format, $includeContainer, $result)
+    {
+        if ($format) {
+            $this->priceCurrencyMock->expects($this->once())
+                ->method('convertAndFormat')
+                ->with($amount, $includeContainer, PriceCurrencyInterface::DEFAULT_PRECISION, $store)
+                ->will($this->returnValue($result));
+        } else {
+            $this->priceCurrencyMock->expects($this->once())
+                ->method('convert')
+                ->with($amount, $store)
+                ->will($this->returnValue($result));
+        }
+        $helper = $this->getHelper(['priceCurrency' => $this->priceCurrencyMock]);
+        $this->assertEquals($result, $helper->currencyByStore($amount, $store, $format, $includeContainer));
+    }
+
+    public function currencyByStoreDataProvider()
+    {
+        return [
+            ['amount' => '10', 'store' => 1, 'format' => true, 'includeContainer' => true, 'result' => '10grn.'],
+            ['amount' => '115', 'store' => 4,  'format' => true, 'includeContainer' => false, 'result' => '1150'],
+            ['amount' => '120', 'store' => 5,  'format' => false, 'includeContainer' => null, 'result' => '1200'],
+        ];
+    }
+
+    /**
+     * Get helper instance
+     *
+     * @param array $arguments
+     * @return Data
+     */
+    private function getHelper($arguments)
+    {
+        return $this->objectManager->getObject('Magento\Framework\Pricing\Helper\Data', $arguments);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/DateTime/TimezoneTest.php b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/DateTime/TimezoneTest.php
index 617fb3d0ab2bc..bd6ba4f9e871b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/DateTime/TimezoneTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/DateTime/TimezoneTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Stdlib\DateTime;
 
+use Magento\Directory\Helper\Data;
+
 class TimezoneTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Framework\Stdlib\DateTime\Timezone */
@@ -40,7 +42,7 @@ protected function setUp()
         $this->localeResolver->expects($this->any())->method('getLocale')->will($this->returnValue($this->locale));
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->with(\Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE, 'store')
+            ->with(Data::XML_PATH_DEFAULT_TIMEZONE, 'store')
             ->will($this->returnValue('America/Los_Angeles'));
         $this->locale->expects($this->any())->method('toString')->will($this->returnValue('en_US'));
 
@@ -54,7 +56,7 @@ protected function setUp()
                 'dateFactory' => $this->dateFactory,
                 'scopeConfig' => $this->scopeConfig,
                 'scopeType' => 'store',
-                'defaultTimezonePath' => \Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE
+                'defaultTimezonePath' => Data::XML_PATH_DEFAULT_TIMEZONE
             ]
         );
     }
@@ -160,7 +162,7 @@ public function testUtcDate()
             ->with(['date' => 1347260470, 'part' => null, 'locale' => $this->locale])
             ->will($this->returnValue(new \Magento\Framework\Stdlib\DateTime\Date(1347260470, null, $this->locale)));
 
-        $date = $this->timezone->utcDate(\Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE, 1347260470);
+        $date = $this->timezone->utcDate(Data::XML_PATH_DEFAULT_TIMEZONE, 1347260470);
         $this->assertSame('UTC', $date->getTimezone());
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/GoogleAdwords/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleAdwords/Helper/DataTest.php
index 4c58c3f9ac69d..ce8f7fee899b3 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleAdwords/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleAdwords/Helper/DataTest.php
@@ -7,16 +7,6 @@
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_configMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_configNodeMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -34,21 +24,14 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
-
+        $className = 'Magento\GoogleAdwords\Helper\Data';
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->_helper = $objectManager->getObject(
-            'Magento\GoogleAdwords\Helper\Data',
-            [
-                'config' => $this->_configMock,
-                'scopeConfig' => $this->_scopeConfigMock,
-                'registry' => $this->_registryMock,
-                'context' => $context
-            ]
-        );
+        $arguments = $objectManager->getConstructArguments($className);
+        $this->_helper = $objectManager->getObject($className, $arguments);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->_scopeConfigMock = $context->getScopeConfig();
+        $this->_registryMock = $arguments['registry'];
     }
 
     /**
@@ -95,7 +78,7 @@ function () use ($returnConfigValue) {
     public function testGetLanguageCodes()
     {
         $languages = ['en', 'ru', 'uk'];
-        $this->_configMock->expects(
+        $this->_scopeConfigMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -126,7 +109,7 @@ public function dataProviderForTestConvertLanguage()
     public function testConvertLanguageCodeToLocaleCode($language, $returnLanguage)
     {
         $convertArray = ['zh_TW' => 'zh_Hant', 'iw' => 'he', 'zh_CN' => 'zh_Hans'];
-        $this->_configMock->expects(
+        $this->_scopeConfigMock->expects(
             $this->once()
         )->method(
             'getValue'
@@ -148,8 +131,8 @@ public function testGetConversionImgSrc()
             $conversionId,
             $label
         );
-        $this->_configMock->expects(
-            $this->once()
+        $this->_scopeConfigMock->expects(
+            $this->at(0)
         )->method(
             'getValue'
         )->with(
@@ -164,7 +147,7 @@ public function testGetConversionImgSrc()
     public function testGetConversionJsSrc()
     {
         $jsSrc = 'some-js-src';
-        $this->_configMock->expects(
+        $this->_scopeConfigMock->expects(
             $this->once()
         )->method(
             'getValue'
diff --git a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
index bc2c747e6d2ef..0e25f2df0e1d3 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
@@ -29,25 +29,14 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_googleAnalyticsHelperMock = $this->getMock(
-            'Magento\GoogleAnalytics\Helper\Data',
-            [],
-            [],
-            '',
-            false
-        );
-
         $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->_helper = $objectManagerHelper->getObject(
-            'Magento\GoogleOptimizer\Helper\Data',
-            [
-                'scopeConfig' => $this->_scopeConfigMock,
-                'analyticsHelper' => $this->_googleAnalyticsHelperMock,
-                'context' => $context
-            ]
-        );
+        $className = 'Magento\GoogleOptimizer\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->_scopeConfigMock = $context->getScopeConfig();
+        $this->_googleAnalyticsHelperMock = $arguments['analyticsHelper'];
+        $this->_helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
index 75e3348e41f1c..f1a679a742c55 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
@@ -25,7 +25,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $coreHelperMock;
+    protected $pricingHelperMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -36,7 +36,7 @@ protected function setUp()
     {
         $this->registryMock = $this->getMock('\Magento\Framework\Registry', [], [], '', false);
         $this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
-        $this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
+        $this->pricingHelperMock = $this->getMock('\Magento\Framework\Pricing\Helper\Data', [], [], '', false);
         $this->storeManagerMock = $this->getMock(
             '\Magento\Store\Model\StoreManagerInterface',
             [],
@@ -56,7 +56,7 @@ protected function setUp()
             [
                 'registry' => $this->registryMock,
                 'storeManager' => $this->storeManagerMock,
-                'coreHelper' => $this->coreHelperMock,
+                'pricingHelper' => $this->pricingHelperMock,
                 'data' => ['product' => $this->productMock]
             ]
         );
@@ -296,7 +296,7 @@ public function testGetCurrencyPrice()
 
         $this->productMock->expects($this->once())->method('getStore')->will($this->returnValue($storeId));
 
-        $this->coreHelperMock->expects(
+        $this->pricingHelperMock->expects(
             $this->once()
         )->method(
             'currencyByStore'
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Helper/DataTest.php
index e5013ea8adcc2..552b7dee2872c 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Helper/DataTest.php
@@ -24,13 +24,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected $scopeConfigMock;
 
-    /**
-     * Context mock
-     *
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Helper\Context
-     */
-    protected $contextMock;
-
     /**
      * Quote mock
      *
@@ -47,20 +40,15 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->contextMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->checkoutSessionMock = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
         $this->quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
 
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->helper = $objectManager->getObject(
-            'Magento\Multishipping\Helper\Data',
-            [
-                'context' => $this->contextMock,
-                'scopeConfig' => $this->scopeConfigMock,
-                'checkoutSession' => $this->checkoutSessionMock
-            ]
-        );
+        $arguments = $objectManager->getConstructArguments('Magento\Multishipping\Helper\Data');
+        $this->helper = $objectManager->getObject('Magento\Multishipping\Helper\Data', $arguments);
+        $this->checkoutSessionMock = $arguments['checkoutSession'];
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfigMock = $context->getScopeConfig();
     }
 
     public function testGetMaximumQty()
diff --git a/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php b/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
index 124efe1c353af..1638bf32687ae 100644
--- a/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
@@ -46,7 +46,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     private $customerSessionMock;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject
      */
     private $formKeyValidatorMock;
 
@@ -75,7 +75,7 @@ protected function setUp()
         $this->customerSessionMock->expects($this->any())
             ->method('isLoggedIn')
             ->will($this->returnValue(true));
-        $this->formKeyValidatorMock = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
+        $this->formKeyValidatorMock = $this->getMockBuilder('Magento\Framework\Data\Form\FormKey\Validator')
             ->disableOriginalConstructor()
             ->getMock();
         $this->customerRepositoryMock =
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
index 0c3371787ecc9..0a2881de8ce38 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
@@ -34,27 +34,21 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Payment\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfig = $context->getScopeConfig();
         $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface', [], [], '', false);
-        $layoutFactoryMock = $this->getMockBuilder('Magento\Framework\View\LayoutFactory')
-            ->disableOriginalConstructor()->getMock();
+        $layoutFactoryMock = $arguments['layoutFactory'];
         $layoutFactoryMock->expects($this->once())->method('create')->willReturn($this->layoutMock);
 
-        $this->methodFactory = $this->getMock('Magento\Payment\Model\Method\Factory', [], [], '', false);
-        $this->appEmulation = $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false);
-        $paymentConfig = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
-        $this->initialConfig = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
-
-        $this->helper = new \Magento\Payment\Helper\Data(
-            $context,
-            $this->scopeConfig,
-            $layoutFactoryMock,
-            $this->methodFactory,
-            $this->appEmulation,
-            $paymentConfig,
-            $this->initialConfig
-        );
+        $this->methodFactory = $arguments['paymentMethodFactory'];
+        $this->appEmulation = $arguments['appEmulation'];
+        $this->initialConfig = $arguments['initialConfig'];
+
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
 
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
index 4644157c0f9ee..c16558f975c9b 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
@@ -86,7 +86,7 @@ public function setUp()
         $this->request = $this->getMock('\Magento\Framework\App\Request\Http', ['getParam'], [], '', false);
         $this->response = $this->getMock('\Magento\Framework\App\Response\Http', ['setRedirect'], [], '', false);
         $this->formKeyValidator = $this->getMock(
-            '\Magento\Core\App\Action\FormKeyValidator',
+            'Magento\Framework\Data\Form\FormKey\Validator',
             ['validate'],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
index 7cf3a0bb02814..9fe0e9c6480ec 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
@@ -14,7 +14,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected $helper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\App\Config\ScopeConfigInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $scopeConfigMock;
 
@@ -28,14 +28,15 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
+        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config')
-            ->setMethods(['isSetFlag'])
+        $contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
             ->disableOriginalConstructor()
             ->getMock();
+        $contextMock->expects($this->any())
+            ->method('getScopeConfig')
+            ->willReturn($this->scopeConfigMock);
 
         $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
@@ -51,7 +52,6 @@ protected function setUp()
 
         $this->helper = new \Magento\Sales\Helper\Data(
             $contextMock,
-            $this->scopeConfigMock,
             $storeManagerMock,
             $appStateMock,
             $pricingCurrencyMock
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
index 87c343c1d6e17..944839151d014 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
@@ -23,15 +23,9 @@ class GuestTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject */
     protected $appContextHelperMock;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfigInterfaceMock;
-
     /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerInterfaceMock;
 
-    /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stateMock;
-
     /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
     protected $registryMock;
 
@@ -56,9 +50,7 @@ class GuestTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->appContextHelperMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->scopeConfigInterfaceMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->storeManagerInterfaceMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
-        $this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $this->registryMock = $this->getMock('Magento\Framework\Registry');
         $this->sessionMock = $this->getMock('Magento\Customer\Model\Session', [], [], '', false);
         $this->cookieManagerMock = $this->getMock('Magento\Framework\Stdlib\CookieManagerInterface');
@@ -78,9 +70,7 @@ protected function setUp()
             'Magento\Sales\Helper\Guest',
             [
                 'context' => $this->appContextHelperMock,
-                'scopeConfig' => $this->scopeConfigInterfaceMock,
                 'storeManager' => $this->storeManagerInterfaceMock,
-                'appState' => $this->stateMock,
                 'coreRegistry' => $this->registryMock,
                 'customerSession' => $this->sessionMock,
                 'cookieManager' => $this->cookieManagerMock,
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
index e79ed2fb06a6e..9be09ff8afe1a 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -38,37 +38,23 @@ class ReorderTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config')
             ->setMethods(['getValue'])
             ->disableOriginalConstructor()
             ->getMock();
-
-        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $appStateMock = $this->getMockBuilder('Magento\Framework\App\State')
+        $contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
             ->disableOriginalConstructor()
             ->getMock();
+        $contextMock->expects($this->any())
+            ->method('getScopeConfig')
+            ->willReturn($this->scopeConfigMock);
 
         $this->customerSessionMock = $this->getMockBuilder('Magento\Customer\Model\Session')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $pricingCurrencyMock = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->helper = new \Magento\Sales\Helper\Reorder(
             $contextMock,
-            $this->scopeConfigMock,
-            $storeManagerMock,
-            $appStateMock,
-            $pricingCurrencyMock,
             $this->customerSessionMock
         );
 
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
index 77848fbbd917b..65a2bc3d9276e 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
@@ -35,24 +35,22 @@ class CouponTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
-        $this->context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
         $this->couponParameters = [
             'separator' => $this->separator,
             'charset' => [
                 'format' => 'abc',
             ],
         ];
-
-        $this->helper = $objectManager->getObject(
-            'Magento\SalesRule\Helper\Coupon',
-            [
-                'context' => $this->context,
-                'scopeConfig' => $this->scopeConfig,
-                'couponParameters' => $this->couponParameters
-            ]
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\SalesRule\Helper\Coupon';
+        $arguments = $objectManager->getConstructArguments(
+            $className,
+            ['couponParameters' => $this->couponParameters]
         );
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfig = $context->getScopeConfig();
+        $this->helper = $objectManager->getObject('Magento\SalesRule\Helper\Coupon', $arguments);
     }
 
     public function testGetFormatsList()
diff --git a/dev/tests/unit/testsuite/Magento/Search/Model/QueryFactoryTest.php b/dev/tests/unit/testsuite/Magento/Search/Model/QueryFactoryTest.php
index fb979846dbc95..8614edc83bb2a 100644
--- a/dev/tests/unit/testsuite/Magento/Search/Model/QueryFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Search/Model/QueryFactoryTest.php
@@ -45,7 +45,7 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
         $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
-            ->setMethods(['getRequest'])
+            ->setMethods(['getRequest', 'getScopeConfig'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock->expects($this->once())
@@ -63,6 +63,9 @@ protected function setUp()
         $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
             ->setMethods([])
             ->getMock();
+        $this->contextMock->expects($this->once())
+            ->method('getScopeConfig')
+            ->will($this->returnValue($this->scopeConfigMock));
         $this->queryMock = $this->getMockBuilder('\Magento\Search\Model\Query')
             ->disableOriginalConstructor()
             ->setMethods(['setIsQueryTextExceeded', 'getId', 'setQueryText', 'loadByQuery'])
@@ -74,7 +77,6 @@ protected function setUp()
                 'context' => $this->contextMock,
                 'objectManager' => $this->objectManagerMock,
                 'string' => $this->stringMock,
-                'scopeConfig' => $this->scopeConfigMock
             ]
         );
     }
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php
index ccc7760494a55..b3fdddb70f7be 100644
--- a/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Magento\Backend\Model\Url;
-use Magento\Core\Helper\Data;
+use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\Currency;
 use Magento\Setup\Module\Setup;
 use Magento\Store\Model\Store;
@@ -26,7 +26,7 @@ public function testGetConfigData(array $data, array $expected)
     }
 
     /**
-     * return array
+     * @return array
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
index 2c291891ef642..03efdc8dd2024 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
@@ -24,16 +24,13 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->helper = $objectManagerHelper->getObject(
-            'Magento\Shipping\Helper\Carrier',
-            [
-                'context' => $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false),
-                'locale' => $this->getMock('Magento\Framework\LocaleInterface'),
-                'scopeConfig' => $this->scopeConfig
-            ]
-        );
+        $className = 'Magento\Shipping\Helper\Carrier';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfig = $context->getScopeConfig();
+        $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
index 90531e21b3ec2..62652cceec99d 100644
--- a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -14,24 +14,18 @@ class DataTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Sitemap\Helper\Data */
     protected $data;
 
-    /** @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $context;
-
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $scopeConfig;
 
     protected function setUp()
     {
-        $this->context = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
-        $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-
-        $this->data = (new ObjectManager($this))->getObject(
-            'Magento\Sitemap\Helper\Data',
-            [
-                'context' => $this->context,
-                'scopeConfig' => $this->scopeConfig
-            ]
-        );
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $className = 'Magento\Sitemap\Helper\Data';
+        $arguments = $objectManagerHelper->getConstructArguments($className);
+        /** @var \Magento\Framework\App\Helper\Context $context */
+        $context = $arguments['context'];
+        $this->scopeConfig = $context->getScopeConfig();
+        $this->data = $objectManagerHelper->getObject($className, $arguments);
     }
 
     public function testGetValidPaths()
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
index aa33762fefdb1..0dade287401d1 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 namespace Magento\Store\App\Action\Plugin;
+use Magento\Framework\App\Http\Context;
 
 /**
  * Class ContextPluginTest
@@ -131,8 +132,8 @@ public function testAroundDispatch()
         $this->httpContextMock->expects($this->atLeastOnce())
             ->method('setValue')
             ->will($this->returnValueMap([
-                [\Magento\Core\Helper\Data::CONTEXT_CURRENCY, 'UAH', 'UAH', $this->httpContextMock],
-                [\Magento\Core\Helper\Data::CONTEXT_STORE, 'default', 'default', $this->httpContextMock],
+                [Context::CONTEXT_CURRENCY, 'UAH', 'UAH', $this->httpContextMock],
+                [Context::CONTEXT_STORE, 'default', 'default', $this->httpContextMock],
             ]));
         $this->assertEquals(
             'ExpectedValue',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php
index 8bb7dc7748e08..fb0047d73eed8 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Store\Model\Config\Processor;
 
+use Magento\Store\Model\Store;
+
 class PlaceholderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -30,8 +32,8 @@ protected function setUp()
         $this->_model = new \Magento\Store\Model\Config\Processor\Placeholder(
             $this->_requestMock,
             [
-                'unsecureBaseUrl' => \Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL,
-                'secureBaseUrl' => \Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL
+                'unsecureBaseUrl' => Store::XML_PATH_UNSECURE_BASE_URL,
+                'secureBaseUrl' => Store::XML_PATH_SECURE_BASE_URL
             ],
             \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER
         );
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/PathConfigTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/PathConfigTest.php
new file mode 100644
index 0000000000000..669efe867bc55
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/PathConfigTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+namespace Magento\Store\Model;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\ObjectManager;
+
+class PathConfigTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject*/
+    private $scopeConfigMock;
+    /** @var \Magento\Framework\Url\SecurityInfoInterface | \PHPUnit_Framework_MockObject_MockObject*/
+    private $urlSecurityInfoMock;
+    /** @var StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject*/
+    private $storeManagerMock;
+    /** @var Store | \PHPUnit_Framework_MockObject_MockObject*/
+    private $storeMock;
+    /** @var \Magento\Store\Model\RouteConfig */
+    protected $model;
+
+    public function setUp()
+    {
+        $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlSecurityInfoMock = $this->getMockBuilder('Magento\Framework\Url\SecurityInfoInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockArgs = [
+            'scopeConfig' => $this->scopeConfigMock,
+            'urlSecurityInfo' => $this->urlSecurityInfoMock,
+            'storeManager' => $this->storeManagerMock,
+        ];
+        $this->model = (new ObjectManager($this))->getObject('\Magento\Store\Model\PathConfig', $mockArgs);
+    }
+
+    public function testGetCurrentSecureUrlNoAlias()
+    {
+        $baseUrl = 'base-store.url/';
+        $pathInfo = 'path/to/action';
+
+        $this->storeMock->expects($this->once())->method('getBaseUrl')->with('link', true)->willReturn($baseUrl);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
+
+        $request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $request->expects($this->once())->method('getAlias')->willReturn(null);
+        $request->expects($this->once())->method('getPathInfo')->willReturn($pathInfo);
+        $this->assertSame($baseUrl . $pathInfo, $this->model->getCurrentSecureUrl($request));
+    }
+
+    public function testGetCurrentSecureUrlWithAlias()
+    {
+        $baseUrl = 'base-store.url/';
+        $alias = 'action-alias';
+
+        $this->storeMock->expects($this->once())->method('getBaseUrl')->with('link', true)->willReturn($baseUrl);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
+
+        $request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $request->expects($this->once())->method('getAlias')->willReturn($alias);
+        $request->expects($this->never())->method('getPathInfo');
+        $this->assertSame($baseUrl . $alias, $this->model->getCurrentSecureUrl($request));
+    }
+
+    /**
+     * @dataProvider urlSchemeProvider
+     * @param string $base Base Url
+     * @param bool $secure Expected return value
+     */
+    public function testShouldBeSecureUnsecureBaseUrl($base, $secure)
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE)
+            ->willReturn($base);
+        $this->assertSame($secure, $this->model->shouldBeSecure('path/to/action'));
+    }
+
+    /**
+     * @dataProvider urlSchemeProvider
+     * @param string $base Base Url
+     * @param bool $secure Expected return value
+     */
+    public function testShouldBeSecureSecureBaseUrl($base, $secure)
+    {
+        $path = 'path/to/action';
+
+        $this->scopeConfigMock->expects($this->once())->method('isSetFlag')
+            ->with(Store::XML_PATH_SECURE_IN_FRONTEND, ScopeInterface::SCOPE_STORE)
+            ->willReturn($secure);
+
+        $getValueReturnMap = [
+            [Store::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $base],
+            [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, 'http://unsecure.url'],
+        ];
+
+        $this->scopeConfigMock->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValueMap($getValueReturnMap));
+
+        if ($secure) {
+            $this->urlSecurityInfoMock->expects($this->once())->method('isSecure')->with($path)->willReturn($secure);
+        }
+
+        $this->assertSame($secure, $this->model->shouldBeSecure($path));
+    }
+
+    /**
+     * @return array
+     */
+    public function urlSchemeProvider()
+    {
+        return [
+            ['https://base.url', true],
+            ['http://base.url', false]
+        ];
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 0d6a5d5baef7a..70fdec2cd82ec 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -9,6 +9,7 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
index b3a3014567241..f80000cfdb1c5 100644
--- a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
@@ -18,14 +18,14 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Core\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Developer\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $helperMock;
 
     protected function setUp()
     {
         $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->helperMock = $this->getMock('Magento\Core\Helper\Data', ['isDevAllowed'], [], '', false);
+        $this->helperMock = $this->getMock('Magento\Developer\Helper\Data', ['isDevAllowed'], [], '', false);
         $this->model = new Config(
             $this->scopeConfigMock,
             $this->helperMock
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AllcartTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AllcartTest.php
index 05881262446fa..94f2f67296e65 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AllcartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AllcartTest.php
@@ -19,7 +19,7 @@ class AllcartTest extends \PHPUnit_Framework_TestCase
     protected $itemCarrier;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $formKeyValidator;
 
@@ -43,7 +43,7 @@ protected function setUp()
         $this->context = $this->getMock('Magento\Framework\App\Action\Context', [], [], '', false);
         $this->wishlistProvider = $this->getMock('Magento\Wishlist\Controller\WishlistProvider', [], [], '', false);
         $this->itemCarrier = $this->getMock('Magento\Wishlist\Model\ItemCarrier', [], [], '', false);
-        $this->formKeyValidator = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
+        $this->formKeyValidator = $this->getMock('Magento\Framework\Data\Form\FormKey\Validator', [], [], '', false);
         $this->request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
         $this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
     }
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
index 5ab6017080d67..39738ba11f7cf 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Wishlist\Model\Rss;
 
+use Magento\Directory\Helper\Data;
+
 class WishlistTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -166,7 +168,7 @@ public function testGetRssData()
                             null,
                         ],
                         [
-                            \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
+                            Data::XML_PATH_DEFAULT_LOCALE,
                             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             $locale
diff --git a/app/code/Magento/Core/App/Action/Plugin/Design.php b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
similarity index 95%
rename from app/code/Magento/Core/App/Action/Plugin/Design.php
rename to lib/internal/Magento/Framework/App/Action/Plugin/Design.php
index 8f553f0a73a95..d538cbb3a7846 100644
--- a/app/code/Magento/Core/App/Action/Plugin/Design.php
+++ b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Action\Plugin;
+namespace Magento\Framework\App\Action\Plugin;
 
 class Design
 {
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeList.php b/lib/internal/Magento/Framework/App/Cache/TypeList.php
index c2104ce51b678..5e57ff8d9795f 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeList.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeList.php
@@ -120,6 +120,20 @@ public function getTypes()
         return $types;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getTypeLabels()
+    {
+        $types = [];
+        foreach ($this->_config->getTypes() as $type => $node) {
+            if (array_key_exists('label', $node)) {
+                $types[$type] = $node['label'];
+            }
+        }
+        return $types;
+    }
+
     /**
      * Get array of all invalidated cache types
      *
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
index 2aacab9886ef9..fbd4313f6eaab 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
@@ -14,6 +14,13 @@ interface TypeListInterface
      */
     public function getTypes();
 
+    /**
+     * Get label information of available cache types
+     *
+     * @return array
+     */
+    public function getTypeLabels();
+
     /**
      * Get array of all invalidated cache types
      *
diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
index d2a4d1715a48d..43b0028188ee1 100644
--- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
@@ -73,6 +73,11 @@ abstract class AbstractHelper
      */
     protected $urlDecoder;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
     /**
      * @param Context $context
      */
@@ -89,6 +94,7 @@ public function __construct(Context $context)
         $this->_cacheConfig = $context->getCacheConfig();
         $this->urlEncoder = $context->getUrlEncoder();
         $this->urlDecoder = $context->getUrlDecoder();
+        $this->scopeConfig = $context->getScopeConfig();
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
index 30f03cd9862bf..3f6a911b0dcd2 100644
--- a/lib/internal/Magento/Framework/App/Helper/Context.php
+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
@@ -64,6 +64,11 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      */
     protected $urlDecoder;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
     /**
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
@@ -76,6 +81,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\HTTP\Header $httpHeader
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -90,7 +96,8 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\HTTP\Header $httpHeader,
-        \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
+        \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
     ) {
         $this->translateInline = $translateInline;
         $this->_moduleManager = $moduleManager;
@@ -103,6 +110,7 @@ public function __construct(
         $this->_remoteAddress = $remoteAddress;
         $this->urlEncoder = $urlEncoder;
         $this->urlDecoder = $urlDecoder;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -192,4 +200,12 @@ public function getUrlDecoder()
     {
         return $this->urlDecoder;
     }
+
+    /**
+     * @return \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    public function getScopeConfig()
+    {
+        return $this->scopeConfig;
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
index 84ef393e7dfb5..0cd9401ff2c34 100644
--- a/lib/internal/Magento/Framework/App/Http/Context.php
+++ b/lib/internal/Magento/Framework/App/Http/Context.php
@@ -10,6 +10,15 @@
  */
 class Context
 {
+    /**
+     * Currency cache context
+     */
+    const CONTEXT_CURRENCY = 'current_currency';
+    /**
+     * Store cache context
+     */
+    const CONTEXT_STORE = 'store';
+
     /**
      * Data storage
      *
diff --git a/lib/internal/Magento/Framework/App/ProductMetadata.php b/lib/internal/Magento/Framework/App/ProductMetadata.php
new file mode 100644
index 0000000000000..20693ffaab412
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/ProductMetadata.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento application product metadata
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+use Magento\Framework\AppInterface;
+
+class ProductMetadata implements ProductMetadataInterface
+{
+    const EDITION_NAME  = 'Community';
+
+    /**
+     * Get Product version
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return AppInterface::VERSION;
+    }
+
+    /**
+     * Get Product edition
+     *
+     * @return string
+     */
+    public function getEdition()
+    {
+        return self::EDITION_NAME;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/ProductMetadataInterface.php b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
new file mode 100644
index 0000000000000..bf710ad8c284a
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Magento application product metadata
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+interface ProductMetadataInterface
+{
+    /**
+     * Get Product version
+     *
+     * @return string
+     */
+    public function getVersion();
+
+    /**
+     * Get Product edition
+     *
+     * @return string
+     */
+    public function getEdition();
+}
diff --git a/app/code/Magento/Core/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
similarity index 80%
rename from app/code/Magento/Core/App/Router/Base.php
rename to lib/internal/Magento/Framework/App/Router/Base.php
index 58175d62b1726..cf28870ff1219 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -5,9 +5,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Router;
+namespace Magento\Framework\App\Router;
 
 use Magento\Framework\App\RequestInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -108,6 +109,9 @@ class Base implements \Magento\Framework\App\RouterInterface
      */
     protected $actionList;
 
+    /** @var PathConfigInterface */
+    protected $pathConfig;
+
     /**
      * @param \Magento\Framework\App\Router\ActionList $actionList
      * @param \Magento\Framework\App\ActionFactory $actionFactory
@@ -115,11 +119,10 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
+     *
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -131,22 +134,18 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
-        \Magento\Framework\Code\NameBuilder $nameBuilder
+        \Magento\Framework\Code\NameBuilder $nameBuilder,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig
     ) {
         $this->actionList = $actionList;
         $this->actionFactory = $actionFactory;
         $this->_responseFactory = $responseFactory;
         $this->_defaultPath = $defaultPath;
         $this->_routeConfig = $routeConfig;
-        $this->_urlSecurityInfo = $urlSecurityInfo;
-        $this->_scopeConfig = $scopeConfig;
         $this->_url = $url;
-        $this->_storeManager = $storeManager;
         $this->nameBuilder = $nameBuilder;
+        $this->pathConfig = $pathConfig;
     }
 
     /**
@@ -174,7 +173,7 @@ protected function parseRequest(\Magento\Framework\App\RequestInterface $request
 
         $path = trim($request->getPathInfo(), '/');
 
-        $params = explode('/', $path ? $path : $this->_getDefaultPath());
+        $params = explode('/', $path ? $path : $this->pathConfig->getDefaultPath());
         foreach ($this->_requiredParams as $paramName) {
             $output[$paramName] = array_shift($params);
         }
@@ -323,16 +322,6 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
         return $actionInstance;
     }
 
-    /**
-     * Get router default request path
-     *
-     * @return string
-     */
-    protected function _getDefaultPath()
-    {
-        return $this->_scopeConfig->getValue('web/default/front', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-    }
-
     /**
      * Build controller class name
      *
@@ -361,8 +350,8 @@ protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface
             return;
         }
 
-        if ($this->_shouldBeSecure($path) && !$request->isSecure()) {
-            $url = $this->_getCurrentSecureUrl($request);
+        if ($this->pathConfig->shouldBeSecure($path) && !$request->isSecure()) {
+            $url = $this->pathConfig->getCurrentSecureUrl($request);
             if ($this->_shouldRedirectToSecure()) {
                 $url = $this->_url->getRedirectUrl($url);
             }
@@ -381,42 +370,4 @@ protected function _shouldRedirectToSecure()
     {
         return $this->_url->getUseSession();
     }
-
-    /**
-     * Retrieve secure url for current request
-     *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @return string
-     */
-    protected function _getCurrentSecureUrl($request)
-    {
-        $alias = $request->getAlias(\Magento\Framework\Url::REWRITE_REQUEST_PATH_ALIAS) || $request->getPathInfo();
-        return $this->_storeManager->getStore()->getBaseUrl('link', true) . ltrim($alias, '/');
-    }
-
-    /**
-     * Check whether given path should be secure according to configuration security requirements for URL
-     * "Secure" should not be confused with https protocol, it is about web/secure/*_url settings usage only
-     *
-     * @param string $path
-     * @return bool
-     */
-    protected function _shouldBeSecure($path)
-    {
-        return parse_url(
-            $this->_scopeConfig->getValue(
-                'web/unsecure/base_url',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            ),
-            PHP_URL_SCHEME
-        ) === 'https' || $this->_scopeConfig->isSetFlag(
-            \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && parse_url(
-            $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE),
-            PHP_URL_SCHEME
-        ) == 'https' && $this->_urlSecurityInfo->isSecure(
-            $path
-        );
-    }
 }
diff --git a/app/code/Magento/Core/App/Router/NoRouteHandler.php b/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
similarity index 97%
rename from app/code/Magento/Core/App/Router/NoRouteHandler.php
rename to lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
index 1803c121a701e..26068cd2a30a0 100644
--- a/app/code/Magento/Core/App/Router/NoRouteHandler.php
+++ b/lib/internal/Magento/Framework/App/Router/NoRouteHandler.php
@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Router;
+namespace Magento\Framework\App\Router;
 
 class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
new file mode 100644
index 0000000000000..35dcc08fce710
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
@@ -0,0 +1,33 @@
+<?php
+/***
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App\Router;
+
+interface PathConfigInterface
+{
+    /**
+     * Retrieve secure url for current request
+     *
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @return string
+     */
+    public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request);
+
+    /**
+     * Check whether given path should be secure according to configuration security requirements for URL
+     * "Secure" should not be confused with https protocol, it is about web/secure/*_url settings usage only
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function shouldBeSecure($path);
+
+    /**
+     * Get router default request path
+     *
+     * @return string
+     */
+    public function getDefaultPath();
+}
diff --git a/app/code/Magento/Core/App/Action/FormKeyValidator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
similarity index 92%
rename from app/code/Magento/Core/App/Action/FormKeyValidator.php
rename to lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index b7d19b89df30e..9a51e55a36b20 100644
--- a/app/code/Magento/Core/App/Action/FormKeyValidator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -3,9 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\App\Action;
+namespace Magento\Framework\Data\Form\FormKey;
 
-class FormKeyValidator
+class Validator
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey
diff --git a/lib/internal/Magento/Framework/ObjectManager/Definition/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Definition/Compiled.php
index 3d31b13726fbe..2c4e68ff0dca3 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Definition/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Definition/Compiled.php
@@ -17,12 +17,19 @@ abstract class Compiled implements \Magento\Framework\ObjectManager\DefinitionIn
      */
     protected $_definitions;
 
+    /**
+     * @var \Magento\Framework\Code\Reader\ClassReader
+     */
+    protected $reader ;
+
     /**
      * @param array $definitions
+     * @param \Magento\Framework\Code\Reader\ClassReader $reader
      */
-    public function __construct(array $definitions)
+    public function __construct(array $definitions, \Magento\Framework\Code\Reader\ClassReader $reader = null)
     {
         list($this->_signatures, $this->_definitions) = $definitions;
+        $this->reader = $reader ?: new \Magento\Framework\Code\Reader\ClassReader();
     }
 
     /**
@@ -51,6 +58,11 @@ abstract protected function _unpack($signature);
      */
     public function getParameters($className)
     {
+        // if the definition isn't found in the list gathered from the compiled file then  using reflection to find it
+        if (!array_key_exists($className, $this->_definitions)) {
+            return $this->reader->getConstructor($className);
+        }
+
         $definition = $this->_definitions[$className];
         if ($definition !== null) {
             if (is_string($this->_signatures[$definition])) {
diff --git a/lib/internal/Magento/Framework/Pricing/Helper/Data.php b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
new file mode 100644
index 0000000000000..6d9deb501297a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Pricing\Helper;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Pricing data helper
+ */
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * @var PriceCurrencyInterface
+     */
+    protected $priceCurrency;
+
+    /**
+     * @param \Magento\Framework\App\Helper\Context $context
+     * @param PriceCurrencyInterface $priceCurrency
+     */
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context,
+        PriceCurrencyInterface $priceCurrency
+    ) {
+        parent::__construct($context);
+        $this->priceCurrency =  $priceCurrency;
+    }
+
+    /**
+     * Convert and format price value for current application store
+     *
+     * @param   float $value
+     * @param   bool $format
+     * @param   bool $includeContainer
+     * @return  float|string
+     */
+    public function currency($value, $format = true, $includeContainer = true)
+    {
+        return $format
+            ? $this->priceCurrency->convertAndFormat($value, $includeContainer)
+            : $this->priceCurrency->convert($value);
+    }
+
+    /**
+     * Convert and format price value for specified store
+     *
+     * @param   float $value
+     * @param   int|\Magento\Store\Model\Store $store
+     * @param   bool $format
+     * @param   bool $includeContainer
+     * @return  float|string
+     */
+    public function currencyByStore($value, $store = null, $format = true, $includeContainer = true)
+    {
+        if ($format) {
+            $value = $this->priceCurrency->convertAndFormat(
+                $value,
+                $includeContainer,
+                PriceCurrencyInterface::DEFAULT_PRECISION,
+                $store
+            );
+        } else {
+            $value = $this->priceCurrency->convert($value, $store);
+        }
+
+        return $value;
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php b/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php
index 5499a6a658a32..fde03be7268f7 100644
--- a/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php
+++ b/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php
@@ -7,7 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Magento\Backend\Model\Url;
-use Magento\Core\Helper\Data;
+use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\Currency;
 use Magento\Setup\Module\Setup;
 use Magento\Store\Model\Store;