diff --git a/.travis.yml b/.travis.yml
index 95eb5ecb62bca..74e374412fff4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ addons:
     - postfix
 language: php
 php:
-  - 5.6
+  - 5.6.29
   - 7.0
 env:
   global:
diff --git a/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php b/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
index 93379cff52f2c..40558b3cae8a5 100644
--- a/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
@@ -53,10 +53,6 @@ protected function setUp()
      */
     public function testGetCaptcha()
     {
-        if (!function_exists("imageftbbox")) {
-            $this->markTestSkipped('imageftbbox is not available on the test environment');
-        }
-
         $this->configMock->expects(
             $this->once()
         )->method(
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index 26984af3df32c..649bce192614b 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -88,9 +88,6 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        if (!function_exists("imageftbbox")) {
-            $this->markTestSkipped('imageftbbox is not available on the test environment');
-        }
         $this->session = $this->_getSessionStub();
 
         $this->_storeManager = $this->getMock(
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index c4d8e4fd9be34..3a6f833a5a09c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Product;
 
+use Magento\Framework\DB\Query\BatchIteratorInterface as BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 
@@ -102,20 +104,29 @@ abstract class AbstractAction
      */
     protected $tempTreeIndexTableName;
 
+    /**
+     * @var QueryGenerator
+     */
+    private $queryGenerator;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
+     * @param QueryGenerator $queryGenerator
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Config $config
+        \Magento\Catalog\Model\Config $config,
+        QueryGenerator $queryGenerator = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->storeManager = $storeManager;
         $this->config = $config;
+        $this->queryGenerator = $queryGenerator ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(QueryGenerator::class);
     }
 
     /**
@@ -309,15 +320,26 @@ protected function isRangingNeeded()
      * @param int $range
      * @return \Magento\Framework\DB\Select[]
      */
-    protected function prepareSelectsByRange(\Magento\Framework\DB\Select $select, $field, $range = self::RANGE_CATEGORY_STEP)
-    {
-        return $this->isRangingNeeded() ? $this->connection->selectsByRange(
-            $field,
-            $select,
-            $range
-        ) : [
-            $select
-        ];
+    protected function prepareSelectsByRange(
+        \Magento\Framework\DB\Select $select,
+        $field,
+        $range = self::RANGE_CATEGORY_STEP
+    ) {
+        if($this->isRangingNeeded()) {
+            $iterator = $this->queryGenerator->generate(
+                $field,
+                $select,
+                $range,
+                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            );
+
+            $queries = [];
+            foreach ($iterator as $query) {
+                $queries[] = $query;
+            }
+            return $queries;
+        }
+        return [$select];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
index 917a47b637cea..eb4e385993ac2 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
@@ -48,9 +48,21 @@ public function getCollection(\Magento\Catalog\Model\Product $product, $type)
         $products = $this->providers[$type]->getLinkedProducts($product);
         $converter = $this->converterPool->getConverter($type);
         $output = [];
+        $sorterItems = [];
         foreach ($products as $item) {
             $output[$item->getId()] = $converter->convert($item);
         }
-        return $output;
+
+        foreach ($output as $item) {
+            $itemPosition = $item['position'];
+            if (!isset($sorterItems[$itemPosition])) {
+                $sorterItems[$itemPosition] = $item;
+            } else {
+                $newPosition = $itemPosition + 1;
+                $sorterItems[$newPosition] = $item;
+            }
+        }
+        ksort($sorterItems);
+        return $sorterItems;
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
new file mode 100644
index 0000000000000..b543c92ac0875
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model;
+
+use Magento\Catalog\Model\ProductLink\CollectionProvider;
+use Magento\Catalog\Model\ProductLink\CollectionProviderInterface;
+use Magento\Catalog\Model\ProductLink\Converter\ConverterInterface;
+use Magento\Catalog\Model\ProductLink\Converter\ConverterPool;
+use Magento\Catalog\Model\Product;
+
+class CollectionProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var CollectionProvider
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $providerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    protected function setUp()
+    {
+        $this->productMock = $this->getMock(Product::class, [], [], '', false, false);
+        $this->converterPoolMock = $this->getMock(ConverterPool::class, [], [], '', false, false);
+        $this->providerMock = $this->getMock(CollectionProviderInterface::class);
+        $this->converterMock = $this->getMock(ConverterInterface::class);
+
+        $this->model = new CollectionProvider($this->converterPoolMock, ['crosssell' => $this->providerMock]);
+    }
+
+    /**
+     * Test sort order of linked products based on configured item position.
+     */
+    public function testGetCollection()
+    {
+        $linkedProductOneMock = $this->getMock(Product::class, [], [], '', false, false);
+        $linkedProductTwoMock = $this->getMock(Product::class, [], [], '', false, false);
+        $linkedProductThreeMock = $this->getMock(Product::class, [], [], '', false, false);
+
+        $linkedProductOneMock->expects($this->once())->method('getId')->willReturn(1);
+        $linkedProductTwoMock->expects($this->once())->method('getId')->willReturn(2);
+        $linkedProductThreeMock->expects($this->once())->method('getId')->willReturn(3);
+
+        $this->converterPoolMock->expects($this->once())
+            ->method('getConverter')
+            ->with('crosssell')
+            ->willReturn($this->converterMock);
+
+        $map = [
+            [$linkedProductOneMock, ['name' => 'Product One', 'position' => 10]],
+            [$linkedProductTwoMock, ['name' => 'Product Two', 'position' => 2]],
+            [$linkedProductThreeMock, ['name' => 'Product Three', 'position' => 2]],
+        ];
+
+        $this->converterMock->expects($this->exactly(3))->method('convert')->willReturnMap($map);
+
+        $this->providerMock->expects($this->once())
+            ->method('getLinkedProducts')
+            ->with($this->productMock)
+            ->willReturn(
+                [
+                    $linkedProductOneMock,
+                    $linkedProductTwoMock,
+                    $linkedProductThreeMock
+                ]
+            );
+
+        $expectedResult = [
+            2 => ['name' => 'Product Two', 'position' => 2],
+            3 => ['name' => 'Product Three', 'position' => 2],
+            10 => ['name' => 'Product One', 'position' => 10],
+        ];
+
+        $actualResult = $this->model->getCollection($this->productMock, 'crosssell');
+
+        $this->assertEquals($expectedResult, $actualResult, 'Sort order of linked products in incorrect');
+    }
+
+    /**
+     * Test exception when collection provider is not configured for product link type.
+     *
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage Collection provider is not registered
+     */
+    public function testGetCollectionWithMissingProviders()
+    {
+        $this->model->getCollection($this->productMock, 'upsell');
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/eav_attributes.xml b/app/code/Magento/Catalog/etc/eav_attributes.xml
index 133849a28e048..005402937232f 100644
--- a/app/code/Magento/Catalog/etc/eav_attributes.xml
+++ b/app/code/Magento/Catalog/etc/eav_attributes.xml
@@ -30,6 +30,7 @@
             <field code="is_searchable" locked="true" />
         </attribute>
         <attribute code="category_ids">
+            <field code="is_global" locked="true" />
             <field code="is_searchable" locked="true" />
             <field code="used_for_sort_by" locked="true" />
             <field code="is_used_in_grid" locked="true" />
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 1b5e4f54f552c..7e52e2bdb4702 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -26,20 +26,30 @@ class Tree extends \Magento\Backend\Block\Template
      */
     protected $_cmsWysiwygImages = null;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->_coreRegistry = $registry;
         $this->_cmsWysiwygImages = $cmsWysiwygImages;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         parent::__construct($context, $data);
     }
 
@@ -65,7 +75,7 @@ public function getTreeJson()
                 'cls' => 'folder',
             ];
         }
-        return \Zend_Json::encode($jsonArray);
+        return $this->serializer->serialize($jsonArray);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index a0f94e1b8f733..eefec4c35679c 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -15,16 +15,26 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      */
     protected $jsLayout;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         parent::__construct($context, $data);
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -32,7 +42,7 @@ public function __construct(
      */
     public function getJsLayout()
     {
-        return \Zend_Json::encode($this->jsLayout);
+        return $this->serializer->serialize($this->jsLayout);
     }
 
     /**
@@ -50,6 +60,18 @@ public function getConfig()
         ];
     }
 
+    /**
+     * Returns popup config in JSON format.
+     *
+     * Added in scope of https://github.com/magento/magento2/pull/8617
+     *
+     * @return bool|string
+     */
+    public function getSerializedConfig()
+    {
+        return $this->serializer->serialize($this->getConfig());
+    }
+
     /**
      * Is autocomplete enabled for storefront
      *
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
index 67a3fb8f3a576..40f770ab9fbd4 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php
@@ -31,6 +31,9 @@ class AuthenticationPopupTest extends \PHPUnit_Framework_TestCase
     /** @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $urlBuilderMock;
 
+    /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
+    private $serializerMock;
+
     protected function setUp()
     {
         $this->contextMock = $this->getMockBuilder(Context::class)
@@ -72,8 +75,13 @@ function ($string) {
             ->method('getEscaper')
             ->willReturn($escaperMock);
 
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->getMock();
+
         $this->model = new AuthenticationPopup(
-            $this->contextMock
+            $this->contextMock,
+            [],
+            $this->serializerMock
         );
     }
 
@@ -83,6 +91,7 @@ function ($string) {
      * @param string $registerUrl
      * @param string $forgotUrl
      * @param array $result
+     * @throws \PHPUnit_Framework_Exception
      *
      * @dataProvider dataProviderGetConfig
      */
@@ -172,4 +181,51 @@ public function dataProviderGetConfig()
             ],
         ];
     }
+
+    /**
+     * @param mixed $isAutocomplete
+     * @param string $baseUrl
+     * @param string $registerUrl
+     * @param string $forgotUrl
+     * @param array $result
+     * @throws \PHPUnit_Framework_Exception
+     *
+     * @dataProvider dataProviderGetConfig
+     */
+    public function testGetSerializedConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUrl, array $result)
+    {
+        $this->scopeConfigMock->expects($this->any())
+            ->method('getValue')
+            ->with(Form::XML_PATH_ENABLE_AUTOCOMPLETE, ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($isAutocomplete);
+
+        /** @var StoreInterface||\PHPUnit_Framework_MockObject_MockObject $storeMock */
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getBaseUrl'])
+            ->getMockForAbstractClass();
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(null)
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->any())
+            ->method('getBaseUrl')
+            ->willReturn($baseUrl);
+
+        $this->urlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->willReturnMap(
+                [
+                    ['customer/account/create', [], $registerUrl],
+                    ['customer/account/forgotpassword', [], $forgotUrl],
+                ]
+            );
+        $this->serializerMock->expects($this->any())->method('serialize')
+            ->willReturn(
+                json_encode($this->model->getConfig())
+            );
+
+        $this->assertEquals(json_encode($result), $this->model->getSerializedConfig());
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
index bcf0cc92bc912..20ea488931398 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -10,7 +10,7 @@
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup'" style="display: none;">
     <script>
-        window.authenticationPopup = <?php /* @noEscape */ echo \Zend_Json::encode($block->getConfig()); ?>;
+        window.authenticationPopup = <?php /* @noEscape */ echo $block->getSerializedConfig(); ?>;
     </script>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
similarity index 98%
rename from app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
index 3f743f596fee6..367151a0405c8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
@@ -7,7 +7,7 @@
 
 use Magento\Backend\App\Action;
 
-class Void extends \Magento\Backend\App\Action
+class VoidAction extends Action
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
similarity index 95%
rename from app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
index 1b790d8b71dc1..235d280b54d9b 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-class Void extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+class VoidAction extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
     /**
      * Void invoice action
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
similarity index 99%
rename from app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php
rename to app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
index 5fb4f3e62f4f3..c4686f4a04306 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php
@@ -6,11 +6,11 @@
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Creditmemo;
 
 /**
- * Class VoidTest
+ * Class VoidActionTest
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VoidTest extends \PHPUnit_Framework_TestCase
+class VoidActionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\AddComment
@@ -179,7 +179,7 @@ protected function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->controller = $objectManager->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Void::class,
+            \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\VoidAction::class,
             [
                 'context' => $this->contextMock,
                 'creditmemoLoader' => $this->loaderMock,
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
similarity index 99%
rename from app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php
rename to app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
index 96f80c303c08e..597ba5733a43f 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php
@@ -10,11 +10,11 @@
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 
 /**
- * Class VoidTest
+ * Class VoidActionTest
  * @package Magento\Sales\Controller\Adminhtml\Order\Invoice
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VoidTest extends \PHPUnit_Framework_TestCase
+class VoidActionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -166,7 +166,7 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->controller = $objectManager->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\Invoice\Void::class,
+            \Magento\Sales\Controller\Adminhtml\Order\Invoice\VoidAction::class,
             [
                 'context' => $contextMock,
                 'resultForwardFactory' => $this->resultForwardFactoryMock
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 9a642e76357f7..7a7f052ea8eee 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -165,11 +165,19 @@ public function setValidationFilter(
                     \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
                 );
 
-                $orWhereConditions = [
+                $autoGeneratedCouponCondition = [
                     $connection->quoteInto(
-                        '(main_table.coupon_type = ? AND rule_coupons.type = 0)',
+                        "main_table.coupon_type = ?",
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
                     ),
+                    $connection->quoteInto(
+                        "rule_coupons.type = ?",
+                        \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
+                    ),
+                ];
+
+                $orWhereConditions = [
+                    "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
                     $connection->quoteInto(
                         '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Filesystem/FileHelper.php b/dev/tests/functional/lib/Magento/Mtf/Util/Filesystem/FileHelper.php
new file mode 100644
index 0000000000000..f4eb6e8de8b39
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Filesystem/FileHelper.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Filesystem;
+
+/**
+ * Filesystem helper.
+ */
+class FileHelper
+{
+    /**
+     * Normalizes a file/directory path.
+     *
+     * @param string $path
+     * @param string $ds
+     * @return string
+     */
+    public function normalizePath($path, $ds = DIRECTORY_SEPARATOR)
+    {
+        $path = rtrim(strtr($path, '/\\', $ds . $ds), $ds);
+        if (strpos($ds . $path, "{$ds}.") === false && strpos($path, "{$ds}{$ds}") === false) {
+            return $path;
+        }
+
+        return $this->realpath($ds, $path);
+    }
+
+    /**
+     * Returns canonicalized pathname.
+     *
+     * @param string $ds
+     * @param string $path
+     * @return string
+     */
+    private function realpath($ds, $path)
+    {
+        $parts = [];
+        foreach (explode($ds, $path) as $part) {
+            if ($part === '..' && !empty($parts) && end($parts) !== '..') {
+                array_pop($parts);
+            } elseif ($part === '.' || $part === '' && !empty($parts)) {
+                continue;
+            } else {
+                $parts[] = $part;
+            }
+        }
+
+        $path = implode($ds, $parts);
+
+        return $path === '' ? '.' : $path;
+    }
+
+    /**
+     * Creates a new directory.
+     *
+     * @param string $path
+     * @param int $mode
+     * @param bool $recursive
+     * @return bool
+     * @throws \Exception
+     */
+    public function createDirectory($path, $mode = 0775, $recursive = true)
+    {
+        if (is_dir($path)) {
+            return true;
+        }
+        $parentDir = dirname($path);
+
+        if ($recursive && !is_dir($parentDir) && $parentDir !== $path) {
+            $this->createDirectory($parentDir, $mode, true);
+        }
+
+        try {
+            if (!mkdir($path, $mode)) {
+                return false;
+            }
+        } catch (\Exception $e) {
+            if (!is_dir($path)) {
+                throw new \Exception("Failed to create directory \"$path\"");
+            }
+        }
+
+        try {
+            return chmod($path, $mode);
+        } catch (\Exception $e) {
+            throw new \Exception("Failed to change permissions for directory \"$path\"");
+        }
+    }
+
+    /**
+     * Create a new file with content.
+     *
+     * @param string $filename
+     * @param string $content
+     * @return bool
+     */
+    public function createFile($filename, $content)
+    {
+        return file_put_contents($filename, $content) !== false;
+    }
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/Generator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/Generator.php
new file mode 100644
index 0000000000000..aa54300bea67e
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/Generator.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Generate\File;
+
+use Magento\Mtf\Util\Filesystem\FileHelper;
+
+/**
+ * File generator.
+ */
+class Generator
+{
+    /**
+     * Base directory for files.
+     */
+    const ROOT_DIRECTORY = '/var/tests/data/';
+
+    /**
+     * Directory for saving files.
+     *
+     * @var string
+     */
+    private $directory;
+
+    /**
+     * Filesystem helper.
+     *
+     * @var FileHelper
+     */
+    private $fileHelper;
+
+    /**
+     * @param FileHelper $fileHelper
+     * @param string $directory
+     */
+    public function __construct(FileHelper $fileHelper, $directory)
+    {
+        $this->fileHelper = $fileHelper;
+        $this->directory = $this->fileHelper->normalizePath(MTF_BP . static::ROOT_DIRECTORY . $directory);
+    }
+
+    /**
+     * Method is generate file by template.
+     *
+     * @param TemplateInterface $template
+     * @return string Full path to the generated file.
+     * @throws \Exception
+     */
+    public function generate(TemplateInterface $template)
+    {
+        $filename = $this->fileHelper->normalizePath($this->directory . '/' . $template->getName());
+        if (!$this->fileHelper->createDirectory($this->directory)
+            || !$this->fileHelper->createFile($filename, $template->render())
+        ) {
+            throw new \Exception(
+                'Can’t create file with "' . get_class($template) .'" (file "' .  $filename . '").'
+            );
+        }
+
+        return $filename;
+    }
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/TemplateInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/TemplateInterface.php
new file mode 100644
index 0000000000000..72d4e4286c352
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/TemplateInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Generate\File;
+
+/**
+ * Interface for file template.
+ */
+interface TemplateInterface
+{
+    /**
+     * Create and return file content.
+     *
+     * @return string
+     */
+    public function render();
+
+    /**
+     * Get filename. Without directory.
+     *
+     * @return string
+     */
+    public function getName();
+}
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php
new file mode 100644
index 0000000000000..259083278d3b4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportCheckDataErrorMessagesList.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedPricingImportExport\Test\Constraint;
+
+use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Check error message list after check data fail.
+ */
+class AssertImportCheckDataErrorMessagesList extends AbstractConstraint
+{
+    /**
+     * Assert that error message is present.
+     *
+     * @param array $patterns
+     * @param AdminImportIndex $adminImportIndex
+     * @return void
+     */
+    public function processAssert(array $patterns, AdminImportIndex $adminImportIndex)
+    {
+        $messages = $adminImportIndex->getImportResult()->getErrorsList();
+
+        \PHPUnit_Framework_Assert::assertNotFalse($messages, 'Errors messages block is absent.');
+        \PHPUnit_Framework_Assert::assertNotEmpty($messages, 'Errors messages is absent.');
+
+        $errors = [];
+        foreach ($messages as $message) {
+            if ($this->isNotMatched($patterns, $message)) {
+                $errors[] = sprintf('This message "%s" mismatch with any pattern', $message);
+            }
+        }
+
+        \PHPUnit_Framework_Assert::assertEmpty(
+            $errors,
+            'This assertions contains next errors:' . PHP_EOL . implode(PHP_EOL, $errors)
+        );
+    }
+
+    /**
+     * Checking message.
+     *
+     * @param array $patterns
+     * @param string $message
+     * @return bool
+     */
+    private function isNotMatched(array $patterns, $message)
+    {
+        $isNotMatch = true;
+        foreach ($patterns as $parts) {
+            $parts = (array) $parts;
+            if ($isNotMatch && $this->match($message, $parts) === count($parts)) {
+                $isNotMatch = false;
+            }
+        }
+
+        return $isNotMatch;
+    }
+
+    /**
+     * Check if patterns are contained in a message.
+     *
+     * @param string $message
+     * @param array $patterns
+     * @return int
+     */
+    private function match($message, array $patterns)
+    {
+        $matchCount = 0;
+        foreach ($patterns as $pattern) {
+            if (strpos($message, $pattern) !== false) {
+                ++$matchCount;
+            }
+        }
+
+        return $matchCount;
+    }
+
+    /**
+     * Return string representation of object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'All messages for errors match the patterns.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml
new file mode 100644
index 0000000000000..f103c0cbd3dbd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\ImportExport\Test\TestCase\ImportDataNegativeTest" summary="Import data">
+        <variation name="PreventImportAdvancedPricingIfIncorrectData" ticketId="MAGETWO-46155" summary="Import advanced pricing if incorrect data">
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="patterns" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="0" xsi:type="string">Value for 'tier_price' attribute</item>
+                    <item name="1" xsi:type="string">in row(s): 1</item>
+                </item>
+            </data>
+            <data name="import/data" xsi:type="array">
+                <item name="entity" xsi:type="string">Advanced Pricing</item>
+                <item name="behavior" xsi:type="string">Add/Update</item>
+                <item name="validation_strategy" xsi:type="string">Stop on Error</item>
+                <item name="allowed_error_count" xsi:type="string">10</item>
+                <item name="import_field_separator" xsi:type="string">,</item>
+                <item name="import_multiple_value_separator" xsi:type="string">,</item>
+                <item name="import_file" xsi:type="array">
+                    <item name="products" xsi:type="array">
+                        <item name="0" xsi:type="string">catalogProductSimple::default</item>
+                    </item>
+                    <item name="template" xsi:type="array">
+                        <item name="filename"
+                              xsi:type="string">Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect</item>
+                        <item name="count" xsi:type="number">1</item>
+                    </item>
+                </item>
+            </data>
+            <constraint name="Magento\ImportExport\Test\Constraint\AssertImportCheckDataErrorMessage" />
+            <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportCheckDataErrorMessagesList" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertAdvancedPriceAbsentOnProductForm" />
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php
new file mode 100644
index 0000000000000..9a7a19fd11a84
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'sku' => '%sku%',
+    'tier_price_website' => 'All Websites [USD]',
+    'tier_price_customer_group' => 'ALL GROUPS',
+    'tier_price_qty' => '3',
+    'tier_price' => 'text',
+    'tier_price_value_type' => 'Fixed',
+];
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/etc/di.xml
new file mode 100644
index 0000000000000..35ddc38d4ff30
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/etc/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportCheckDataErrorMessagesList">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
index 191e2763cadfe..08a570c315934 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
@@ -263,6 +263,24 @@
             </field>
         </dataset>
 
+        <dataset name="braintree_paypal_require_billing_address">
+            <field name="payment/braintree_paypal/require_billing_address" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="braintree_paypal_require_billing_address_rollback">
+            <field name="payment/braintree_paypal/require_billing_address" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+
         <dataset name="braintree_fraudprotection">
             <field name="payment/braintree/fraudprotection" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
index 8b4161fae9a90..adeb4da0ba2da 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
@@ -48,5 +48,17 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
         </variation>
+        <variation name="CheckoutWithBraintreePaypalMinicartTestVariation3" summary="Checkout using PayPal Braintree button if Require Customer's Billing Address = Yes" ticketId="MAGETWO-48101">
+            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="shipping/shipping_service" xsi:type="string">Free Shipping</data>
+            <data name="shipping/shipping_method" xsi:type="string">Free</data>
+            <data name="payment/method" xsi:type="string">braintree_paypal</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, freeshipping, braintree_paypal_require_billing_address</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderBillingAndShippingAddressesAreDifferent" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php
index b3e5fda32ef9a..c18e7f0790522 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php
@@ -3,7 +3,6 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\AdvancedPricing;
 
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\Options\AbstractOptions;
@@ -80,4 +79,14 @@ public function isVisibleCustomerGroup(CustomerGroup $customerGroup)
         $options = $this->_rootElement->find($this->customerGroup, Locator::SELECTOR_XPATH)->getText();
         return false !== strpos($options, $customerGroup->getCustomerGroupCode());
     }
+
+    /**
+     * Checking group price options is visible.
+     *
+     * @return bool
+     */
+    public function hasGroupPriceOptions()
+    {
+        return $this->_rootElement->find('tbody tr')->isPresent();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 1681049ee6bf2..78f49f45c8567 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -131,6 +131,7 @@ public function openSection($sectionName)
         $sectionElement = $this->getContainerElement($sectionName);
         if ($sectionElement->getAttribute('type') == 'button') {
             $sectionElement->click();
+            sleep(1); // according to animation timeout in JS
         } else {
             parent::openSection($sectionName);
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php
new file mode 100644
index 0000000000000..3a3d9de7337be
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAdvancedPriceAbsentOnProductForm.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\AdvancedPricing;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
+
+/**
+ * Assert advanced price is absent on product page in form.
+ */
+class AssertAdvancedPriceAbsentOnProductForm extends AbstractConstraint
+{
+    /**
+     * Assert advanced price is absent on product page in form.
+     *
+     * @param FixtureInterface[] $products
+     * @param CatalogProductEdit $productPage
+     * @return void
+     */
+    public function processAssert(array $products, CatalogProductEdit $productPage)
+    {
+        foreach ($products as $product) {
+            $productPage->open(['id' => $product->getData('id')]);
+            /** @var AdvancedPricing $advancedPricing */
+            $advancedPricing = $productPage->getProductForm()
+                ->openSection('advanced-pricing')
+                ->getSection('advanced-pricing');
+
+            \PHPUnit_Framework_Assert::assertFalse(
+                $advancedPricing->getTierPriceForm()->hasGroupPriceOptions(),
+                'Customer group price options is present in grid.'
+            );
+        }
+    }
+
+    /**
+     * Return string representation of object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Advanced price is absent on product page in form.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml
index 5a2704377aebe..39dce173db16d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml
@@ -186,4 +186,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Test\Constraint\AssertAdvancedPriceAbsentOnProductForm">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
index 07d85bd5b3491..7660a6ea94f44 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml
@@ -241,6 +241,40 @@
             </field>
         </dataset>
 
+        <dataset name="product_with_color_for_promo_rules">
+            <field name="name" xsi:type="string">Test configurable product with color and size %isolation%</field>
+            <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="weight" xsi:type="string">30</field>
+            <field name="status" xsi:type="string">Yes</field>
+            <field name="visibility" xsi:type="string">Catalog, Search</field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="url_key" xsi:type="string">configurable-product-%isolation%</field>
+            <field name="configurable_attributes_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">color_for_promo_rules</item>
+            </field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="attribute_set_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+            <field name="checkout_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">configurable_default</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">40</item>
+                <item name="dataset" xsi:type="string">price_40</item>
+            </field>
+        </dataset>
+
         <dataset name="one_variation">
             <field name="name" xsi:type="string">Test configurable product %isolation%</field>
             <field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
index 2c2b02990b45a..9046294258b54 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml
@@ -563,6 +563,44 @@
             </field>
         </dataset>
 
+        <dataset name="color_for_promo_rules">
+            <field name="attributes_data" xsi:type="array">
+                <item name="attribute_key_0" xsi:type="array">
+                    <item name="options" xsi:type="array">
+                        <item name="option_key_0" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">5.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                        <item name="option_key_1" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">10.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                        <item name="option_key_2" xsi:type="array">
+                            <item name="pricing_value" xsi:type="string">15.00</item>
+                            <item name="include" xsi:type="string">Yes</item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="attributes" xsi:type="array">
+                <item name="attribute_key_0" xsi:type="string">catalogProductAttribute::color_for_promo_rules</item>
+            </field>
+            <field name="matrix" xsi:type="array">
+                <item name="attribute_key_0:option_key_0" xsi:type="array">
+                    <item name="qty" xsi:type="string">1</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+                <item name="attribute_key_0:option_key_1" xsi:type="array">
+                    <item name="qty" xsi:type="string">1</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+                <item name="attribute_key_0:option_key_2" xsi:type="array">
+                    <item name="qty" xsi:type="string">1</item>
+                    <item name="weight" xsi:type="string">1</item>
+                </item>
+            </field>
+        </dataset>
+
         <dataset name="size">
             <field name="attributes_data" xsi:type="array">
                 <item name="attribute_key_0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Mtf/Util/Import/File/CsvTemplate.php b/dev/tests/functional/tests/app/Magento/ImportExport/Mtf/Util/Import/File/CsvTemplate.php
new file mode 100644
index 0000000000000..6c080d4095b86
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Mtf/Util/Import/File/CsvTemplate.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Mtf\Util\Import\File;
+
+use Magento\Mtf\Util\Generate\File\TemplateInterface;
+
+/**
+ * CSV file template.
+ */
+class CsvTemplate implements TemplateInterface
+{
+    /**
+     * Configuration.
+     *
+     * @var array
+     */
+    private $config;
+
+    /**
+     * @param array $config
+     */
+    public function __construct(array $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render()
+    {
+        if (!isset($this->config['filename'], $this->config['count'])) {
+            throw new \InvalidArgumentException(
+                'Configuration for file is bad. You must specify "filename" and "count" in configuration.'
+            );
+        }
+
+        $filename = MTF_TESTS_PATH . $this->config['filename'] . '.php';
+
+        if (!file_exists($filename)) {
+            throw new \Exception('File "' . $filename . '" does not exist.');
+        }
+
+        $data = include $filename;
+        $count = abs($this->config['count']);
+
+        $placeholders = [];
+        if (!empty($this->config['placeholders'])) {
+            $placeholders = $this->config['placeholders'];
+        }
+
+        $fh = fopen('php://temp', 'rw');
+        fputcsv($fh, array_keys($data));
+
+        for ($i = 0; $i < $count; ++$i) {
+            $row = array_map(
+                function ($value) use ($placeholders, $i) {
+                    if (is_string($value) && isset($placeholders[$i])) {
+                        return strtr($value, $placeholders[$i]);
+                    }
+
+                    return $value;
+                },
+                $data
+            );
+            fputcsv($fh, $row);
+        }
+
+        rewind($fh);
+        $csv = stream_get_contents($fh);
+        fclose($fh);
+
+        return $csv;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return sprintf(
+            '%x_%s.csv',
+            crc32(time()),
+            basename($this->config['filename'])
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.php
new file mode 100644
index 0000000000000..96165e7663db8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Block\Adminhtml\Import\Edit;
+
+/**
+ * Import form.
+ */
+class Form extends \Magento\Mtf\Block\Form
+{
+    //
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.xml
new file mode 100644
index 0000000000000..24d7898d36933
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <entity>
+            <input>select</input>
+        </entity>
+        <behavior>
+            <input>select</input>
+        </behavior>
+        <validation_strategy>
+            <input>select</input>
+        </validation_strategy>
+        <allowed_error_count/>
+        <import_field_separator>
+            <selector>[name='_import_field_separator']</selector>
+        </import_field_separator>
+        <import_multiple_value_separator>
+            <selector>[name='_import_multiple_value_separator']</selector>
+        </import_multiple_value_separator>
+        <fields_enclosure>
+            <input>checkbox</input>
+        </fields_enclosure>
+        <import_file>
+            <input>upload</input>
+        </import_file>
+        <import_images_file_dir/>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/FormPageActions.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/FormPageActions.php
new file mode 100644
index 0000000000000..7221c619364f8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/FormPageActions.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Block\Adminhtml\Import;
+
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Form page actions block.
+ */
+class FormPageActions extends \Magento\Backend\Test\Block\PageActions
+{
+    /**
+     * "Check Data" button.
+     *
+     * @var string
+     */
+    private $checkDataButton = '#upload_button';
+
+    /**
+     * Magento loader.
+     *
+     * @var string
+     */
+    private $loader = '//ancestor::body/div[@data-role="loader"]';
+
+    /**
+     * Click "Check Data" button.
+     *
+     * @return void
+     */
+    public function clickCheckData()
+    {
+        $this->waitForElementVisible($this->checkDataButton);
+        $this->_rootElement->find($this->checkDataButton)->click();
+        $this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Frame/Result.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Frame/Result.php
new file mode 100644
index 0000000000000..13540187449c3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Frame/Result.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Block\Adminhtml\Import\Frame;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Import checking result data block.
+ */
+class Result extends Block
+{
+    /**
+     * CSS selector for error message block.
+     *
+     * @var string
+     */
+    private $errorMessage = '.message-error';
+
+    /**
+     * CSS selector for validation errors list block.
+     *
+     * @var string
+     */
+    private $validationErrorList = '.import-error-list';
+
+    /**
+     * Get error message text.
+     *
+     * @return string|bool
+     */
+    public function getErrorMessage()
+    {
+        $element = $this->_rootElement->find($this->errorMessage);
+
+        if (!$element->isVisible()) {
+            return false;
+        }
+
+        return (string) $this->_rootElement->find($this->errorMessage)->getText();
+    }
+
+    /**
+     * Get errors messages list.
+     *
+     * @return array|false
+     */
+    public function getErrorsList()
+    {
+        $element = $this->_rootElement->find($this->validationErrorList);
+
+        if (!$element->isVisible()) {
+            return false;
+        }
+
+        $text = $this->_rootElement->find($this->validationErrorList)->getText();
+
+        return (array) explode(PHP_EOL, strip_tags($text));
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php
new file mode 100644
index 0000000000000..dcc50c8de72ee
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertImportCheckDataErrorMessage.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Constraint;
+
+use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Check error message after check data fail.
+ */
+class AssertImportCheckDataErrorMessage extends AbstractConstraint
+{
+    /**
+     * Text value to be checked.
+     */
+    const ERROR_MESSAGE = 'Data validation failed. Please fix the following errors and upload the file again.';
+
+    /**
+     * Assert that error message is present.
+     *
+     * @param AdminImportIndex $adminImportIndex
+     * @return void
+     */
+    public function processAssert(AdminImportIndex $adminImportIndex)
+    {
+        $actualMessage = $adminImportIndex->getImportResult()->getErrorMessage();
+
+        \PHPUnit_Framework_Assert::assertNotFalse($actualMessage, 'Error message is absent.');
+
+        \PHPUnit_Framework_Assert::assertEquals(
+            static::ERROR_MESSAGE,
+            $actualMessage,
+            'Wrong error message is displayed.'
+            . "\nExpected: " . self::ERROR_MESSAGE
+            . "\nActual: " . $actualMessage
+        );
+    }
+
+    /**
+     * Return string representation of object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Data check error message is present.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
index f6bd4fdf76340..cbcc82f2a42e2 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -7,7 +7,7 @@
 namespace Magento\ImportExport\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Magento\ImportExport\Test\Fixture\ImportExport;
+use Magento\ImportExport\Test\Fixture\ExportData;
 use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
@@ -22,13 +22,13 @@ class AssertProductAttributeAbsenceForExport extends AbstractConstraint
      *
      * @param AdminExportIndex $exportIndex
      * @param CatalogProductAttribute $attribute
-     * @param ImportExport $export
+     * @param ExportData $export
      * @return void
      */
     public function processAssert(
         AdminExportIndex $exportIndex,
         CatalogProductAttribute $attribute,
-        ImportExport $export
+        ExportData $export
     ) {
         $exportIndex->open();
         $exportIndex->getExportForm()->fill($export);
@@ -50,6 +50,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return 'Product Attribute is absent in Filter export grid';
+        return 'Product Attribute is absent in Filter export grid.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ExportData.xml
similarity index 85%
rename from dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml
rename to dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ExportData.xml
index 991349508e407..afc223fa86b56 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.xml
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ExportData.xml
@@ -6,12 +6,12 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
-    <fixture name="importExport"
+    <fixture name="exportData"
              module="Magento_ImportExport"
              type="flat"
              entity_type="importexport_importdata"
-             repository_class="Magento\ImportExport\Test\Repository\ImportExport"
-             class="Magento\ImportExport\Test\Fixture\ImportExport">
+             repository_class="Magento\ImportExport\Test\Repository\ExportData"
+             class="Magento\ImportExport\Test\Fixture\ExportData">
         <field name="id" is_required="1" />
         <field name="entity" is_required="" />
         <field name="file_format" is_required="" />
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
new file mode 100644
index 0000000000000..7e09d568f8e45
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/Import/File.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Fixture\Import;
+
+use Magento\ImportExport\Mtf\Util\Import\File\CsvTemplate;
+use Magento\Mtf\Fixture\DataSource;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Util\Generate\File\Generator;
+
+/**
+ * Fixture of file.
+ */
+class File extends DataSource
+{
+    /**
+     * Fixture data.
+     *
+     * @var array
+     */
+    private $value;
+
+    /**
+     * Generator for the uploaded file.
+     *
+     * @var Generator
+     */
+    private $generator;
+
+    /**
+     * Factory for fixtures.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * Products fixtures.
+     *
+     * @var FixtureInterface[]
+     */
+    private $products;
+
+    /**
+     * Object manager.
+     *
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManager $objectManager
+     * @param FixtureFactory $fixtureFactory
+     * @param Generator $generator
+     * @param array $params
+     * @param array|string $data
+     */
+    public function __construct(
+        ObjectManager $objectManager,
+        FixtureFactory $fixtureFactory,
+        Generator $generator,
+        array $params,
+        $data = []
+    ) {
+        $this->params = $params;
+        $this->value = $data;
+        $this->generator = $generator;
+        $this->fixtureFactory = $fixtureFactory;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($key = null)
+    {
+        if (isset($this->data)) {
+            return parent::getData($key);
+        }
+
+        $placeholders = [];
+        if (!isset($this->products)
+            && isset($this->value['products'])
+            && is_array($this->value['products'])
+        ) {
+            $this->products = $this->createProducts();
+
+            foreach ($this->products as $product) {
+                $placeholders[] = ['%sku%' => $product->getData('sku')];
+            }
+        }
+
+        if (isset($this->value['template']) && is_array($this->value['template'])) {
+            $this->data = $this->generator->generate(
+                $this->objectManager->create(
+                    CsvTemplate::class,
+                    [
+                        'config' => array_merge(
+                            $this->value['template'],
+                            [
+                                'placeholders' => $placeholders
+                            ]
+                        )
+                    ]
+                )
+            );
+
+            return parent::getData($key);
+        }
+
+        $filename = MTF_TESTS_PATH . $this->value;
+        if (!file_exists($filename)) {
+            throw new \Exception("CSV file '{$filename}'' not found on the server.");
+        }
+
+        $this->data = $filename;
+
+        return parent::getData($key);
+    }
+
+    /**
+     * Get products fixtures.
+     *
+     * @return FixtureInterface[]
+     */
+    public function getProducts()
+    {
+        return $this->products ?: [];
+    }
+
+    /**
+     * Create products from configuration of variation.
+     *
+     * @return FixtureInterface[]
+     */
+    private function createProducts()
+    {
+        $products = [];
+        foreach ($this->value['products'] as $key => $productDataSet) {
+            list($fixtureCode, $dataset) = explode('::', $productDataSet);
+
+            /** @var FixtureInterface[] $products */
+            $products[$key] = $this->fixtureFactory->createByCode(trim($fixtureCode), ['dataset' => trim($dataset)]);
+            if ($products[$key]->hasData('id') === false) {
+                $products[$key]->persist();
+            }
+        }
+
+        return $products;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportData.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportData.xml
new file mode 100644
index 0000000000000..c1a46b1118542
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="importData"
+             module="Magento_ImportExport"
+             type="flat"
+             entity_type="importexport_importdata"
+             class="Magento\ImportExport\Test\Fixture\ImportData">
+        <field name="id" is_required="1" />
+        <field name="entity" is_required="1" />
+        <field name="behavior" is_required="1" />
+        <field name="validation_strategy" is_required="1" />
+        <field name="allowed_error_count" is_required="1" />
+        <field name="import_field_separator" is_required="1" />
+        <field name="import_multiple_value_separator" is_required="1" />
+        <field name="fields_enclosure" is_required="0" />
+        <field name="import_file" is_required="1" source="Magento\ImportExport\Test\Fixture\Import\File" />
+        <field name="import_images_file_dir" is_required="0" />
+    </fixture>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminImportIndex.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminImportIndex.xml
new file mode 100644
index 0000000000000..f07b7037a5dba
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Page/Adminhtml/AdminImportIndex.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="AdminImportIndex" area="Adminhtml" mca="admin/import/index" module="Magento_ImportExport">
+        <block name="importForm" class="Magento\ImportExport\Test\Block\Adminhtml\Import\Edit\Form" locator="#edit_form" strategy="css selector" />
+        <block name="formPageActions" class="Magento\ImportExport\Test\Block\Adminhtml\Import\FormPageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="importResult" class="Magento\ImportExport\Test\Block\Adminhtml\Import\Frame\Result" locator="#import_validation_container" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ImportExport.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ExportData.xml
similarity index 87%
rename from dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ImportExport.xml
rename to dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ExportData.xml
index 8661dcf84e397..29ab7c7d95976 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ImportExport.xml
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Repository/ExportData.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\ImportExport\Test\Repository\ImportExport">
+    <repository class="Magento\ImportExport\Test\Repository\ExportData">
         <dataset name="default">
             <field name="entity" xsi:type="string">Products</field>
             <field name="behavior" xsi:type="string">CSV</field>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/ImportDataNegativeTest.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/ImportDataNegativeTest.php
new file mode 100644
index 0000000000000..11517600cc9cf
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/ImportDataNegativeTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Create products.
+ *
+ * Steps:
+ * 1. Login as admin.
+ * 2. Open import index page.
+ * 3. Fill import form.
+ * 4. Click "Check Data" button.
+ * 5. Perform assertions.
+ *
+ * @group ImportExport
+ */
+class ImportDataNegativeTest extends Scenario
+{
+    /* tags */
+    const SEVERITY = 'S1';
+    /* end tags */
+
+    /**
+     * Run import data test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/ClickCheckDataStep.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/ClickCheckDataStep.php
new file mode 100644
index 0000000000000..614a7c6b7380b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/ClickCheckDataStep.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\TestStep;
+
+use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Click "Check Data" button.
+ */
+class ClickCheckDataStep implements TestStepInterface
+{
+    /**
+     * Import index page.
+     *
+     * @var AdminImportIndex
+     */
+    private $adminImportIndex;
+
+    /**
+     * @param AdminImportIndex $adminImportIndex
+     */
+    public function __construct(AdminImportIndex $adminImportIndex)
+    {
+        $this->adminImportIndex = $adminImportIndex;
+    }
+
+    /**
+     * Click "Check Data" button.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->adminImportIndex->getFormPageActions()->clickCheckData();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/FillImportFormStep.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/FillImportFormStep.php
new file mode 100644
index 0000000000000..0b9475c071a6d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/FillImportFormStep.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\TestStep;
+
+use Magento\ImportExport\Test\Fixture\Import\File;
+use Magento\ImportExport\Test\Fixture\ImportData;
+use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Fill import form.
+ */
+class FillImportFormStep implements TestStepInterface
+{
+    /**
+     * Import index page.
+     *
+     * @var AdminImportIndex
+     */
+    private $adminImportIndex;
+
+    /**
+     * Import fixture.
+     *
+     * @var ImportData
+     */
+    private $import;
+
+    /**
+     * @param AdminImportIndex $adminImportIndex
+     * @param ImportData $import
+     */
+    public function __construct(AdminImportIndex $adminImportIndex, ImportData $import)
+    {
+        $this->adminImportIndex = $adminImportIndex;
+        $this->import = $import;
+    }
+
+    /**
+     * Fill import form.
+     *
+     * @return array
+     */
+    public function run()
+    {
+        $this->adminImportIndex->getImportForm()->fill($this->import);
+
+        /** @var File $file */
+        $file = $this->import->getDataFieldConfig('import_file')['source'];
+
+        return [
+            'products' => $file->getProducts()
+        ];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/OpenImportIndexStep.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/OpenImportIndexStep.php
new file mode 100644
index 0000000000000..c6025d0007e14
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestStep/OpenImportIndexStep.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\TestStep;
+
+use Magento\ImportExport\Test\Page\Adminhtml\AdminImportIndex;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Open import index page.
+ */
+class OpenImportIndexStep implements TestStepInterface
+{
+    /**
+     * Import index page.
+     *
+     * @var AdminImportIndex
+     */
+    private $adminImportIndex;
+
+    /**
+     * @param AdminImportIndex $adminImportIndex
+     */
+    public function __construct(AdminImportIndex $adminImportIndex)
+    {
+        $this->adminImportIndex = $adminImportIndex;
+    }
+
+    /**
+     * Open import index page.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->adminImportIndex->open();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/di.xml
index 56a89f2abb23f..c087e20f23a92 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/di.xml
@@ -5,10 +5,26 @@
  * See COPYING.txt for license details.
  */
  -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-  <type name="Magento\ImportExport\Test\Constraint\AssertProductAttributeAbsenceForExport">
-    <arguments>
-      <argument name="severity" xsi:type="string">high</argument>
-    </arguments>
-  </type>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\ImportExport\Test\Constraint\AssertProductAttributeAbsenceForExport">
+        <arguments>
+            <argument name="severity" xsi:type="string">high</argument>
+        </arguments>
+    </type>
+    <type name="Magento\ImportExport\Test\Constraint\AssertImportCheckDataErrorMessage">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
+    <type name="Magento\ImportExport\Test\Fixture\Import\File">
+        <arguments>
+            <argument name="generator" xsi:type="object">ImportCsvGenerator</argument>
+        </arguments>
+    </type>
+    <virtualType name="ImportCsvGenerator" type="Magento\Mtf\Util\Generate\File\Generator">
+        <arguments>
+            <argument name="directory" xsi:type="string">ImportExport/import</argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/testcase.xml
new file mode 100644
index 0000000000000..8c9ff10484fa6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/testcase.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/TestCase/etc/testcase.xsd">
+    <scenario name="ImportDataNegativeTest" firstStep="openImportIndex">
+        <step name="openImportIndex" module="Magento_ImportExport" next="fillImportForm" />
+        <step name="fillImportForm" module="Magento_ImportExport" next="clickCheckData" />
+        <step name="clickCheckData" module="Magento_ImportExport" />
+    </scenario>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php
new file mode 100644
index 0000000000000..fadf9318bfe39
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderBillingAndShippingAddressesAreDifferent.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Constraint;
+
+use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that Order Billing Address different than Shipping Address on order page.
+ */
+class AssertOrderBillingAndShippingAddressesAreDifferent extends AbstractConstraint
+{
+    /**
+     * Assert that Order Billing Address different than Shipping Address on order page.
+     *
+     * @param SalesOrderView $salesOrderView
+     * @param string $orderId
+     * @return void
+     */
+    public function processAssert(
+        SalesOrderView $salesOrderView,
+        $orderId
+    ) {
+        $salesOrderView->open(['order_id' => $orderId]);
+        $orderBillingAddress = $salesOrderView->getAddressesBlock()->getCustomerBillingAddress();
+        $orderShippingAddress = $salesOrderView->getAddressesBlock()->getCustomerShippingAddress();
+
+        \PHPUnit_Framework_Assert::assertNotEquals(
+            $orderBillingAddress,
+            $orderShippingAddress,
+            "Billing and shipping addresses on order page are the same but shouldn't."
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Billing and Shipping addresses are different on order page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
index d77d737a2e9f9..b6c087e8edba9 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
@@ -111,4 +111,9 @@
             <argument name="severity" xsi:type="string">S0</argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Test\Constraint\AssertOrderBillingAndShippingAddressesAreDifferent">
+        <arguments>
+            <argument name="severity" xsi:type="string">S1</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
index 7e30946214475..28541b56d43f8 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
@@ -80,4 +80,9 @@
         <selector>[data-index="labels"]</selector>
         <strategy>css selector</strategy>
     </labels>
+    <manage_coupon_code>
+        <class>\Magento\SalesRule\Test\Block\Adminhtml\Promo\Quote\Edit\Section\ManageCouponCode</class>
+        <selector>[data-index="block_promo_sales_rule_edit_tab_coupons"]</selector>
+        <strategy>css selector</strategy>
+    </manage_coupon_code>
 </sections>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/Section/ManageCouponCode.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/Section/ManageCouponCode.php
new file mode 100644
index 0000000000000..ebd20616dc891
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/Section/ManageCouponCode.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\SalesRule\Test\Block\Adminhtml\Promo\Quote\Edit\Section;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Ui\Test\Block\Adminhtml\Section;
+
+/**
+ * Backend sales rule label section.
+ */
+class ManageCouponCode extends Section
+{
+    const GENERATE_CODES_BUTTON_CSS_SELECTOR = ".action-default.scalable.generate";
+
+    const LAST_GENERATED_COUPON_CODE_SELECTOR = "//*[@id=\"couponCodesGrid_table\"]/tbody/tr/td[2]";
+
+    const SPINNER = ".loading-mask";
+
+    /**
+     * Click on generate button in order to generate coupon codes
+     *
+     * @return void
+     */
+    public function generateCouponCodes()
+    {
+        $button = $this->_rootElement->find(self::GENERATE_CODES_BUTTON_CSS_SELECTOR);
+        $button->click();
+    }
+
+    /**
+     * Retrieve last generated coupon code
+     *
+     * @return string
+     */
+    public function getGeneratedCouponCode()
+    {
+        $this->waitForSpinner();
+        $column = $this->_rootElement->find(self::LAST_GENERATED_COUPON_CODE_SELECTOR, Locator::SELECTOR_XPATH);
+        return $column->getText();
+    }
+
+    private function waitForSpinner()
+    {
+        $this->waitForElementNotVisible(self::SPINNER);
+        sleep(1);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php
index d554ec2ce7991..a1893412681cd 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php
@@ -156,6 +156,7 @@ public function processAssert(
         Customer $customer = null,
         Address $address = null,
         $isLoggedIn = null,
+        $couponCode = null,
         array $shipping = [],
         array $cartPrice = []
     ) {
@@ -179,10 +180,15 @@ public function processAssert(
             $this->checkoutCart->getShippingBlock()->fillEstimateShippingAndTax($address);
             $this->checkoutCart->getShippingBlock()->selectShippingMethod($shipping);
         }
-        if ($salesRule->getCouponCode() || $salesRuleOrigin->getCouponCode()) {
-            $this->checkoutCart->getDiscountCodesBlock()->applyCouponCode(
-                $salesRule->getCouponCode() ? $salesRule->getCouponCode() : $salesRuleOrigin->getCouponCode()
-            );
+
+        if ($salesRule->getCouponCode()) {
+            $couponCode = $salesRule->getCouponCode();
+        } elseif ($salesRuleOrigin->getCouponCode()) {
+            $couponCode = $salesRuleOrigin->getCouponCode();
+        }
+
+        if ($salesRule->getCouponCode() || $salesRuleOrigin->getCouponCode() || $couponCode) {
+            $this->checkoutCart->getDiscountCodesBlock()->applyCouponCode($couponCode);
         }
         $this->assert();
     }
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 911ac8e8482bb..9ac8e5abd4fb9 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -95,7 +95,6 @@
             <field name="discount_amount" xsi:type="string">50</field>
             <field name="stop_rules_processing" xsi:type="string">Yes</field>
         </dataset>
-
         <dataset name="active_sales_rule_with_complex_conditions">
             <field name="name" xsi:type="string">Cart Price Rule with with complex conditions %isolation%</field>
             <field name="description" xsi:type="string">Cart Price Rule with with complex conditions</field>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
index 68f4470dc275c..1e413bf3ca5ae 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\SalesRule\Test\TestCase;
 
+use Magento\SalesRule\Test\Block\Adminhtml\Promo\Quote\Edit\Section\ManageCouponCode;
 use Magento\SalesRule\Test\Fixture\SalesRule;
 use Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteEdit;
 use Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteIndex;
@@ -107,7 +108,8 @@ public function testCreateSalesRule(
         CatalogProductSimple $productForSalesRule1,
         CatalogProductSimple $productForSalesRule2 = null,
         Customer $customer = null,
-        $conditionEntity = null
+        $conditionEntity = null,
+        SalesRule $salesRuleEdit = null
     ) {
         $replace = null;
         $this->salesRuleName = $salesRule->getName();
@@ -127,7 +129,22 @@ public function testCreateSalesRule(
         // Steps
         $this->promoQuoteNew->open();
         $this->promoQuoteNew->getSalesRuleForm()->fill($salesRule, null, $replace);
-        $this->promoQuoteNew->getFormPageActions()->save();
+
+        if ($salesRule->getCouponType() == "Auto") {
+            $this->promoQuoteNew->getFormPageActions()->saveAndContinue();
+            $form = $this->promoQuoteEdit->getSalesRuleForm();
+            $form->openSection('manage_coupon_code');
+            /** @var ManageCouponCode $section */
+            $section = $form->getSection('manage_coupon_code');
+            $section->fill($salesRuleEdit);
+            $section->generateCouponCodes();
+            $couponCode = $section->getGeneratedCouponCode();
+            $this->promoQuoteEdit->getFormPageActions()->save();
+
+            return ["couponCode" => $couponCode];
+        } else {
+            $this->promoQuoteNew->getFormPageActions()->save();
+        }
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index 05df20e4025b5..7710bd2dc0f0f 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -424,5 +424,32 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleFreeShippingIsApplied" />
         </variation>
+        <variation name="CreateSalesRuleEntityTestVariation17">
+            <data name="address/data/country_id" xsi:type="string">United States</data>
+            <data name="address/data/region_id" xsi:type="string">California</data>
+            <data name="address/data/postcode" xsi:type="string">95814</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="salesRule/data/name" xsi:type="string">Cart Price Rule2 %isolation%</data>
+            <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
+            <data name="salesRule/data/is_active" xsi:type="string">Yes</data>
+            <data name="salesRule/data/website_ids/0" xsi:type="string">Main Website</data>
+            <data name="salesRule/data/customer_group_ids/0" xsi:type="string">NOT LOGGED IN</data>
+            <data name="salesRule/data/coupon_type" xsi:type="string">Auto</data>
+            <data name="salesRule/data/simple_action" xsi:type="string">Fixed amount discount</data>
+            <data name="salesRule/data/discount_amount" xsi:type="string">35</data>
+            <data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
+            <data name="salesRule/data/simple_free_shipping" xsi:type="string">No</data>
+            <data name="salesRule/data/store_labels/0" xsi:type="string">Coupon code+fixed amount discount</data>
+            <data name="salesRuleEdit/data/qty" xsi:type="string">1</data>
+            <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
+            <data name="productQuantity/productForSalesRule1" xsi:type="string">2</data>
+            <data name="cartPrice/sub_total" xsi:type="string">200.00</data>
+            <data name="cartPrice/grand_total" xsi:type="string">140.00</data>
+            <data name="cartPrice/discount" xsi:type="string">70.00</data>
+            <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleSuccessSaveMessage" />
+            <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleForm" />
+            <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index a01ac8caaf977..158d94d503df2 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -22,6 +22,5 @@
     \Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class =>
         \Magento\TestFramework\Db\ConnectionAdapter::class,
     \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
-    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
-    \Magento\Captcha\Model\DefaultModel::class => \Magento\TestFramework\Captcha\DefaultModel::class,
+    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Captcha/DefaultModel.php b/dev/tests/integration/framework/Magento/TestFramework/Captcha/DefaultModel.php
deleted file mode 100644
index a3620ee3a968a..0000000000000
--- a/dev/tests/integration/framework/Magento/TestFramework/Captcha/DefaultModel.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Captcha;
-
-/**
- * Implementation of \Zend\Captcha\Image for integration test environment.
- *
- * With introducing "zendframework/zend-captcha": "~2.4.6" (see https://github.com/magento/magento2/pull/8356)
- * validation happens in \Zend\Captcha\Image class constructor that blocks testing on Travis CI, even for cases
- * when this functionality is not needed.
- * For test environment that supports freetype functional behaviour should not be changed.
- */
-class DefaultModel extends \Magento\Captcha\Model\DefaultModel
-{
-    /**
-     * Do not pass onto the parent constructor as imageftbbox is not initialized on travis
-     *
-     * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Captcha\Helper\Data $captchaData
-     * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
-     * @param string $formId
-     */
-    public function __construct(
-        \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Captcha\Helper\Data $captchaData,
-        \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory,
-        $formId
-    ) {
-        /**
-         * Workaround for test environments that do not support freetype.
-         */
-        if (function_exists("imageftbbox")) {
-            parent::__construct($session, $captchaData, $resLogFactory, $formId);
-        } else {
-            $this->session = $session;
-            $this->captchaData = $captchaData;
-            $this->resLogFactory = $resLogFactory;
-            $this->formId = $formId;
-        }
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
index fa0b520aa8eef..e50874ccb8304 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -547,7 +547,9 @@ public function cropDataProvider()
      */
     public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
     {
-        if (!function_exists('imagettfbbox')) {
+        if (!function_exists('imagettfbbox')
+            || (getenv('TRAVIS') && getenv('TRAVIS_PHP_VERSION') == '5.6.29')
+        ) {
             $this->markTestSkipped('Workaround for problem with imagettfbbox() function on Travis');
         }
         $adapter = $this->_getAdapter($adapterType);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons.php
index 3062683019b03..36f3365f3de91 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons.php
@@ -27,4 +27,4 @@
 
 // type AUTO
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
-$coupon->setRuleId($items[3]->getId())->setCode('coupon_code_auto')->setType(0)->save();
+$coupon->setRuleId($items[3]->getId())->setCode('coupon_code_auto')->setType(1)->save();
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index 87e2d87a427a2..d8b9628c73b38 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -11,22 +11,27 @@
 class ReservedWordsSniff implements PHP_CodeSniffer_Sniff
 {
     /**
-     * source: http://php.net/manual/en/reserved.other-reserved-words.php
+     * The following words cannot be used to name a class, interface or trait,
+     * and they are also prohibited from being used in namespaces.
      *
-     * @var array PHP 7 reserved words for name spaces
+     * @link http://php.net/manual/en/reserved.other-reserved-words.php
+     *
+     * @var string[]
      */
     protected $reservedWords = [
-        'int',
-        'float',
-        'bool',
-        'string',
-        'true',
-        'false',
-        'null',
-        'resource',
-        'object',
-        'mixed',
-        'numeric',
+        'int' => '7',
+        'float' => '7',
+        'bool' => '7',
+        'string' => '7',
+        'true' => '7',
+        'false' => '7',
+        'null' => '7',
+        'void' => '7.1',
+        'iterable' => '7.1',
+        'resource' => '7',
+        'object' => '7',
+        'mixed' => '7',
+        'numeric' => '7',
     ];
 
     /**
@@ -34,7 +39,7 @@ class ReservedWordsSniff implements PHP_CodeSniffer_Sniff
      */
     public function register()
     {
-        return [T_NAMESPACE, T_CLASS];
+        return [T_CLASS, T_INTERFACE, T_TRAIT, T_NAMESPACE];
     }
 
     /**
@@ -44,20 +49,23 @@ public function register()
      * @param int $stackPtr
      * @return void
      */
-    protected function validateNameSpace(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    protected function validateNamespace(PHP_CodeSniffer_File $sourceFile, $stackPtr)
     {
-        $skippedTokens = ['T_NS_SEPARATOR', 'T_WHITESPACE'];
-        //skip "namespace" and whitespace
         $stackPtr += 2;
         $tokens = $sourceFile->getTokens();
-        while ('T_SEMICOLON' != $tokens[$stackPtr]['type']) {
-            if (in_array($tokens[$stackPtr]['type'], $skippedTokens)) {
-                $stackPtr++;
+        while ($stackPtr < $sourceFile->numTokens && $tokens[$stackPtr]['code'] !== T_SEMICOLON) {
+            if ($tokens[$stackPtr]['code'] === T_WHITESPACE || $tokens[$stackPtr]['code'] === T_NS_SEPARATOR) {
+                $stackPtr++; //skip "namespace" and whitespace
                 continue;
             }
-            $nameSpacePart = strtolower($tokens[$stackPtr]['content']);
-            if (in_array($nameSpacePart, $this->reservedWords)) {
-                $sourceFile->addError('\'' . $nameSpacePart . '\' is a reserved word in PHP 7.', $stackPtr);
+            $namespacePart = $tokens[$stackPtr]['content'];
+            if (isset($this->reservedWords[strtolower($namespacePart)])) {
+                $sourceFile->addError(
+                    'Cannot use "%s" in namespace as it is reserved since PHP %s',
+                    $stackPtr,
+                    'Namespace',
+                    [$namespacePart, $this->reservedWords[$namespacePart]]
+                );
             }
             $stackPtr++;
         }
@@ -73,12 +81,15 @@ protected function validateNameSpace(PHP_CodeSniffer_File $sourceFile, $stackPtr
     protected function validateClass(PHP_CodeSniffer_File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
-        //skipped "class" and whitespace
-        $stackPtr += 2;
+        $stackPtr += 2; //skip "class" and whitespace
         $className = strtolower($tokens[$stackPtr]['content']);
-
-        if (in_array($className, $this->reservedWords)) {
-            $sourceFile->addError('Class name \'' . $className . '\' is a reserved word in PHP 7', $stackPtr);
+        if (isset($this->reservedWords[$className])) {
+            $sourceFile->addError(
+                'Cannot use "%s" as class name as it is reserved since PHP %s',
+                $stackPtr,
+                'Class',
+                [$className, $this->reservedWords[$className]]
+            );
         }
     }
 
@@ -88,12 +99,14 @@ protected function validateClass(PHP_CodeSniffer_File $sourceFile, $stackPtr)
     public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
-        switch ($tokens[$stackPtr]['type']) {
-            case "T_CLASS":
+        switch ($tokens[$stackPtr]['code']) {
+            case T_CLASS:
+            case T_INTERFACE:
+            case T_TRAIT:
                 $this->validateClass($sourceFile, $stackPtr);
                 break;
-            case "T_NAMESPACE":
-                $this->validateNameSpace($sourceFile, $stackPtr);
+            case T_NAMESPACE:
+                $this->validateNamespace($sourceFile, $stackPtr);
                 break;
         }
     }
diff --git a/lib/internal/Magento/Framework/App/Router/ActionList.php b/lib/internal/Magento/Framework/App/Router/ActionList.php
index f0fa6fc0adfcd..a6dc2d65ed06b 100644
--- a/lib/internal/Magento/Framework/App/Router/ActionList.php
+++ b/lib/internal/Magento/Framework/App/Router/ActionList.php
@@ -34,7 +34,7 @@ class ActionList
         'for', 'foreach', 'function', 'global', 'goto', 'if', 'implements', 'include', 'instanceof',
         'insteadof','interface', 'isset', 'list', 'namespace', 'new', 'or', 'print', 'private', 'protected',
         'public', 'require', 'return', 'static', 'switch', 'throw', 'trait', 'try', 'unset', 'use', 'var',
-        'while', 'xor',
+        'while', 'xor', 'void',
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
index 4235eeb7a65e9..76e46d72d5c9c 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIterator.php
@@ -11,7 +11,7 @@
 /**
  * Query batch iterator
  */
-class BatchIterator implements \Iterator
+class BatchIterator implements BatchIteratorInterface
 {
     /**
      * @var int
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php b/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
index 147e65b8df466..563439bfb13e9 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIteratorFactory.php
@@ -42,7 +42,7 @@ public function __construct(
      * Create class instance with specified parameters
      *
      * @param array $data
-     * @return \Magento\Framework\DB\Query\BatchIterator
+     * @return \Magento\Framework\DB\Query\BatchIteratorInterface
      */
     public function create(array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php b/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php
new file mode 100644
index 0000000000000..067b4e76a91c3
--- /dev/null
+++ b/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\DB\Query;
+
+/**
+ * Batch Iterator interface
+ */
+interface BatchIteratorInterface extends \Iterator
+{
+    /**
+     * Constant which determine strategy to create iterator which will to process
+     * range field eg. entity_id with unique values.
+     */
+    const UNIQUE_FIELD_ITERATOR = "unique";
+
+    /**
+     * Constant which determine strategy to create iterator which will to process
+     * range field with non-unique values.
+     */
+    const NON_UNIQUE_FIELD_ITERATOR = "non_unqiue";
+
+    /**
+     * Return the current element
+     *
+     * If we don't have sub-select we should create and remember it.
+     *
+     * @return \Magento\Framework\DB\Select
+     */
+    public function current();
+
+    /**
+     * Return the key of the current element
+     *
+     * Сan return the number of the current sub-select in the iteration.
+     *
+     * @return int
+     */
+    public function key();
+
+    /**
+     * Move forward to next sub-select
+     *
+     * Retrieve the next sub-select and move cursor to the next element.
+     * Checks that the count of elements more than the sum of limit and offset.
+     *
+     * @return \Magento\Framework\DB\Select
+     */
+    public function next();
+
+    /**
+     * Rewind the BatchRangeIterator to the first element.
+     *
+     * Allows to start iteration from the beginning.
+     *
+     * @return void
+     */
+    public function rewind();
+
+    /**
+     * Checks if current position is valid
+     *
+     * @return bool
+     */
+    public function valid();
+}
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
new file mode 100644
index 0000000000000..b5573c9e29377
--- /dev/null
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\DB\Query;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+
+/**
+ * Query batch range iterator
+ *
+ * It is uses to processing selects which will obtain values from  $rangeField with relation one-to-many
+ * This iterator make chunks with operator LIMIT...OFFSET,
+ * starting with zero offset and finishing on OFFSET + LIMIT = TOTAL_COUNT
+ *
+ * @see \Magento\Framework\DB\Query\Generator
+ * @see \Magento\Framework\DB\Query\BatchIteratorFactory
+ * @see \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
+ * @see \Magento\Framework\DB\Adapter\Pdo\Mysql
+ */
+class BatchRangeIterator implements BatchIteratorInterface
+{
+    /**
+     * @var Select
+     */
+    private $currentSelect;
+
+    /**
+     * @var string
+     */
+    private $rangeField;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var int
+     */
+    private $currentBatch = 0;
+
+    /**
+     * @var int
+     */
+    private $totalItemCount;
+
+    /**
+     * @var int
+     */
+    private $iteration = 0;
+
+    /**
+     * @var Select
+     */
+    private $select;
+
+    /**
+     * @var string
+     */
+    private $correlationName;
+
+    /**
+     * @var bool
+     */
+    private $isValid = true;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Select $select
+     * @param int $batchSize
+     * @param string $correlationName
+     * @param string $rangeField
+     * @param string $rangeFieldAlias
+     */
+    public function __construct(
+        Select $select,
+        $batchSize,
+        $correlationName,
+        $rangeField,
+        $rangeFieldAlias
+    ) {
+        $this->batchSize = $batchSize;
+        $this->select = $select;
+        $this->correlationName = $correlationName;
+        $this->rangeField = $rangeField;
+        $this->rangeFieldAlias = $rangeFieldAlias;
+        $this->connection = $select->getConnection();
+    }
+
+    /**
+     * Return the current element
+     *
+     * If we don't have sub-select we should create and remember it.
+     *
+     * @return Select
+     */
+    public function current()
+    {
+        if (null === $this->currentSelect) {
+            $this->isValid = ($this->currentBatch + $this->batchSize) < $this->totalItemCount;
+            $this->currentSelect = $this->initSelectObject();
+        }
+        return $this->currentSelect;
+    }
+
+    /**
+     * Return the key of the current element
+     *
+     * Сan return the number of the current sub-select in the iteration.
+     *
+     * @return int
+     */
+    public function key()
+    {
+        return $this->iteration;
+    }
+
+    /**
+     * Move forward to next sub-select
+     *
+     * Retrieve the next sub-select and move cursor to the next element.
+     * Checks that the count of elements more than the sum of limit and offset.
+     *
+     * @return Select
+     */
+    public function next()
+    {
+        if (null === $this->currentSelect) {
+            $this->current();
+        }
+        $this->isValid = ($this->batchSize + $this->currentBatch) < $this->totalItemCount;
+        $select = $this->initSelectObject();
+        if ($this->isValid) {
+            $this->iteration++;
+            $this->currentSelect = $select;
+        } else {
+            $this->currentSelect = null;
+        }
+        return $this->currentSelect;
+    }
+
+    /**
+     * Rewind the BatchRangeIterator to the first element.
+     *
+     * Allows to start iteration from the beginning.
+     *
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->currentSelect = null;
+        $this->iteration = 0;
+        $this->isValid = true;
+        $this->totalItemCount = 0;
+    }
+
+    /**
+     * Checks if current position is valid
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        return $this->isValid;
+    }
+
+    /**
+     * Initialize select object
+     *
+     * Return sub-select which is limited by current batch value and return items from n page of SQL request.
+     *
+     * @return \Magento\Framework\DB\Select
+     */
+    private function initSelectObject()
+    {
+        $object = clone $this->select;
+
+        if (!$this->totalItemCount) {
+            $wrapperSelect = $this->connection->select();
+            $wrapperSelect->from(
+                $object,
+                [
+                    new \Zend_Db_Expr('COUNT(*) as cnt')
+                ]
+            );
+            $row = $this->connection->fetchRow($wrapperSelect);
+
+            $this->totalItemCount = intval($row['cnt']);
+        }
+        /**
+         * Reset sort order section from origin select object
+         */
+        $object->order($this->correlationName . '.' . $this->rangeField . ' ' . \Magento\Framework\DB\Select::SQL_ASC);
+        $object->limit($this->currentBatch, $this->batchSize);
+        $this->currentBatch += $this->batchSize;
+
+        return $object;
+    }
+}
diff --git a/lib/internal/Magento/Framework/DB/Query/Generator.php b/lib/internal/Magento/Framework/DB/Query/Generator.php
index 909f4752397a3..4e3da17e21908 100644
--- a/lib/internal/Magento/Framework/DB/Query/Generator.php
+++ b/lib/internal/Magento/Framework/DB/Query/Generator.php
@@ -17,27 +17,61 @@ class Generator
      */
     private $iteratorFactory;
 
+    /**
+     * @var \Magento\Framework\DB\Query\BatchRangeIteratorFactory
+     */
+    private $rangeIteratorFactory;
+
     /**
      * Initialize dependencies.
      *
      * @param BatchIteratorFactory $iteratorFactory
+     * @param BatchRangeIteratorFactory $rangeIteratorFactory
      */
-    public function __construct(BatchIteratorFactory $iteratorFactory)
-    {
+    public function __construct(
+        BatchIteratorFactory $iteratorFactory,
+        BatchRangeIteratorFactory $rangeIteratorFactory = null
+    ) {
         $this->iteratorFactory = $iteratorFactory;
+        $this->rangeIteratorFactory = $rangeIteratorFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\DB\Query\BatchRangeIteratorFactory::class);
     }
 
     /**
-     * Generate select query list with predefined items count in each select item.
+     * Generate select query list with predefined items count in each select item
      *
-     * @param string $rangeField
+     * Generates select parameters - batchSize, correlationName, rangeField, rangeFieldAlias
+     * to obtain instance of iterator. The behavior of the iterator will depend on the parameters passed to it.
+     * For example: by default for $batchStrategy parameter used
+     * \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR. This parameter is determine, what
+     * instance of Iterator will be returned.
+     *
+     * Other params:
+     * select - represents the select object, that should be passed into Iterator.
+     * batchSize - sets the number of items in select.
+     * correlationName - is the base table involved in the select.
+     * rangeField - this is the basic field which used to split select.
+     * rangeFieldAlias - alias of range field.
+     *
+     * @see \Magento\Framework\DB\Query\BatchIteratorInterface
+     * @param string $rangeField -  Field which is used for the range mechanism in select
      * @param \Magento\Framework\DB\Select $select
-     * @param int $batchSize
-     * @return BatchIterator
-     * @throws LocalizedException
+     * @param int $batchSize - Determines on how many parts will be divided
+     * the number of values in the select.
+     * @param string $batchStrategy It determines which strategy is chosen
+     * @return BatchIteratorInterface
+     * @throws LocalizedException Throws if incorrect "FROM" part in \Select exists
      */
-    public function generate($rangeField, \Magento\Framework\DB\Select $select, $batchSize = 100)
-    {
+    public function generate(
+        $rangeField,
+        \Magento\Framework\DB\Select $select,
+        $batchSize = 100,
+        $batchStrategy = \Magento\Framework\DB\Query\BatchIteratorInterface::UNIQUE_FIELD_ITERATOR
+    ) {
+        if ($batchStrategy == \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR) {
+            return $this->generateByRange($rangeField, $select, $batchSize);
+        }
+
         $fromSelect = $select->getPart(\Magento\Framework\DB\Select::FROM);
         if (empty($fromSelect)) {
             throw new LocalizedException(
@@ -76,4 +110,72 @@ public function generate($rangeField, \Magento\Framework\DB\Select $select, $bat
             ]
         );
     }
+
+    /**
+     * Generate select query list with predefined items count in each select item.
+     *
+     * Generates select parameters - batchSize, correlationName, rangeField, rangeFieldAlias
+     * to obtain instance of BatchRangeIterator.
+     *
+     * Other params:
+     * select - represents the select object, that should be passed into Iterator.
+     * batchSize - sets the number of items in select.
+     * correlationName - is the base table involved in the select.
+     * rangeField - this is the basic field which used to split select.
+     * rangeFieldAlias - alias of range field.
+     *
+     * @see BatchRangeIterator
+     * @param string $rangeField -  Field which is used for the range mechanism in select
+     * @param \Magento\Framework\DB\Select $select
+     * @param int $batchSize
+     * @return BatchIteratorInterface
+     * @throws LocalizedException Throws if incorrect "FROM" part in \Select exists
+     * @see \Magento\Framework\DB\Query\Generator
+     * @deprecated This is a temporary solution which is made due to the fact that we
+     *             can't change method generate() in version 2.1 due to a backwards incompatibility.
+     *             In 2.2 version need to use original method generate() with additional parameter.
+     */
+    public function generateByRange(
+        $rangeField,
+        \Magento\Framework\DB\Select $select,
+        $batchSize = 100
+    ) {
+        $fromSelect = $select->getPart(\Magento\Framework\DB\Select::FROM);
+        if (empty($fromSelect)) {
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase('Select object must have correct "FROM" part')
+            );
+        }
+
+        $fieldCorrelationName = '';
+        foreach ($fromSelect as $correlationName => $fromPart) {
+            if ($fromPart['joinType'] == \Magento\Framework\DB\Select::FROM) {
+                $fieldCorrelationName = $correlationName;
+                break;
+            }
+        }
+
+        $columns = $select->getPart(\Magento\Framework\DB\Select::COLUMNS);
+        /**
+         * Calculate $rangeField alias
+         */
+        $rangeFieldAlias = $rangeField;
+        foreach ($columns as $column) {
+            list($table, $columnName, $alias) = $column;
+            if ($table == $fieldCorrelationName && $columnName == $rangeField) {
+                $rangeFieldAlias = $alias ?: $rangeField;
+                break;
+            }
+        }
+
+        return $this->rangeIteratorFactory->create(
+            [
+                'select' => $select,
+                'batchSize' => $batchSize,
+                'correlationName' => $fieldCorrelationName,
+                'rangeField' => $rangeField,
+                'rangeFieldAlias' => $rangeFieldAlias,
+            ]
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
new file mode 100644
index 0000000000000..aeb4ed97b4853
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\DB\Query;
+
+use Magento\Framework\DB\Query\BatchRangeIterator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+class BatchRangeIteratorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var BatchRangeIterator
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $wrapperSelectMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @var string
+     */
+    private $correlationName;
+
+    /**
+     * @var string
+     */
+    private $rangeField;
+
+    /**
+     * @var string
+     */
+    private $rangeFieldAlias;
+
+    /**
+     * @var int
+     */
+    private $currentBatch = 0;
+
+    /**
+     * Setup test dependencies.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->batchSize = 10;
+        $this->currentBatch = 0;
+        $this->correlationName = 'correlationName';
+        $this->rangeField = 'rangeField';
+        $this->rangeFieldAlias = 'rangeFieldAlias';
+
+        $this->selectMock = $this->getMock(Select::class, [], [], '', false, false);
+        $this->wrapperSelectMock = $this->getMock(Select::class, [], [], '', false, false);
+        $this->connectionMock = $this->getMock(AdapterInterface::class);
+        $this->connectionMock->expects($this->any())->method('select')->willReturn($this->wrapperSelectMock);
+        $this->selectMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->any())->method('quoteIdentifier')->willReturnArgument(0);
+
+        $this->model = new BatchRangeIterator(
+            $this->selectMock,
+            $this->batchSize,
+            $this->correlationName,
+            $this->rangeField,
+            $this->rangeFieldAlias
+        );
+    }
+
+    /**
+     * Test steps:
+     * 1. $iterator->current();
+     * 2. $iterator->key();
+     * @return void
+     */
+    public function testCurrent()
+    {
+        $this->selectMock->expects($this->once())->method('limit')->with($this->currentBatch, $this->batchSize);
+        $this->selectMock->expects($this->once())->method('order')->with('correlationName.rangeField' . ' ASC');
+        $this->assertEquals($this->selectMock, $this->model->current());
+        $this->assertEquals(0, $this->model->key());
+    }
+
+    /**
+     * Test the separation of batches
+     */
+    public function testIterations()
+    {
+        $iterations = 0;
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchRow')
+            ->willReturn(['cnt' => 105]);
+
+        foreach ($this->model as $key) {
+            $this->assertEquals($this->selectMock, $key);
+            $iterations++;
+        };
+
+        $this->assertEquals(10, $iterations);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
index fcfaa41ffb4e6..28e06506f66ce 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/GeneratorTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\Query\BatchIteratorFactory;
+use Magento\Framework\DB\Query\BatchRangeIteratorFactory;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Query\BatchIterator;
 
@@ -32,15 +33,21 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
      */
     private $iteratorMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $rangeFactoryMock;
+
     /**
      * Setup test dependencies.
      */
     protected function setUp()
     {
         $this->factoryMock = $this->getMock(BatchIteratorFactory::class, [], [], '', false, false);
+        $this->rangeFactoryMock = $this->getMock(BatchRangeIteratorFactory::class, ['create'], [], '', false, false);
         $this->selectMock = $this->getMock(Select::class, [], [], '', false, false);
         $this->iteratorMock = $this->getMock(BatchIterator::class, [], [], '', false, false);
-        $this->model = new Generator($this->factoryMock);
+        $this->model = new Generator($this->factoryMock, $this->rangeFactoryMock);
     }
 
     /**
@@ -165,4 +172,40 @@ public function testGenerateWithInvalidWithWildcard()
         )->willReturn($this->iteratorMock);
         $this->assertEquals($this->iteratorMock, $this->model->generate('entity_id', $this->selectMock, 100));
     }
+
+    /**
+     * Test success generate with non-unique strategy.
+     * @return void
+     */
+    public function testGenerateWithNonUniqueStrategy()
+    {
+        $map = [
+            [
+                Select::FROM,
+                [
+                    'cp' => ['joinType' => Select::FROM]
+                ]
+            ],
+            [
+                Select::COLUMNS,
+                [
+                    ['cp', 'entity_id', 'product_id']
+                ]
+            ]
+        ];
+        $this->selectMock->expects($this->exactly(2))->method('getPart')->willReturnMap($map);
+        $this->factoryMock->expects($this->once())->method('create')->with(
+            [
+                'select' => $this->selectMock,
+                'batchSize' => 100,
+                'correlationName' => 'cp',
+                'rangeField' => 'entity_id',
+                'rangeFieldAlias' => 'product_id'
+            ]
+        )->willReturn($this->iteratorMock);
+        $this->assertEquals(
+            $this->iteratorMock,
+            $this->model->generate('entity_id', $this->selectMock, 100, 'non_unique')
+        );
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobSetCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobSetCacheTest.php
index 76b755e4c466d..2d7b2d3649262 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobSetCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobSetCacheTest.php
@@ -10,17 +10,21 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class JobSetCacheTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider setCacheDataProvider
      * @param string $commandClass
-     * @param string $arrayInput
+     * @param array $arrayInput
      * @param string $jobName
      * @param array $params
      */
     public function testSetCache($commandClass, $arrayInput, $jobName, $params)
     {
+        $arrayInput = new ArrayInput($arrayInput);
         $objectManagerProvider = $this->getMock(\Magento\Setup\Model\ObjectManagerProvider::class, [], [], '', false);
         $objectManager =
             $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class, [], '', false);
@@ -62,18 +66,16 @@ public function testSetCache($commandClass, $arrayInput, $jobName, $params)
      */
     public function setCacheDataProvider()
     {
-        $cacheEnable = new ArrayInput(['command' => 'cache:enable', 'types' => ['cache1']]);
-        $cacheDisable = new ArrayInput(['command' => 'cache:disable']);
         return [
             [
                 \Magento\Backend\Console\Command\CacheEnableCommand::class,
-                $cacheEnable,
+                ['command' => 'cache:enable', 'types' => ['cache1']],
                 'setup:cache:enable',
                 ['cache1']
             ],
             [
                 \Magento\Backend\Console\Command\CacheDisableCommand::class,
-                $cacheDisable,
+                ['command' => 'cache:disable'],
                 'setup:cache:disable',
                 []
             ],
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Writer/Csv/StdoTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Writer/Csv/StdoTest.php
index ddbe9116de13f..6fd93afd27883 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Writer/Csv/StdoTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Dictionary/Writer/Csv/StdoTest.php
@@ -5,25 +5,15 @@
  */
 namespace Magento\Setup\Test\Unit\Module\I18n\Dictionary\Writer\Csv;
 
+use Magento\Setup\Module\I18n\Dictionary\Writer\Csv\Stdo;
+
 class StdoTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var resource
-     */
-    protected $_handler;
-
-    protected function setUp()
-    {
-        $this->_handler = STDOUT;
-    }
-
     public function testThatHandlerIsRight()
     {
-        $this->markTestSkipped('This is skiped as we should not close the STDO!');
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        /** @var \Magento\Setup\Module\I18n\Dictionary\Writer\Csv $writer */
-        $writer = $objectManagerHelper->getObject(\Magento\Setup\Module\I18n\Dictionary\Writer\Csv\Stdo::class);
-
-        $this->assertAttributeEquals($this->_handler, '_fileHandler', $writer);
+        $handler = STDOUT;
+        // Mocking object's under test destructor here is perfectly valid as there is no way to reopen STDOUT
+        $writer = $this->getMock(Stdo::class, ['__destruct']);
+        $this->assertAttributeEquals($handler, '_fileHandler', $writer);
     }
 }