diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 6bd6e5e1209bf..5c2fbabbaf297 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -124,7 +124,7 @@ public function getValue()
                 $value = $product->getData('final_price') * ($selectionPriceValue / 100);
             } else {
                 // calculate price for selection type fixed
-                $value = $this->priceCurrency->convert($selectionPriceValue) * $this->quantity;
+                $value = $this->priceCurrency->convert($selectionPriceValue);
             }
         }
         if (!$this->useRegularPrice) {
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
index 5345cd4b424b1..5b14e59fd9084 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
@@ -66,18 +66,13 @@ class BundleSelectionPriceTest extends \PHPUnit_Framework_TestCase
      */
     protected $priceCurrencyMock;
 
-    /**
-     * @var float
-     */
-    protected $quantity;
-
     /**
      * Test setUp
      */
     protected function setUp()
     {
         $this->productMock = $this->getMock(
-            'Magento\Catalog\Model\Product',
+            \Magento\Catalog\Model\Product::class,
             ['__wakeup', 'getPriceInfo', 'getSelectionPriceType', 'getSelectionPriceValue'],
             [],
             '',
@@ -85,44 +80,44 @@ protected function setUp()
         );
 
         $this->bundleMock = $this->getMock(
-            'Magento\Catalog\Model\Product',
+            \Magento\Catalog\Model\Product::class,
             ['__wakeup', 'getPriceType', 'getPriceInfo', 'setFinalPrice', 'getData'],
             [],
             '',
             false
         );
-        $this->calculatorMock = $this->getMockBuilder('Magento\Framework\Pricing\Adjustment\CalculatorInterface')
+        $this->calculatorMock = $this->getMockBuilder(\Magento\Framework\Pricing\Adjustment\CalculatorInterface::class)
             ->getMockForAbstractClass();
         $this->eventManagerMock = $this->getMock(
-            'Magento\Framework\Event\Manager',
+            \Magento\Framework\Event\Manager::class,
             ['dispatch'],
             [],
             '',
             false
         );
         $this->priceInfoMock = $this->getMock(
-            'Magento\Framework\Pricing\PriceInfo\Base',
+            \Magento\Framework\Pricing\PriceInfo\Base::class,
             ['getPrice'],
             [],
             '',
             false
         );
         $this->discountCalculatorMock = $this->getMock(
-            'Magento\Bundle\Pricing\Price\DiscountCalculator',
+            \Magento\Bundle\Pricing\Price\DiscountCalculator::class,
             [],
             [],
             '',
             false
         );
         $this->finalPriceMock = $this->getMock(
-            'Magento\Catalog\Pricing\Price\FinalPrice',
+            \Magento\Catalog\Pricing\Price\FinalPrice::class,
             [],
             [],
             '',
             false
         );
         $this->regularPriceMock = $this->getMock(
-            'Magento\Catalog\Pricing\Price\RegularPrice',
+            \Magento\Catalog\Pricing\Price\RegularPrice::class,
             [],
             [],
             '',
@@ -132,18 +127,16 @@ protected function setUp()
             ->method('getPriceInfo')
             ->will($this->returnValue($this->priceInfoMock));
 
-        $this->priceCurrencyMock = $this->getMock('\Magento\Framework\Pricing\PriceCurrencyInterface');
-
-        $this->quantity = 1;
+        $this->priceCurrencyMock = $this->getMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
 
         $this->setupSelectionPrice();
     }
 
-    protected function setupSelectionPrice($useRegularPrice = false)
+    protected function setupSelectionPrice($useRegularPrice = false, $qty = 1)
     {
         $this->selectionPrice = new \Magento\Bundle\Pricing\Price\BundleSelectionPrice(
             $this->productMock,
-            $this->quantity,
+            $qty,
             $this->calculatorMock,
             $this->priceCurrencyMock,
             $this->bundleMock,
@@ -313,6 +306,58 @@ public function testGetValueTypeFixedWithoutSelectionPriceType($useRegularPrice)
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
 
+    /**
+     * Test for method getValue with type Fixed and selectionPriceType is empty or zero.
+     *
+     * @param bool $useRegularPrice
+     * @return void
+     *
+     * @dataProvider useRegularPriceDataProvider
+     */
+    public function testFixedPriceWithMultipleQty($useRegularPrice)
+    {
+        $qty = 2;
+
+        $this->setupSelectionPrice($useRegularPrice, $qty);
+        $regularPrice = 100.125;
+        $discountedPrice = 70.453;
+        $convertedValue = 100.247;
+        $actualPrice = $useRegularPrice ? $convertedValue : $discountedPrice;
+        $expectedPrice = $useRegularPrice ? round($convertedValue, 2) : round($discountedPrice, 2);
+
+        $this->bundleMock->expects($this->once())
+            ->method('getPriceType')
+            ->will($this->returnValue(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED));
+        $this->productMock->expects($this->once())
+            ->method('getSelectionPriceType')
+            ->will($this->returnValue(false));
+        $this->productMock->expects($this->any())
+            ->method('getSelectionPriceValue')
+            ->will($this->returnValue($regularPrice));
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('convert')
+            ->with($regularPrice)
+            ->will($this->returnValue($convertedValue));
+
+        if (!$useRegularPrice) {
+            $this->discountCalculatorMock->expects($this->once())
+                ->method('calculateDiscount')
+                ->with(
+                    $this->equalTo($this->bundleMock),
+                    $this->equalTo($convertedValue)
+                )
+                ->will($this->returnValue($discountedPrice));
+        }
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($actualPrice)
+            ->will($this->returnValue($expectedPrice));
+
+        $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
+    }
+
     public function useRegularPriceDataProvider()
     {
         return [
diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index 5b8b18cfffe5c..f2103416b7a92 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -55,7 +55,6 @@ define([
                 this._setOption('priceFormat', priceBox.priceBox('option').priceConfig.priceFormat);
                 priceBox.priceBox('setDefault', this.options.optionConfig.prices);
             }
-            this._applyQtyFix();
             this._applyOptionNodeFix(options);
 
             options.on('change', this._onBundleOptionChanged.bind(this));
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
index c2fc471a4b6f4..91e73ea6e4189 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
@@ -41,7 +41,6 @@ public function __construct(
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->request = $request;
         $this->collection = $collectionFactory->create();
-        $this->collection->setExcludeSetFilter((int)$this->request->getParam('template_id', 0));
     }
 
     /**
@@ -49,6 +48,9 @@ public function __construct(
      */
     public function getData()
     {
+        $this->collection->setExcludeSetFilter((int)$this->request->getParam('template_id', 0));
+        $this->collection->getSelect()->setPart('order', []);
+
         $items = [];
         foreach ($this->getCollection()->getItems() as $attribute) {
             $items[] = $attribute->toArray();
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index bdc73b8fb22f7..a6abc09a8ff77 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1418,7 +1418,7 @@ protected function initMediaGalleryResources()
     }
 
     /**
-     * Get existing images for current bucnh
+     * Get existing images for current bunch.
      *
      * @param array $bunch
      * @return array
@@ -1438,7 +1438,21 @@ protected function getExistingImages($bunch)
         )->joinInner(
             ['mgvte' => $this->mediaGalleryEntityToValueTableName],
             '(mg.value_id = mgvte.value_id)',
-            [$this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField()]
+            [
+                $this->getProductEntityLinkField() => 'mgvte.' . $this->getProductEntityLinkField(),
+                'value_id' => 'mgvte.value_id',
+            ]
+        )->joinLeft(
+            ['mgv' => $this->mediaGalleryValueTableName],
+            sprintf(
+                '(mg.value_id = mgv.value_id AND mgv.%s = mgvte.%s AND mgv.store_id = %d)',
+                $this->getProductEntityLinkField(),
+                $this->getProductEntityLinkField(),
+                \Magento\Store\Model\Store::DEFAULT_STORE_ID
+            ),
+            [
+                'label' => 'mgv.label',
+            ]
         )->joinInner(
             ['pe' => $this->productEntityTableName],
             "(mgvte.{$this->getProductEntityLinkField()} = pe.{$this->getProductEntityLinkField()})",
@@ -1449,7 +1463,7 @@ protected function getExistingImages($bunch)
         );
 
         foreach ($this->_connection->fetchAll($select) as $image) {
-            $result[$image['sku']][$image['value']] = true;
+            $result[$image['sku']][$image['value']] = $image;
         }
 
         return $result;
@@ -1464,22 +1478,21 @@ public function getImagesFromRow(array $rowData)
         $images = [];
         $labels = [];
         foreach ($this->_imagesArrayKeys as $column) {
-            $images[$column] = [];
-            $labels[$column] = [];
             if (!empty($rowData[$column])) {
                 $images[$column] = array_unique(
-                    explode($this->getMultipleValueSeparator(), $rowData[$column])
+                    array_map(
+                        'trim',
+                        explode($this->getMultipleValueSeparator(), $rowData[$column])
+                    )
                 );
-            }
 
-            if (!empty($rowData[$column . '_label'])) {
-                $labels[$column] = explode($this->getMultipleValueSeparator(), $rowData[$column . '_label']);
-            }
+                if (!empty($rowData[$column . '_label'])) {
+                    $labels[$column] = $this->parseMultipleValues($rowData[$column . '_label']);
 
-            if (count($labels[$column]) > count($images[$column])) {
-                $labels[$column] = array_slice($labels[$column], 0, count($images[$column]));
-            } elseif (count($labels[$column]) < count($images[$column])) {
-                $labels[$column] = array_pad($labels[$column], count($images[$column]), '');
+                    if (count($labels[$column]) > count($images[$column])) {
+                        $labels[$column] = array_slice($labels[$column], 0, count($images[$column]));
+                    }
+                }
             }
         }
 
@@ -1509,6 +1522,7 @@ protected function _saveProducts()
             $this->categoriesCache = [];
             $tierPrices = [];
             $mediaGallery = [];
+            $labelsForUpdate = [];
             $uploadedImages = [];
             $previousType = null;
             $prevAttributeSet = null;
@@ -1624,7 +1638,7 @@ protected function _saveProducts()
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
                         if (!isset($uploadedImages[$columnImage])) {
-                            $uploadedFile = $this->uploadMediaFiles(trim($columnImage), true);
+                            $uploadedFile = $this->uploadMediaFiles($columnImage, true);
                             if ($uploadedFile) {
                                 $uploadedImages[$columnImage] = $uploadedFile;
                             } else {
@@ -1644,22 +1658,30 @@ protected function _saveProducts()
                             $rowData[$column] = $uploadedFile;
                         }
 
-                        $imageNotAssigned = !isset($existingImages[$rowSku][$uploadedFile]);
-
-                        if ($uploadedFile && $imageNotAssigned) {
-                            if ($column == self::COL_MEDIA_IMAGE) {
-                                $rowData[$column][] = $uploadedFile;
+                        if ($uploadedFile && !isset($mediaGallery[$rowSku][$uploadedFile])) {
+                            if (isset($existingImages[$rowSku][$uploadedFile])) {
+                                if (isset($rowLabels[$column][$columnImageKey])
+                                    && $rowLabels[$column][$columnImageKey] 
+                                    != $existingImages[$rowSku][$uploadedFile]['label']
+                                ) {
+                                    $labelsForUpdate[] = [
+                                        'label' => $rowLabels[$column][$columnImageKey],
+                                        'imageData' => $existingImages[$rowSku][$uploadedFile]
+                                    ];
+                                }
+                            } else {
+                                if ($column == self::COL_MEDIA_IMAGE) {
+                                    $rowData[$column][] = $uploadedFile;
+                                }
+                                $mediaGallery[$rowSku][$uploadedFile] = [
+                                    'attribute_id' => $this->getMediaGalleryAttributeId(),
+                                    'label' => isset($rowLabels[$column][$columnImageKey]) 
+                                        ? $rowLabels[$column][$columnImageKey] : '',
+                                    'position' => ++$position,
+                                    'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
+                                    'value' => $uploadedFile,
+                                ];
                             }
-                            $label = isset($rowLabels[$column][$columnImageKey]) ?
-                                $rowLabels[$column][$columnImageKey] : '';
-                            $mediaGallery[$rowSku][] = [
-                                'attribute_id' => $this->getMediaGalleryAttributeId(),
-                                'label' => $label,
-                                'position' => ++$position,
-                                'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
-                                'value' => $uploadedFile,
-                            ];
-                            $existingImages[$rowSku][$uploadedFile] = true;
                         }
                     }
                 }
@@ -1777,6 +1799,8 @@ protected function _saveProducts()
                 $mediaGallery
             )->_saveProductAttributes(
                 $attributes
+            )->updateMediaGalleryLabels(
+                $labelsForUpdate
             );
 
             $this->_eventManager->dispatch(
@@ -2263,9 +2287,7 @@ public function validateRow(array $rowData, $rowNum)
         $this->_processedEntitiesCount++;
 
         $sku = $rowData[self::COL_SKU];
-
-        $isNewProduct = !isset($this->_oldSku[$sku]) || (Import::BEHAVIOR_REPLACE == $this->getBehavior());
-        if (!$isNewProduct) {
+        if (isset($this->_oldSku[$sku]) && Import::BEHAVIOR_REPLACE !== $this->getBehavior()) {
             // can we get all necessary data from existent DB product?
             // check for supported type of existing product
             if (isset($this->_productTypeModels[$this->_oldSku[$sku]['type_id']])) {
@@ -2315,7 +2337,7 @@ public function validateRow(array $rowData, $rowNum)
             $rowAttributesValid = $this->_productTypeModels[$newSku['type_id']]->isRowValid(
                 $rowData,
                 $rowNum,
-                $isNewProduct
+                !(isset($this->_oldSku[$sku]) && Import::BEHAVIOR_REPLACE !== $this->getBehavior())
             );
             if (!$rowAttributesValid && self::SCOPE_DEFAULT == $rowScope) {
                 // mark SCOPE_DEFAULT row as invalid for future child rows if product not in DB already
@@ -2484,18 +2506,20 @@ private function parseAttributesWithWrappedValues($attributesData)
      * Parse values of multiselect attributes depends on "Fields Enclosure" parameter
      *
      * @param string $values
+     * @param string $delimiter
      * @return array
      */
-    public function parseMultiselectValues($values)
+    public function parseMultiselectValues($values, $delimiter = self::PSEUDO_MULTI_LINE_SEPARATOR)
     {
         if (empty($this->_parameters[Import::FIELDS_ENCLOSURE])) {
-            return explode(self::PSEUDO_MULTI_LINE_SEPARATOR, $values);
+            return explode($delimiter, $values);
         }
         if (preg_match_all('~"((?:[^"]|"")*)"~', $values, $matches)) {
             return $values = array_map(function ($value) {
                 return str_replace('""', '"', $value);
             }, $matches[1]);
         }
+
         return [$values];
     }
 
@@ -2771,4 +2795,64 @@ private function formatBunchToStockDataRows(
             $indexer->reindexList($productIdsToReindex);
         }
     }
+
+    /**
+     * Update media gallery labels.
+     *
+     * @param array $labels
+     * @return void
+     */
+    private function updateMediaGalleryLabels(array $labels)
+    {
+        if (empty($labels)) {
+            return;
+        }
+
+        $insertData = [];
+        foreach ($labels as $label) {
+            $imageData = $label['imageData'];
+
+            if ($imageData['label'] === null) {
+                $insertData[] = [
+                    'label' => $label['label'],
+                    $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
+                    'value_id' => $imageData['value_id'],
+                    'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                ];
+            } else {
+                $this->_connection->update(
+                    $this->mediaGalleryValueTableName,
+                    [
+                        'label' => $label['label'],
+                    ],
+                    [
+                        $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
+                        'value_id = ?' => $imageData['value_id'],
+                        'store_id = ?' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                    ]
+                );
+            }
+        }
+
+        if (!empty($insertData)) {
+            $this->_connection->insertMultiple(
+                $this->mediaGalleryValueTableName,
+                $insertData
+            );
+        }
+    }
+
+    /**
+     * Parse values from multiple attributes fields.
+     *
+     * @param string $labelRow
+     * @return array
+     */
+    private function parseMultipleValues($labelRow)
+    {
+        return $this->parseMultiselectValues(
+            $labelRow,
+            $this->getMultipleValueSeparator()
+        );
+    }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
index 45aae81ff4bf9..4f64355f3b646 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
 
-use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 
 class Media extends AbstractImportValidator implements RowValidatorInterface
@@ -15,7 +14,11 @@ class Media extends AbstractImportValidator implements RowValidatorInterface
     const PATH_REGEXP = '#^(?!.*[\\/]\.{2}[\\/])(?!\.{2}[\\/])[-\w.\\/]+$#';
 
     const ADDITIONAL_IMAGES = 'additional_images';
-
+    
+    /**
+     * @deprecated
+     * @see \Magento\CatalogImportExport\Model\Import\Product::getMultipleValueSeparator()
+     */
     const ADDITIONAL_IMAGES_DELIMITER = ',';
 
     /** @var array */
@@ -83,7 +86,7 @@ public function isValid($value)
             }
         }
         if (isset($value[self::ADDITIONAL_IMAGES]) && strlen($value[self::ADDITIONAL_IMAGES])) {
-            foreach (explode(self::ADDITIONAL_IMAGES_DELIMITER, $value[self::ADDITIONAL_IMAGES]) as $image) {
+            foreach (explode($this->context->getMultipleValueSeparator(), $value[self::ADDITIONAL_IMAGES]) as $image) {
                 if (!$this->checkPath($image) && !$this->checkValidUrl($image)) {
                     $this->_addMessages(
                         [
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
index 501ff53b3e6d4..5033bd1b14776 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
@@ -6,11 +6,14 @@
 
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
 
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\Media;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\ImportExport\Model\Import;
 
 class MediaTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Magento\CatalogImportExport\Model\Import\Product\Validator\Media */
+    /** @var Media */
     protected $media;
 
     /** @var ObjectManagerHelper */
@@ -21,10 +24,8 @@ protected function setUp()
         
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->media = $this->objectManagerHelper->getObject(
-            'Magento\CatalogImportExport\Model\Import\Product\Validator\Media',
-            [
-                
-            ]
+            Media::class,
+            []
         );
     }
 
@@ -41,6 +42,18 @@ public function testInit()
      */
     public function testIsValid($data, $expected)
     {
+        $contextMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextMock->expects($this->any())
+            ->method('getMultipleValueSeparator')
+            ->willReturn(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR);
+        $contextMock->expects($this->any())
+            ->method('retrieveMessageTemplate')
+            ->with(Media::ERROR_INVALID_MEDIA_URL_OR_PATH)
+            ->willReturn('%s');
+        $this->media->init($contextMock);
+
         $result = $this->media->isValid($data);
         $this->assertEquals($expected['result'], $result);
         $messages = $this->media->getMessages();
@@ -50,7 +63,7 @@ public function testIsValid($data, $expected)
     public function testIsValidClearMessagesCall()
     {
         $media = $this->getMock(
-            '\Magento\CatalogImportExport\Model\Import\Product\Validator\Media',
+            Media::class,
             ['_clearMessages'],
             [],
             '',
@@ -78,7 +91,15 @@ public function isMediaValidDataProvider()
             'invalid' => [
                 ['_media_image' => 1],
                 ['result' => true,'messages' => []],
-            ]
+            ],
+            'additional_images' => [
+                ['additional_images' => 'image1.png,image2.jpg'],
+                ['result' => true, 'messages' => []],
+            ],
+            'additional_images_fail' => [
+                ['additional_images' => 'image1.png|image2.jpg|image3.gif'],
+                ['result' => false, 'messages' => [0 => 'additional_images']],
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index a6d27eb557eef..349bc51b9b541 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -1278,6 +1278,46 @@ public function testValidateValidateOptionEntity()
         $importProduct->validateRow($rowData, $rowNum);
     }
 
+    /**
+     * @dataProvider getImagesFromRowDataProvider
+     */
+    public function testGetImagesFromRow($rowData, $expectedResult)
+    {
+        $this->assertEquals(
+            $this->importProduct->getImagesFromRow($rowData),
+            $expectedResult
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getImagesFromRowDataProvider()
+    {
+        return [
+            [
+                [],
+                [[], []],
+            ],
+            [
+                [
+                    'image' => 'image3.jpg',
+                    '_media_image' => 'image1.jpg,image2.png',
+                    '_media_image_label' => 'label1,label2',
+                ],
+                [
+                    [
+                        'image' => ['image3.jpg'],
+                        '_media_image' => ['image1.jpg', 'image2.png'],
+                    ],
+                    [
+                        '_media_image' => ['label1', 'label2'],
+                    ],
+                ],
+            ],
+        ];
+    }
+    
     public function validateRowValidateNewProductTypeAddRowErrorCallDataProvider()
     {
         return [
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
index 3c8027e053914..cff1212cb7dda 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
@@ -12,9 +12,8 @@ define(
     function ($) {
         'use strict';
         var checkoutConfig = window.checkoutConfig,
-            agreementsConfig = checkoutConfig ? checkoutConfig.checkoutAgreements : {};
-
-        var agreementsInputPath = '.payment-method._active div.checkout-agreements input';
+            agreementsConfig = checkoutConfig ? checkoutConfig.checkoutAgreements : {},
+            agreementsInputPath = '.payment-method._active div.checkout-agreements input';
 
         return {
             /**
@@ -23,26 +22,11 @@ define(
              * @returns {boolean}
              */
             validate: function() {
-                if (!agreementsConfig.isEnabled) {
-                    return true;
-                }
-
-                if ($(agreementsInputPath).length == 0) {
+                if (!agreementsConfig.isEnabled || $(agreementsInputPath).length == 0) {
                     return true;
                 }
 
-                return $('#co-payment-form').validate({
-                    errorClass: 'mage-error',
-                    errorElement: 'div',
-                    meta: 'validate',
-                    errorPlacement: function (error, element) {
-                        var errorPlacement = element;
-                        if (element.is(':checkbox') || element.is(':radio')) {
-                            errorPlacement = element.siblings('label').last();
-                        }
-                        errorPlacement.after(error);
-                    }
-                }).element(agreementsInputPath);
+                return $.validator.validateSingleElement(agreementsInputPath, {errorElement: 'div'});
             }
         }
     }
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
index 3958822fbb788..6008530da13aa 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
@@ -8,14 +8,13 @@
     <div class="checkout-agreements" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
-            <div class="checkout-agreement">
-                <input type="checkbox"
+            <div class="checkout-agreement required">
+                <input type="checkbox" class="required-entry"
                        data-bind="attr: {
                                     'id': 'agreement_' + agreementId,
                                     'name': 'agreement[' + agreementId + ']',
                                     'value': agreementId
-                                    }"
-                       data-validate="{required:true}" />
+                                    }"/>
                 <label data-bind="attr: {'for': 'agreement_' + agreementId}">
                     <button type="button"
                             class="action action-show"
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
index 0fbb16f6cc7b4..6c983ce5e1925 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
@@ -152,10 +152,14 @@ protected function fillSimpleProductData(
         \Magento\Catalog\Model\Product $parentProduct,
         $postData
     ) {
+        $typeId = !empty($postData['weight'])
+            ? ProductType::TYPE_SIMPLE
+            : ProductType::TYPE_VIRTUAL;
+
         $product->setStoreId(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         )->setTypeId(
-            $postData['weight'] ? ProductType::TYPE_SIMPLE : ProductType::TYPE_VIRTUAL
+            $typeId
         )->setAttributeSetId(
             $parentProduct->getNewVariationsAttributeSetId()
         );
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
index 0b3975e040016..e52bd20cb78f0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product;
 
+use Magento\Catalog\Model\Product\Type;
 use Magento\ConfigurableProduct\Model\Product\VariationHandler;
 
 /**
- * @SuppressWarnings(PHPMD.LongVariable)
+ * Tests \Magento\ConfigurableProduct\Model\Product\VariationHandler.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class VariationHandlerTest extends \PHPUnit_Framework_TestCase
 {
@@ -62,45 +62,45 @@ protected function setUp()
     {
         $this->objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->productFactoryMock = $this->getMock(
-            'Magento\Catalog\Model\ProductFactory',
+            \Magento\Catalog\Model\ProductFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $this->entityFactoryMock = $this->getMock(
-            'Magento\Eav\Model\EntityFactory',
+            \Magento\Eav\Model\EntityFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $this->attributeSetFactory = $this->getMock(
-            'Magento\Eav\Model\Entity\Attribute\SetFactory',
+            \Magento\Eav\Model\Entity\Attribute\SetFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $this->stockConfiguration = $this->getMock(
-            'Magento\CatalogInventory\Api\StockConfigurationInterface',
+            \Magento\CatalogInventory\Api\StockConfigurationInterface::class,
             [],
             [],
             '',
             false
         );
         $this->configurableProduct = $this->getMock(
-            'Magento\ConfigurableProduct\Model\Product\Type\Configurable',
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::class,
             [],
             [],
             '',
             false
         );
 
-        $this->product = $this->getMock('Magento\Catalog\Model\Product', ['getMediaGallery'], [], '', false);
+        $this->product = $this->getMock(\Magento\Catalog\Model\Product::class, ['getMediaGallery'], [], '', false);
 
         $this->model = $this->objectHelper->getObject(
-            'Magento\ConfigurableProduct\Model\Product\VariationHandler',
+            VariationHandler::class,
             [
                 'productFactory' => $this->productFactoryMock,
                 'entityFactory' => $this->entityFactoryMock,
@@ -114,19 +114,19 @@ protected function setUp()
     public function testPrepareAttributeSet()
     {
 
-        $productMock = $this->getMockBuilder('\Magento\Catalog\Model\Product')
+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->setMethods(['getNewVariationsAttributeSetId'])
             ->disableOriginalConstructor()
             ->getMock();
-        $attributeMock = $this->getMockBuilder('\Magento\Eav\Model\Entity\Attribute')
+        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
             ->setMethods(['isInSet', 'setAttributeSetId', 'setAttributeGroupId', 'save'])
             ->disableOriginalConstructor()
             ->getMock();
-        $attributeSetMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\Set')
+        $attributeSetMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Set::class)
             ->setMethods(['load', 'addSetInfo', 'getDefaultGroupId'])
             ->disableOriginalConstructor()
             ->getMock();
-        $eavEntityMock = $this->getMockBuilder('\Magento\Eav\Model\Entity')
+        $eavEntityMock = $this->getMockBuilder(\Magento\Eav\Model\Entity::class)
             ->setMethods(['setType', 'getTypeId'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -161,23 +161,30 @@ public function testPrepareAttributeSet()
 
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider dataProviderTestGenerateSimpleProducts
+     * @param int|string|null $weight
+     * @param string $typeId
      */
-    public function testGenerateSimpleProducts()
+    public function testGenerateSimpleProducts($weight, $typeId)
     {
         $productsData = [
-            6 =>
-                [
-                    'image' => 'image.jpg',
-                    'name' => 'config-red',
-                    'configurable_attribute' => '{"new_attr":"6"}',
-                    'sku' => 'config-red',
-                    'quantity_and_stock_status' =>
-                        [
-                            'qty' => '',
-                        ],
-                    'weight' => '333',
-                ]
+            [
+                'image' => 'image.jpg',
+                'name' => 'config-red',
+                'configurable_attribute' => '{"new_attr":"6"}',
+                'sku' => 'config-red',
+                'quantity_and_stock_status' =>
+                    [
+                        'qty' => '',
+                    ],
+            ]
         ];
+
+        // Do not add 'weight' attribute if it's value is null!
+        if ($weight !== null) {
+            $productsData[0]['weight'] = $weight;
+        }
+
         $stockData = [
             'manage_stock' => '0',
             'use_config_enable_qty_increments' => '1',
@@ -186,7 +193,7 @@ public function testGenerateSimpleProducts()
             'is_decimal_divided' => 0
         ];
 
-        $parentProductMock = $this->getMockBuilder('\Magento\Catalog\Model\Product')
+        $parentProductMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->setMethods(
                 [
                     '__wakeup',
@@ -198,7 +205,7 @@ public function testGenerateSimpleProducts()
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $newSimpleProductMock = $this->getMockBuilder('\Magento\Catalog\Model\Product')
+        $newSimpleProductMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->setMethods(
                 [
                     '__wakeup',
@@ -217,15 +224,15 @@ public function testGenerateSimpleProducts()
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $productTypeMock = $this->getMockBuilder('Magento\Catalog\Model\Product\Type')
+        $productTypeMock = $this->getMockBuilder(Type::class)
             ->setMethods(['getSetAttributes'])
             ->disableOriginalConstructor()
             ->getMock();
-        $editableAttributeMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute')
+        $editableAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
             ->setMethods(['getIsUnique', 'getAttributeCode', 'getFrontend', 'getIsVisible'])
             ->disableOriginalConstructor()
             ->getMock();
-        $frontendAttributeMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\Frontend')
+        $frontendAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Frontend::class)
             ->setMethods(['getInputType'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -235,7 +242,7 @@ public function testGenerateSimpleProducts()
             ->willReturn('new_attr_set_id');
         $this->productFactoryMock->expects($this->once())->method('create')->willReturn($newSimpleProductMock);
         $newSimpleProductMock->expects($this->once())->method('setStoreId')->with(0)->willReturnSelf();
-        $newSimpleProductMock->expects($this->once())->method('setTypeId')->with('simple')->willReturnSelf();
+        $newSimpleProductMock->expects($this->once())->method('setTypeId')->with($typeId)->willReturnSelf();
         $newSimpleProductMock->expects($this->once())
             ->method('setAttributeSetId')
             ->with('new_attr_set_id')
@@ -264,6 +271,27 @@ public function testGenerateSimpleProducts()
         $this->assertEquals(['product_id'], $this->model->generateSimpleProducts($parentProductMock, $productsData));
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderTestGenerateSimpleProducts()
+    {
+        return [
+            [
+                'weight' => 333,
+                'type_id' => Type::TYPE_SIMPLE,
+            ],
+            [
+                'weight' => '',
+                'type_id' => Type::TYPE_VIRTUAL,
+            ],
+            [
+                'weight' => null,
+                'type_id' => Type::TYPE_VIRTUAL,
+            ],
+        ];
+    }
+
     public function testProcessMediaGalleryWithImagesAndGallery()
     {
         $this->product->expects($this->atLeastOnce())->method('getMediaGallery')->with('images')->willReturn([]);
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index e46f9384bdfda..b83cc0c8cf2f5 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -395,6 +395,8 @@ public function setShippingItemsInformation($info)
                 }
             }
 
+            $this->prepareShippingAssignment($quote);
+
             /**
              * Delete all not virtual quote items which are not added to shipping address
              * MultishippingQty should be defined for each quote item when it processed with _addShippingItem
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
index 8f4c14b8b655a..24a6f32b37a8d 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -5,120 +5,148 @@
  */
 namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type;
 
-class MultishippingTest extends \PHPUnit_Framework_TestCase
+use Magento\Checkout\Model\Session;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\AddressSearchResultsInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Data\Address;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Session\Generic;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Multishipping\Helper\Data;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Payment\Model\Method\SpecificationInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartExtension;
+use Magento\Quote\Api\Data\CartExtensionFactory;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Quote\Model\Quote\Address\Item as AddressItem;
+use Magento\Quote\Model\Quote\Address\ToOrder;
+use Magento\Quote\Model\Quote\Address\ToOrderAddress;
+use Magento\Quote\Model\Quote\AddressFactory;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\ToOrderItem;
+use Magento\Quote\Model\Quote\Payment\ToOrderPayment;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
+use Magento\Quote\Model\Quote\TotalsCollector;
+use Magento\Quote\Model\Shipping;
+use Magento\Quote\Model\ShippingAssignment;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MultishippingTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
+     * @var Multishipping
      */
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $checkoutSessionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerSessionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $quoteMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $helperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $filterBuilderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $addressRepositoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $searchCriteriaBuilderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $totalsCollectorMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     private $cartExtensionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     private $shippingAssignmentProcessorMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     private $quoteRepositoryMock;
 
     protected function setUp()
     {
-        $this->checkoutSessionMock = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
-        $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
-        $orderFactoryMock = $this->getMock('\Magento\Sales\Model\OrderFactory', [], [], '', false);
-        $eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface', [], [], '', false);
-        $scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
-        $sessionMock = $this->getMock('\Magento\Framework\Session\Generic', [], [], '', false);
-        $addressFactoryMock = $this->getMock('\Magento\Quote\Model\Quote\AddressFactory', [], [], '', false);
-        $toOrderMock = $this->getMock('\Magento\Quote\Model\Quote\Address\ToOrder', [], [], '', false);
-        $toOrderAddressMock = $this->getMock('\Magento\Quote\Model\Quote\Address\ToOrderAddress', [], [], '', false);
-        $toOrderPaymentMock = $this->getMock('\Magento\Quote\Model\Quote\Payment\ToOrderPayment', [], [], '', false);
-        $toOrderItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item\ToOrderItem', [], [], '', false);
-        $storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
-        $paymentSpecMock = $this->getMock('\Magento\Payment\Model\Method\SpecificationInterface', [], [], '', false);
-        $this->helperMock = $this->getMock('\Magento\Multishipping\Helper\Data', [], [], '', false);
-        $orderSenderMock = $this->getMock('\Magento\Sales\Model\Order\Email\Sender\OrderSender', [], [], '', false);
-        $priceMock = $this->getMock('\Magento\Framework\Pricing\PriceCurrencyInterface', [], [], '', false);
-        $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
-        $this->filterBuilderMock = $this->getMock('\Magento\Framework\Api\FilterBuilder', [], [], '', false);
-        $this->searchCriteriaBuilderMock = $this->getMock(
-            '\Magento\Framework\Api\SearchCriteriaBuilder',
-            [],
-            [],
-            '',
-            false
-        );
-        $this->addressRepositoryMock = $this->getMock(
-            '\Magento\Customer\Api\AddressRepositoryInterface',
-            [],
-            [],
-            '',
-            false
-        );
-
-        /**
-         * This is used to get past _init() which is called in construct.
-         */
+        $this->checkoutSessionMock = $this->createSimpleMock(Session::class);
+        $this->customerSessionMock = $this->createSimpleMock(CustomerSession::class);
+        $orderFactoryMock = $this->createSimpleMock(OrderFactory::class);
+        $eventManagerMock = $this->createSimpleMock(ManagerInterface::class);
+        $scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
+        $sessionMock = $this->createSimpleMock(Generic::class);
+        $addressFactoryMock = $this->createSimpleMock(AddressFactory::class);
+        $toOrderMock = $this->createSimpleMock(ToOrder::class);
+        $toOrderAddressMock = $this->createSimpleMock(ToOrderAddress::class);
+        $toOrderPaymentMock = $this->createSimpleMock(ToOrderPayment::class);
+        $toOrderItemMock = $this->createSimpleMock(ToOrderItem::class);
+        $storeManagerMock = $this->createSimpleMock(StoreManagerInterface::class);
+        $paymentSpecMock = $this->createSimpleMock(SpecificationInterface::class);
+        $this->helperMock = $this->createSimpleMock(Data::class);
+        $orderSenderMock = $this->createSimpleMock(OrderSender::class);
+        $priceMock = $this->createSimpleMock(PriceCurrencyInterface::class);
+        $this->quoteRepositoryMock = $this->createSimpleMock(CartRepositoryInterface::class);
+        $this->filterBuilderMock = $this->createSimpleMock(FilterBuilder::class);
+        $this->searchCriteriaBuilderMock = $this->createSimpleMock(SearchCriteriaBuilder::class);
+        $this->addressRepositoryMock = $this->createSimpleMock(AddressRepositoryInterface::class);
+        /** This is used to get past _init() which is called in construct. */
         $data['checkout_session'] = $this->checkoutSessionMock;
-        $this->quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
-        $this->customerMock = $this->getMock('\Magento\Customer\Api\Data\CustomerInterface', [], [], '', false);
+        $this->quoteMock = $this->createSimpleMock(Quote::class);
+        $this->customerMock = $this->createSimpleMock(CustomerInterface::class);
         $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn(null);
         $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
         $this->customerSessionMock->expects($this->atLeastOnce())->method('getCustomerDataObject')
             ->willReturn($this->customerMock);
-        $this->totalsCollectorMock = $this->getMock('Magento\Quote\Model\Quote\TotalsCollector', [], [], '', false);
-        $this->model = new \Magento\Multishipping\Model\Checkout\Type\Multishipping(
+        $this->totalsCollectorMock = $this->createSimpleMock(TotalsCollector::class);
+        $this->model = new Multishipping(
             $this->checkoutSessionMock,
             $this->customerSessionMock,
             $orderFactoryMock,
@@ -142,21 +170,14 @@ protected function setUp()
             $this->totalsCollectorMock,
             $data
         );
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->cartExtensionFactoryMock = $this->getMock(
-            \Magento\Quote\Api\Data\CartExtensionFactory::class,
-            ['create'],
-            [],
-            '',
-            false
-        );
-        $this->shippingAssignmentProcessorMock = $this->getMock(
-            \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor::class,
-            [],
-            [],
-            '',
-            false
-        );
+
+        $this->cartExtensionFactoryMock = $this->getMockBuilder(CartExtensionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shippingAssignmentProcessorMock = $this->createSimpleMock(ShippingAssignmentProcessor::class);
+
+        $objectManager = new ObjectManager($this);
         $objectManager->setBackwardCompatibleProperty(
             $this->model,
             'cartExtensionFactory',
@@ -194,17 +215,21 @@ public function testSetShippingItemsInformation()
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setConditionType')->willReturnSelf();
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('create')->willReturnSelf();
 
-        $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $searchCriteriaMock = $this->createSimpleMock(SearchCriteria::class);
         $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())->method('addFilters')->willReturnSelf();
-        $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())->method('create')
+        $this->searchCriteriaBuilderMock
+            ->expects($this->atLeastOnce())
+            ->method('create')
             ->willReturn($searchCriteriaMock);
 
-        $resultMock = $this->getMock('\Magento\Customer\Api\Data\AddressSearchResultsInterface', [], [], '', false);
+        $resultMock = $this->createSimpleMock(AddressSearchResultsInterface::class);
         $this->addressRepositoryMock->expects($this->atLeastOnce())->method('getList')->willReturn($resultMock);
-        $addressItemMock = $this->getMock('\Magento\Customer\Api\Data\AddressInterface', [], [], '', false);
+        $addressItemMock = $this->createSimpleMock(AddressInterface::class);
         $resultMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$addressItemMock]);
         $addressItemMock->expects($this->atLeastOnce())->method('getId')->willReturn(null);
 
+        $this->mockShippingAssignment();
+
         $this->assertEquals($this->model, $this->model->setShippingItemsInformation($info));
     }
 
@@ -224,11 +249,11 @@ public function testSetShippingItemsInformationForAddressLeak()
         ];
         $customerAddressId = 42;
 
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
+        $customerAddresses = [
+            $this->getCustomerAddressMock($customerAddressId)
+        ];
 
-        $quoteItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item', [], [], '', false);
+        $quoteItemMock = $this->createSimpleMock(Item::class);
         $this->quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([]);
 
@@ -244,11 +269,11 @@ public function testupdateQuoteCustomerShippingAddress()
         $addressId = 42;
         $customerAddressId = 42;
 
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
-        $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
+        $customerAddresses = [
+            $this->getCustomerAddressMock($customerAddressId)
+        ];
 
+        $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
         $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn(null);
 
         $this->assertEquals($this->model, $this->model->updateQuoteCustomerShippingAddress($addressId));
@@ -263,9 +288,9 @@ public function testupdateQuoteCustomerShippingAddressForAddressLeak()
         $addressId = 43;
         $customerAddressId = 42;
 
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
+        $customerAddresses = [
+            $this->getCustomerAddressMock($customerAddressId)
+        ];
         $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
 
         $this->assertEquals($this->model, $this->model->updateQuoteCustomerShippingAddress($addressId));
@@ -276,9 +301,9 @@ public function testSetQuoteCustomerBillingAddress()
         $addressId = 42;
         $customerAddressId = 42;
 
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
+        $customerAddresses = [
+            $this->getCustomerAddressMock($customerAddressId)
+        ];
         $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
 
         $this->assertEquals($this->model, $this->model->setQuoteCustomerBillingAddress($addressId));
@@ -293,9 +318,9 @@ public function testSetQuoteCustomerBillingAddressForAddressLeak()
         $addressId = 43;
         $customerAddressId = 42;
 
-        $customerAddressMock = $this->getMock('\Magento\Customer\Model\Data\Address', [], [], '', false);
-        $customerAddressMock->expects($this->atLeastOnce())->method('getId')->willReturn($customerAddressId);
-        $customerAddresses = [$customerAddressMock];
+        $customerAddresses = [
+            $this->getCustomerAddressMock($customerAddressId)
+        ];
         $this->customerMock->expects($this->once())->method('getAddresses')->willReturn($customerAddresses);
 
         $this->assertEquals($this->model, $this->model->setQuoteCustomerBillingAddress($addressId));
@@ -303,7 +328,9 @@ public function testSetQuoteCustomerBillingAddressForAddressLeak()
 
     public function testGetQuoteShippingAddressesItems()
     {
-        $quoteItem = $this->getMock(\Magento\Quote\Model\Quote\Address\Item::class, [], [], '', false);
+        $quoteItem = $this->getMockBuilder(AddressItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())->method('getShippingAddressesItems')->willReturn($quoteItem);
         $this->model->getQuoteShippingAddressesItems();
@@ -311,57 +338,113 @@ public function testGetQuoteShippingAddressesItems()
 
     public function testSetShippingMethods()
     {
-
         $methodsArray = [1 => 'flatrate_flatrate', 2 => 'tablerate_bestway'];
         $addressId = 1;
-        $addressMock = $this->getMock(
-            \Magento\Quote\Model\Quote\Address::class,
-            ['getId', 'setShippingMethod'],
-            [],
-            '',
-            false
-        );
-        $extensionAttributesMock = $this->getMock(
-            \Magento\Quote\Api\Data\CartExtension::class,
-            ['setShippingAssignments'],
-            [],
-            '',
-            false
-        );
-        $shippingAssignmentMock = $this->getMock(
-            \Magento\Quote\Model\ShippingAssignment::class,
-            ['getShipping', 'setShipping'],
-            [],
-            '',
-            false
-        );
-        $shippingMock = $this->getMock(\Magento\Quote\Model\Shipping::class, ['setMethod'], [], '', false);
+        $addressMock = $this->getMockBuilder(QuoteAddress::class)
+            ->setMethods(['getId', 'setShippingMethod'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
         $addressMock->expects($this->once())->method('setShippingMethod')->with($methodsArray[$addressId]);
-        //mock for prepareShippingAssignment
-        $this->quoteMock
+
+        $this->mockShippingAssignment();
+
+        //save mock
+        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
+        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($this->quoteMock);
+        $this->model->setShippingMethods($methodsArray);
+    }
+
+    /**
+     * @param ShippingAssignment $shippingAssignmentMock
+     * @return CartExtension|PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getExtensionAttributesMock(ShippingAssignment $shippingAssignmentMock)
+    {
+        $extensionAttributesMock = $this->getMockBuilder(CartExtension::class)
+            ->setMethods(['setShippingAssignments'])
+            ->getMock();
+
+        $extensionAttributesMock
             ->expects($this->once())
-            ->method('getExtensionAttributes')
-            ->willReturn($extensionAttributesMock);
+            ->method('setShippingAssignments')
+            ->with([$shippingAssignmentMock])
+            ->willReturnSelf();
+
+        return $extensionAttributesMock;
+    }
+
+    /**
+     * @return ShippingAssignment | PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getShippingAssignmentMock()
+    {
+        $shippingAssignmentMock = $this->getMockBuilder(ShippingAssignment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getShipping', 'setShipping'])
+            ->getMock();
+        $shippingMock = $this->getMockBuilder(Shipping::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setMethod'])
+            ->getMock();
+
+        $shippingAssignmentMock->expects($this->once())->method('getShipping')->willReturn($shippingMock);
+        $shippingMock->expects($this->once())->method('setMethod')->with(null)->willReturnSelf();
+        $shippingAssignmentMock->expects($this->once())->method('setShipping')->with($shippingMock);
+
+        return $shippingAssignmentMock;
+    }
+
+    private function mockShippingAssignment()
+    {
+        $shippingAssignmentMock = $this->getShippingAssignmentMock();
+
+        $extensionAttributesMock = $this->getExtensionAttributesMock($shippingAssignmentMock);
+
         $this->shippingAssignmentProcessorMock
             ->expects($this->once())
             ->method('create')
             ->with($this->quoteMock)
             ->willReturn($shippingAssignmentMock);
-        $shippingAssignmentMock->expects($this->once())->method('getShipping')->willReturn($shippingMock);
-        $shippingMock->expects($this->once())->method('setMethod')->with(null)->willReturnSelf();
-        $shippingAssignmentMock->expects($this->once())->method('setShipping')->with($shippingMock);
-        $extensionAttributesMock
+
+        $this->quoteMock
             ->expects($this->once())
-            ->method('setShippingAssignments')
-            ->with([$shippingAssignmentMock])
-            ->willReturnSelf();
-        $this->quoteMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttributesMock);
-        //save mock
-        $this->quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
-        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($this->quoteMock);
-        $this->model->setShippingMethods($methodsArray);
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributesMock);
+
+        $this->quoteMock
+            ->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($extensionAttributesMock);
+    }
+
+    /**
+     * @param $customerAddressId
+     * @return Address | PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getCustomerAddressMock($customerAddressId)
+    {
+        $customerAddressMock = $this->getMockBuilder(Address::class)
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customerAddressMock
+            ->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn($customerAddressId);
+        return $customerAddressMock;
+    }
+
+    /**
+     * @param string $className
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createSimpleMock($className)
+    {
+        return $this->getMockBuilder($className)
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 }
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
index 9b36c39522acd..64f4a3b5969b0 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -13,6 +13,9 @@
 use Magento\Quote\Api\Data\EstimateAddressInterface;
 use Magento\Quote\Api\ShipmentEstimationInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
 
 /**
  * Shipping method read service.
@@ -49,6 +52,20 @@ class ShippingMethodManagement implements
      */
     protected $totalsCollector;
 
+    /**
+     * Data object processor for array serialization using class reflection.
+     *
+     * @var \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor
+     */
+    private $dataProcessor;
+
+    /**
+     * Customer address interface factory.
+     *
+     * @var AddressInterfaceFactory $addressFactory
+     */
+    private $addressFactory;
+
     /**
      * Constructs a shipping method read service object.
      *
@@ -56,17 +73,23 @@ class ShippingMethodManagement implements
      * @param Cart\ShippingMethodConverter $converter
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param Quote\TotalsCollector $totalsCollector
+     * @param DataObjectProcessor|null $dataProcessor
+     * @param AddressInterfaceFactory|null $addressFactory
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         Cart\ShippingMethodConverter $converter,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
-        \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
+        \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
+        DataObjectProcessor $dataProcessor = null,
+        AddressInterfaceFactory $addressFactory = null
     ) {
         $this->quoteRepository = $quoteRepository;
         $this->converter = $converter;
         $this->addressRepository = $addressRepository;
         $this->totalsCollector = $totalsCollector;
+        $this->dataProcessor = $dataProcessor ?: ObjectManager::getInstance()->get(DataObjectProcessor::class);
+        $this->addressFactory = $addressFactory ?: ObjectManager::getInstance()->get(AddressInterfaceFactory::class);
     }
 
     /**
@@ -189,13 +212,7 @@ public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddre
             return [];
         }
 
-        return $this->getEstimatedRates(
-            $quote,
-            $address->getCountryId(),
-            $address->getPostcode(),
-            $address->getRegionId(),
-            $address->getRegion()
-        );
+        return $this->getShippingMethods($quote, $address);
     }
 
     /**
@@ -210,7 +227,8 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
         if ($quote->isVirtual() || 0 == $quote->getItemsCount()) {
             return [];
         }
-        return $this->getShippingMethods($quote, $address->getData());
+
+        return $this->getShippingMethods($quote, $address);
     }
 
     /**
@@ -227,13 +245,7 @@ public function estimateByAddressId($cartId, $addressId)
         }
         $address = $this->addressRepository->getById($addressId);
 
-        return $this->getEstimatedRates(
-            $quote,
-            $address->getCountryId(),
-            $address->getPostcode(),
-            $address->getRegionId(),
-            $address->getRegion()
-        );
+        return $this->getShippingMethods($quote, $address);
     }
 
     /**
@@ -244,30 +256,40 @@ public function estimateByAddressId($cartId, $addressId)
      * @param string $postcode
      * @param int $regionId
      * @param string $region
+     * @param \Magento\Framework\Api\ExtensibleDataInterface|null $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
+     * @deprecated
      */
-    protected function getEstimatedRates(\Magento\Quote\Model\Quote $quote, $country, $postcode, $regionId, $region)
-    {
-        $data = [
-            EstimateAddressInterface::KEY_COUNTRY_ID => $country,
-            EstimateAddressInterface::KEY_POSTCODE => $postcode,
-            EstimateAddressInterface::KEY_REGION_ID => $regionId,
-            EstimateAddressInterface::KEY_REGION => $region
-        ];
-        return $this->getShippingMethods($quote, $data);
+    protected function getEstimatedRates(
+        \Magento\Quote\Model\Quote $quote,
+        $country,
+        $postcode,
+        $regionId,
+        $region,
+        $address = null
+    ) {
+        if (!$address) {
+            $address = $this->addressFactory->create()
+                ->setCountryId($country)
+                ->setPostcode($postcode)
+                ->setRegionId($regionId)
+                ->setRegion($region);
+        }
+
+        return $this->getShippingMethods($quote, $address);
     }
 
     /**
      * Get list of available shipping methods
      * @param \Magento\Quote\Model\Quote $quote
-     * @param array $addressData
+     * @param \Magento\Framework\Api\ExtensibleDataInterface $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[]
      */
-    private function getShippingMethods(Quote $quote, array $addressData)
+    private function getShippingMethods(Quote $quote, $address)
     {
         $output = [];
         $shippingAddress = $quote->getShippingAddress();
-        $shippingAddress->addData($addressData);
+        $shippingAddress->addData($this->extractAddressData($address));
         $shippingAddress->setCollectShippingRates(true);
 
         $this->totalsCollector->collectAddressTotals($quote, $shippingAddress);
@@ -279,4 +301,25 @@ private function getShippingMethods(Quote $quote, array $addressData)
         }
         return $output;
     }
+
+    /**
+     * Get transform address interface into Array.
+     *
+     * @param \Magento\Framework\Api\ExtensibleDataInterface $address
+     * @return array
+     */
+    private function extractAddressData($address)
+    {
+        $className = \Magento\Customer\Api\Data\AddressInterface::class;
+        if ($address instanceof \Magento\Quote\Api\Data\AddressInterface) {
+            $className = \Magento\Quote\Api\Data\AddressInterface::class;
+        } elseif ($address instanceof EstimateAddressInterface) {
+            $className = EstimateAddressInterface::class;
+        }
+
+        return $this->dataProcessor->buildOutputDataArray(
+            $address,
+            $className
+        );
+    }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
index eb8fe7c50f793..bc9cf30dd4bd0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
@@ -63,6 +63,21 @@ class ShippingMethodManagementTest extends \PHPUnit_Framework_TestCase
      */
     private $shippingAddress;
 
+    /**
+     * @var \Magento\Framework\Reflection\DataObjectProcessor|MockObject
+     */
+    private $dataProcessor;
+
+    /**
+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|MockObject
+     */
+    private $addressFactory;
+
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface|MockObject
+     */
+    private $addressRepository;
+
     /**
      * @var TotalsCollector|MockObject
      */
@@ -71,18 +86,19 @@ class ShippingMethodManagementTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
-        $this->quoteRepository = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
-        $this->methodDataFactoryMock = $this->getMock(
-            '\Magento\Quote\Api\Data\ShippingMethodInterfaceFactory',
-            [
-                'create'
-            ],
-            [],
-            '',
-            false
-        );
+        $this->quoteRepository = $this->getMock(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $this->addressRepository = $this->getMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
 
-        $this->storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+        $className = \Magento\Quote\Api\Data\ShippingMethodInterfaceFactory::class;
+        $this->methodDataFactoryMock = $this->getMock($className, ['create'], [], '', false);
+
+        $className = \Magento\Customer\Api\Data\AddressInterfaceFactory::class;
+        $this->addressFactory = $this->getMock($className, ['create'], [], '', false);
+
+        $className = \Magento\Framework\Reflection\DataObjectProcessor::class;
+        $this->dataProcessor = $this->getMock($className, [], [], '', false);
+        
+        $this->storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods([
@@ -132,7 +148,10 @@ protected function setUp()
                 'quoteRepository' => $this->quoteRepository,
                 'methodDataFactory' => $this->methodDataFactoryMock,
                 'converter' => $this->converter,
-                'totalsCollector' => $this->totalsCollector
+                'totalsCollector' => $this->totalsCollector,
+                'addressRepository' => $this->addressRepository,
+                'dataProcessor' => $this->dataProcessor,
+                'addressFactory' => $this->addressFactory
             ]
         );
     }
@@ -170,14 +189,14 @@ public function testGetMethod()
             ->method('getShippingMethod')->will($this->returnValue('one_two'));
 
         $this->shippingAddress->expects($this->once())->method('collectShippingRates')->willReturnSelf();
-        $shippingRateMock = $this->getMock('\Magento\Quote\Model\Quote\Address\Rate', [], [], '', false);
+        $shippingRateMock = $this->getMock(\Magento\Quote\Model\Quote\Address\Rate::class, [], [], '', false);
 
         $this->shippingAddress->expects($this->once())
             ->method('getShippingRateByCode')
             ->with('one_two')
             ->willReturn($shippingRateMock);
 
-        $this->shippingMethodMock = $this->getMock('\Magento\Quote\Api\Data\ShippingMethodInterface');
+        $this->shippingMethodMock = $this->getMock(\Magento\Quote\Api\Data\ShippingMethodInterface::class);
         $this->converter->expects($this->once())
             ->method('modelToDataObject')
             ->with($shippingRateMock, $currencyCode)
@@ -259,7 +278,7 @@ public function testGetList()
             ->method('getShippingAddress')->will($this->returnValue($this->shippingAddress));
         $this->shippingAddress->expects($this->once())->method('getCountryId')->will($this->returnValue(345));
         $this->shippingAddress->expects($this->once())->method('collectShippingRates');
-        $shippingRateMock = $this->getMock('\Magento\Quote\Model\Quote\Address\Rate', [], [], '', false);
+        $shippingRateMock = $this->getMock(\Magento\Quote\Model\Quote\Address\Rate::class, [], [], '', false);
         $this->shippingAddress->expects($this->once())
             ->method('getGroupedAllShippingRates')
             ->will($this->returnValue([[$shippingRateMock]]));
@@ -457,11 +476,17 @@ public function testEstimateByExtendedAddress()
         ];
         $currencyCode = 'UAH';
 
+        /**
+         * @var \Magento\Quote\Api\Data\AddressInterface|MockObject $address
+         */
         $address = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getData'])
             ->getMock();
 
+        $this->addressFactory->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($address));
+
         $this->quoteRepository->expects(static::once())
             ->method('getActive')
             ->with($cartId)
@@ -473,19 +498,14 @@ public function testEstimateByExtendedAddress()
         $this->quote->expects(static::once())
             ->method('getItemsCount')
             ->willReturn(1);
-
-        $address->expects(static::once())
-            ->method('getData')
-            ->willReturn($addressData);
-
         $this->quote->expects(static::once())
             ->method('getShippingAddress')
             ->willReturn($this->shippingAddress);
 
-        $this->shippingAddress->expects(static::once())
-            ->method('addData')
-            ->with($addressData)
-            ->willReturnSelf();
+        $this->dataProcessor->expects(static::any())
+            ->method('buildOutputDataArray')
+            ->willReturn($addressData);
+
         $this->shippingAddress->expects(static::once())
             ->method('setCollectShippingRates')
             ->with(true)
@@ -519,4 +539,80 @@ public function testEstimateByExtendedAddress()
         $carriersRates = $this->model->estimateByExtendedAddress($cartId, $address);
         static::assertEquals($expectedRates, $carriersRates);
     }
+
+    /**
+     * @covers \Magento\Quote\Model\ShippingMethodManagement::estimateByAddressId
+     */
+    public function testEstimateByAddressId()
+    {
+        $cartId = 1;
+
+        $addressData = [
+            'region' => 'California',
+            'region_id' => 23,
+            'country_id' => 1,
+            'postcode' => 90200
+        ];
+        $currencyCode = 'UAH';
+
+        /**
+         * @var \Magento\Customer\Api\Data\AddressInterface|MockObject $address
+         */
+        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->addressRepository->expects($this->any())
+            ->method('getById')
+            ->will($this->returnValue($address));
+        $this->addressFactory->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($address));
+        $this->quoteRepository->expects(static::once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($this->quote);
+        $this->quote->expects(static::once())
+            ->method('isVirtual')
+            ->willReturn(false);
+        $this->quote->expects(static::once())
+            ->method('getItemsCount')
+            ->willReturn(1);
+        $this->quote->expects(static::once())
+            ->method('getShippingAddress')
+            ->willReturn($this->shippingAddress);
+        $this->dataProcessor->expects(static::any())
+            ->method('buildOutputDataArray')
+            ->willReturn($addressData);
+        $this->shippingAddress->expects(static::once())
+            ->method('setCollectShippingRates')
+            ->with(true)
+            ->willReturnSelf();
+        $this->totalsCollector->expects(static::once())
+            ->method('collectAddressTotals')
+            ->with($this->quote, $this->shippingAddress)
+            ->willReturnSelf();
+
+        $rate = $this->getMockBuilder(Rate::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $methodObject = $this->getMockForAbstractClass(ShippingMethodInterface::class);
+        $expectedRates = [$methodObject];
+
+        $this->shippingAddress->expects(static::once())
+            ->method('getGroupedAllShippingRates')
+            ->willReturn([[$rate]]);
+
+        $this->quote->expects(static::once())
+            ->method('getQuoteCurrencyCode')
+            ->willReturn($currencyCode);
+
+        $this->converter->expects(static::once())
+            ->method('modelToDataObject')
+            ->with($rate, $currencyCode)
+            ->willReturn($methodObject);
+
+        $carriersRates = $this->model->estimateByAddressId($cartId, $address);
+        static::assertEquals($expectedRates, $carriersRates);
+    }
 }
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 46df267d79fda..b22f0ef80a410 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -291,6 +291,7 @@ protected function _assignProducts()
             'thumbnail',
             'links_purchased_separately',
             'links_title',
+            'price_type',
         ];
 
         $productCollection->addPriceData()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index e00e18fd8ab36..dc9762a98ef7d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -17,6 +17,20 @@
  */
 class Curl extends AbstractCurl implements CatalogProductAttributeInterface
 {
+    /**
+     * Relative action path with parameters.
+     *
+     * @var string
+     */
+    protected $urlActionPath = 'catalog/product_attribute/save/back/edit';
+
+    /**
+     * Message for Exception when was received not successful response.
+     *
+     * @var string
+     */
+    protected $responseExceptionMessage = 'Product Attribute creating by curl handler was not successful!';
+
     /**
      * Mapping values for data.
      *
@@ -85,14 +99,15 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $data = $this->changeStructureOfTheData($data);
-        $url = $_ENV['app_backend_url'] . 'catalog/product_attribute/save/back/edit';
+        $url = $_ENV['app_backend_url'] . $this->urlActionPath;
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
         $curl->write($url, $data);
         $response = $curl->read();
         $curl->close();
 
         if (!strpos($response, 'data-ui-id="messages-message-success"')) {
-            throw new \Exception("Product Attribute creating by curl handler was not successful! \n" . $response);
+            $this->_eventManager->dispatchEvent(['curl_failed'], [$response]);
+            throw new \Exception($this->responseExceptionMessage);
         }
 
         $resultData = [];
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.php
new file mode 100644
index 0000000000000..3bb086df5a37c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ * 1. Create two products.
+ * 2. Create customer with two addresses.
+ *
+ * Steps:
+ * 1. Go to Frontend.
+ * 2. Add products to the cart.
+ * 3. Go to cart.
+ * 4. Click 'Check Out with Multiple Addresses'.
+ * 5. Choose different address for each product.
+ * 6. Press 'Go To Shipping Information.'
+ * 7. Press 'Change' button on both addresses.
+ * 8. Perform assertion that all addresses contain full information.
+ *
+ * @group One_Page_Checkout_(CS)
+ * @ZephyrId MAGETWO-64728
+ */
+class UpdateAddressOnCheckoutWithMultipleAddressesTest extends Scenario
+{
+    /**
+     * Runs update address on checkout with multiple addresses test.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.xml
new file mode 100644
index 0000000000000..aac14151aacd2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\UpdateAddressOnCheckoutWithMultipleAddressesTest" summary="Check Addresses On Checkout With Multiple Addresses." ticketId="MAGETWO-64728">
+        <variation name="UpdateAddressOnCheckoutWithMultipleAddressesTestVariation1">
+            <data name="products" xsi:type="string">catalogProductSimple::default, catalogProductSimple::default</data>
+            <data name="customer/dataset" xsi:type="string">johndoe_with_multiple_addresses</data>
+            <constraint name="Magento\Multishipping\Test\Constraint\AssertMultishippingAddresses"/>
+        </variation>
+    </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
index ef5ddaf7da9be..3870a1f10dcd9 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -59,4 +59,12 @@
         <step name="addProductsToTheCart" module="Magento_Checkout" next="ProceedToCheckout" />
         <step name="ProceedToCheckout" module="Magento_Checkout" />
     </scenario>
+    <scenario name="UpdateAddressOnCheckoutWithMultipleAddressesTest" firstStep="createProducts">
+        <step name="createProducts" module="Magento_Catalog" next="createCustomer"/>
+        <step name="createCustomer" module="Magento_Customer" next="loginCustomerOnFrontend"/>
+        <step name="loginCustomerOnFrontend" module="Magento_Customer" next="addProductsToTheCart"/>
+        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToMultipleAddressCheckout"/>
+        <step name="proceedToMultipleAddressCheckout" module="Magento_Multishipping" next="fillCustomerAddresses"/>
+        <step name="fillCustomerAddresses" module="Magento_Multishipping"/>
+    </scenario>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Address.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Address.php
new file mode 100644
index 0000000000000..d00ecb9dec1e4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Address.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Multishipping\Test\Block\Checkout;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Element\SelectElement;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Edit Shipping Address Form.
+ */
+class Address extends Block
+{
+    /**
+     * Fields to collect from.
+     *
+     * @var array
+     */
+    private static $fields = [
+        'firstname',
+        'lastname',
+        'company',
+        'telephone',
+        'street_1',
+        'street_2',
+        'city',
+        'region_id',
+        'zip',
+        'country'
+    ];
+
+    /**
+     * Collect address data.
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        $data = [];
+        foreach (self::$fields as $field) {
+            if ($field == 'region_id' || $field == 'country') {
+                /** @var SelectElement $element */
+                $element = $this->_rootElement->find('#' . $field, Locator::SELECTOR_CSS, 'select');
+                $data[$field] = $element->getValue();
+            } else {
+                $data[$field] = $this->_rootElement->find('#' . $field)->getValue();
+            }
+        }
+        $data['street'] = rtrim($data['street_1'] . ' ' . $data['street_2']);
+        $data['country_id'] = $data['country'];
+        $data['postcode'] = $data['zip'];
+        unset($data['street_1']);
+        unset($data['street_2']);
+        unset($data['country']);
+        unset($data['zip']);
+
+        return $data;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php
index 741e06d6bd317..f613683eaf86b 100644
--- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Shipping.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Multishipping\Test\Block\Checkout;
 
-use Magento\Multishipping\Test\Fixture\GuestPaypalDirect;
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
 
@@ -57,4 +56,22 @@ public function clickContinueButton()
     {
         $this->_rootElement->find($this->continueButton)->click();
     }
+
+    /**
+     * Click change button.
+     *
+     * @param string $street
+     * @return void
+     */
+    public function clickChangeAddress($street)
+    {
+        $addresses = $this->_rootElement->getElements('.box-shipping-address');
+        foreach ($addresses as $address) {
+            $arrayAddr = explode(PHP_EOL, $address->find('address')->getText());
+            if ($arrayAddr[2] == $street) {
+                $address->find('a')->click();
+                break;
+            }
+        }
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingAddresses.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingAddresses.php
new file mode 100644
index 0000000000000..9bca404eaca02
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Constraint/AssertMultishippingAddresses.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Multishipping\Test\Constraint;
+
+use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Multishipping\Test\Page\MultishippingCheckoutShipping;
+use Magento\Multishipping\Test\Page\MultishippingEditAddress;
+
+/**
+ * Assert that addresses information on edit page is complete and correct.
+ */
+class AssertMultishippingAddresses extends AbstractConstraint
+{
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    /**
+     * Assert that address information on edit page is same as in fixture and complete.
+     *
+     * @param Customer $customer
+     * @param MultishippingCheckoutShipping $checkoutShipping
+     * @param MultishippingEditAddress $multishippingEditAddress
+     * @return void
+     */
+    public function processAssert(
+        Customer $customer,
+        MultishippingCheckoutShipping $checkoutShipping,
+        MultishippingEditAddress $multishippingEditAddress
+    ) {
+        $addresses = $customer->getAddress();
+        foreach ($addresses as $address) {
+            $checkoutShipping->getShippingBlock()->clickChangeAddress($address['street']);
+            $formData = $multishippingEditAddress->getAddressBlock()->getData();
+            list($address, $formData) = $this->processData($address, $formData);
+
+            \PHPUnit_Framework_Assert::assertEquals(
+                serialize($address),
+                serialize($formData),
+                'Address does not displayed correctly.'
+            );
+            $checkoutShipping->open();
+        }
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Addresses information on edit page is complete and correct.';
+    }
+
+    /**
+     * @param array $address
+     * @param array $formData
+     * @return array
+     */
+    private function processData($address, $formData)
+    {
+        unset($address['email']);
+        unset($address['default_billing']);
+        unset($address['default_shipping']);
+        ksort($address);
+        ksort($formData);
+
+        return [$address, $formData];
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingEditAddress.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingEditAddress.xml
new file mode 100644
index 0000000000000..843fad75485cd
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingEditAddress.xml
@@ -0,0 +1,12 @@
+<?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/etc/pages.xsd">
+    <page name="MultishippingEditAddress" mca="multishipping/checkout_address/editShipping" module="Magento_Multishipping">
+        <block name="addressBlock" class="Magento\Multishipping\Test\Block\Checkout\Address" locator=".form-address-edit" strategy="css selector"/>
+    </page>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Attributes/ListingTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Attributes/ListingTest.php
new file mode 100644
index 0000000000000..d86e39d20017e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Attributes/ListingTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Attributes;
+
+/**
+ * Test sorting in product attribute grid
+ */
+class ListingTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Catalog\Ui\DataProvider\Product\Attributes\Listing */
+    private $dataProvider;
+
+    /** @var \Magento\Framework\App\RequestInterface */
+    private $request;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\App\RequestInterface $request */
+        $this->request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+
+        /** Default Attribute Set Id is equal 4 */
+        $this->request->setParams(['template_id' => 4]);
+
+        $this->dataProvider = $objectManager->create(
+            \Magento\Catalog\Ui\DataProvider\Product\Attributes\Listing::class,
+            [
+                'name' => 'product_attributes_grid_data_source',
+                'primaryFieldName' => 'attribute_id',
+                'requestFieldName' => 'id',
+                'request' => $this->request,
+            ]
+        );
+    }
+
+    public function testGetDataSortedAsc()
+    {
+        $this->dataProvider->addOrder('attribute_code', 'asc');
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(2, $data['totalRecords']);
+        $this->assertEquals('color', $data['items'][0]['attribute_code']);
+        $this->assertEquals('manufacturer', $data['items'][1]['attribute_code']);
+    }
+
+    public function testGetDataSortedDesc()
+    {
+        $this->dataProvider->addOrder('attribute_code', 'desc');
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(2, $data['totalRecords']);
+        $this->assertEquals('manufacturer', $data['items'][0]['attribute_code']);
+        $this->assertEquals('color', $data['items'][1]['attribute_code']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 56339e9bc16ee..8cd4007a5e824 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -570,54 +570,8 @@ protected function getOptionValues(\Magento\Catalog\Model\Product\Option $option
      */
     public function testSaveMediaImage()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
-        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-
-        $source = $this->objectManager->create(
-            \Magento\ImportExport\Model\Import\Source\Csv::class,
-            [
-                'file' => __DIR__ . '/_files/import_media.csv',
-                'directory' => $directory
-            ]
-        );
-        $this->_model->setParameters(
-            [
-                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-                'entity' => 'catalog_product',
-                'import_images_file_dir' => 'pub/media/import'
-            ]
-        );
-        $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
-            ->getBootstrap()
-            ->getApplication()
-            ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
-        $uploader = $this->_model->getUploader();
-
-        $destDir = $directory->getRelativePath(
-            $appParams[DirectoryList::MEDIA][DirectoryList::PATH] . '/catalog/product'
-        );
-        $tmpDir = $directory->getRelativePath($appParams[DirectoryList::MEDIA][DirectoryList::PATH] . '/import');
-
-        $directory->create($destDir);
-        $this->assertTrue($uploader->setDestDir($destDir));
-        $this->assertTrue($uploader->setTmpDir($tmpDir));
-        $errors = $this->_model->setSource(
-            $source
-        )->validateData();
-
-        $this->assertTrue($errors->getErrorsCount() == 0);
-        $this->_model->importData();
-        $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
-
-        $resource = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
-        $productId = $resource->getIdBySku('simple_new');
-
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load($productId);
+        $this->importDataForMediaTest('import_media.csv');
+        $product = $this->getProductBySku('simple_new');
 
         $this->assertEquals('/m/a/magento_image.jpg', $product->getData('image'));
         $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
@@ -1248,12 +1202,12 @@ public function testProductWithLinks()
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/products_to_import_with_product_links.csv';
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\Filesystem'
+            \Magento\Framework\Filesystem::class
         );
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
-            '\Magento\ImportExport\Model\Import\Source\Csv',
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
             [
                 'file' => $pathToFile,
                 'directory' => $directory
@@ -1272,7 +1226,7 @@ public function testProductWithLinks()
         $this->_model->importData();
 
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $resource = $objectManager->get('Magento\Catalog\Model\ResourceModel\Product');
+        $resource = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
         $productId = $resource->getIdBySku('simple4');
         /** @var \Magento\Catalog\Model\Product $product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -1306,10 +1260,10 @@ public function testExistingProductWithUrlKeys()
             'simple3' => 'url-key3'
         ];
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Framework\Filesystem');
+            ->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
-            '\Magento\ImportExport\Model\Import\Source\Csv',
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
             [
                 'file' => __DIR__ . '/_files/products_to_import_with_valid_url_keys.csv',
                 'directory' => $directory
@@ -1344,10 +1298,10 @@ public function testProductWithUseConfigSettings()
             'simple3' => false
         ];
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Framework\Filesystem');
+            ->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
-            '\Magento\ImportExport\Model\Import\Source\Csv',
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
             [
                 'file' => __DIR__ . '/_files/products_to_import_with_use_config_settings.csv',
                 'directory' => $directory
@@ -1482,6 +1436,69 @@ public function testProductWithWrappedAdditionalAttributes()
             $product2->getData('multiselect_attribute'));
     }
 
+
+    /**
+     * Import and check data from file.
+     *
+     * @param string $fileName
+     */
+    private function importDataForMediaTest($fileName)
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/' . $fileName,
+                'directory' => $directory,
+            ]
+        );
+        $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product',
+                'import_images_file_dir' => 'pub/media/import',
+            ]
+        );
+        $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
+            ->getBootstrap()
+            ->getApplication()
+            ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+        $uploader = $this->_model->getUploader();
+
+        $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+        $destDir = $directory->getRelativePath($mediaPath . '/catalog/product');
+        $tmpDir = $directory->getRelativePath($mediaPath . '/import');
+
+        $directory->create($destDir);
+        $this->assertTrue($uploader->setDestDir($destDir));
+        $this->assertTrue($uploader->setTmpDir($tmpDir));
+        $errors = $this->_model->setSource(
+            $source
+        )->validateData();
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+        $this->assertTrue($this->_model->getErrorAggregator()->getErrorsCount() == 0);
+    }
+
+    /**
+     * Load product by given product sku.
+     *
+     * @param string $sku
+     * @return \Magento\Catalog\Model\Product
+     */
+    private function getProductBySku($sku)
+    {
+        $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $productId = $resource->getIdBySku($sku);
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $product->load($productId);
+
+        return $product;
+    }
+
     /**
      * @param array $row
      * @param string|null $behavior
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php
index 40a1631233d1d..c7da83df5feee 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php
@@ -48,18 +48,29 @@ public function testGenerateSimpleProducts($productsData)
         $this->_product->setNewVariationsAttributeSetId(4);
         // Default attribute set id
         $generatedProducts = $this->_model->generateSimpleProducts($this->_product, $productsData);
-        $this->assertEquals(3, count($generatedProducts));
+        $this->assertEquals(4, count($generatedProducts));
         foreach ($generatedProducts as $productId) {
             $stockItem = $this->stockRegistry->getStockItem($productId);
             /** @var $product \Magento\Catalog\Model\Product */
             $product = Bootstrap::getObjectManager()->create(
-                'Magento\Catalog\Model\Product'
+                \Magento\Catalog\Model\Product::class
             );
             $product->load($productId);
+
+            $productDataWeight = null;
+            foreach ($productsData as $productItemData) {
+                if ($productItemData['name'] == $product->getName()
+                    && isset($productItemData['weight'])
+                ) {
+                    $productDataWeight = (int)$productItemData['weight'];
+                    break;
+                }
+            }
+
             $this->assertNotNull($product->getName());
             $this->assertNotNull($product->getSku());
             $this->assertNotNull($product->getPrice());
-            $this->assertNotNull($product->getWeight());
+            $this->assertEquals($productDataWeight, (int)$product->getWeight());
             $this->assertEquals('1', $stockItem->getIsInStock());
         }
     }
@@ -113,6 +124,14 @@ public static function generateSimpleProductsDataProvider()
                         'quantity_and_stock_status' => ['qty' => '5'],
                         'weight' => '6'
                     ],
+                    [
+                        'name' => '1-ddd',
+                        'configurable_attribute' => '{"configurable_attribute":"22"}',
+                        'price' => '3',
+                        'sku' => '1-ddd',
+                        'quantity_and_stock_status' => ['qty' => '5'],
+                        'weight' => ''
+                    ],
                 ],
             ]
         ];
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index e6df9f0f37815..16c44ef064740 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1441,17 +1441,19 @@
      * Validate single element.
      *
      * @param {Element} element
+     * @param {Object} config
      * @returns {*}
      */
-    $.validator.validateSingleElement = function (element) {
+    $.validator.validateSingleElement = function (element, config) {
         var errors = {},
             valid = true,
             validateConfig = {
                 errorElement: 'label',
                 ignore: '.ignore-validate'
             },
-            form, validator, classes;
+            form, validator, classes, elementValue;
 
+        $.extend(validateConfig, config);
         element = $(element).not(validateConfig.ignore);
 
         if (!element.length) {
@@ -1475,7 +1477,11 @@
         validator.toShow = validator.toHide = $([]);
 
         $.each(classes, $.proxy(function (i, className) {
-            if (this.methods[className] && !this.methods[className](element.val(), element.get(0))) {
+            elementValue = element.val();
+            if (element.is(':checkbox') || element.is(':radio')) {
+                elementValue = element.is(':checked') || null;
+            }
+            if (this.methods[className] && !this.methods[className](elementValue, element.get(0))) {
                 valid = false;
                 errors[element.get(0).name] = this.messages[className];
                 validator.invalid[element.get(0).name] = true;
diff --git a/setup/src/Magento/Setup/Module/I18n/Context.php b/setup/src/Magento/Setup/Module/I18n/Context.php
index a3901a27a63db..0c12249e0e991 100644
--- a/setup/src/Magento/Setup/Module/I18n/Context.php
+++ b/setup/src/Magento/Setup/Module/I18n/Context.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Setup\Module\I18n;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Filesystem;
 
@@ -93,7 +92,7 @@ private function getComponentName($componentType, $path)
      *
      * @param string $type
      * @param array $value
-     * @return string
+     * @return string|null
      * @throws \InvalidArgumentException
      */
     public function buildPathToLocaleDirectoryByContext($type, $value)
@@ -111,6 +110,7 @@ public function buildPathToLocaleDirectoryByContext($type, $value)
             default:
                 throw new \InvalidArgumentException(sprintf('Invalid context given: "%s".', $type));
         }
-        return $path . '/' . self::LOCALE_DIRECTORY . '/';
+
+        return (null === $path) ? null : $path . '/' . self::LOCALE_DIRECTORY . '/';
     }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/ContextTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/ContextTest.php
index 89a7ef3e91118..3857d02dbd73d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/ContextTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/ContextTest.php
@@ -22,7 +22,13 @@ class ContextTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->componentRegistrar = $this->getMock('Magento\Framework\Component\ComponentRegistrar', [], [], '', false);
+        $this->componentRegistrar = $this->getMock(
+            \Magento\Framework\Component\ComponentRegistrar::class,
+            [],
+            [],
+            '',
+            false
+        );
     }
 
     /**
@@ -35,7 +41,7 @@ public function testGetContextByPath($context, $path, $pathValues)
     {
         $this->componentRegistrar->expects($this->any())
             ->method('getPaths')
-            ->will($this->returnValueMap($pathValues));
+            ->willReturnMap($pathValues);
         $this->context = new Context($this->componentRegistrar);
         $this->assertEquals($context, $this->context->getContextByPath($path));
     }
@@ -102,10 +108,8 @@ public function testBuildPathToLocaleDirectoryByContext($path, $context, $regist
             $paths[$module[1]] = $module[2];
         }
         $this->componentRegistrar->expects($this->any())
-            ->method('getPaths')
-            ->with(ComponentRegistrar::MODULE)
-            ->willReturn($paths);
-        $this->componentRegistrar->expects($this->any())->method('getPath')->will($this->returnValueMap($registrar));
+            ->method('getPath')
+            ->willReturnMap($registrar);
         $this->context = new Context($this->componentRegistrar);
         $this->assertEquals($path, $this->context->buildPathToLocaleDirectoryByContext($context[0], $context[1]));
     }
@@ -119,10 +123,28 @@ public function dataProviderPathToLocaleDirectoryByContext()
             [
                 BP . '/app/code/Magento/Module/i18n/',
                 [Context::CONTEXT_TYPE_MODULE, 'Magento_Module'],
-                [[ComponentRegistrar::MODULE, 'Magento_Module', BP . '/app/code/Magento/Module']]
+                [[ComponentRegistrar::MODULE, 'Magento_Module', BP . '/app/code/Magento/Module']],
+            ],
+            [
+                BP . '/app/design/frontend/Magento/luma/i18n/',
+                [Context::CONTEXT_TYPE_THEME, 'frontend/Magento/luma'],
+                [[ComponentRegistrar::THEME, 'frontend/Magento/luma', BP . '/app/design/frontend/Magento/luma']],
+            ],
+            [
+                null,
+                [Context::CONTEXT_TYPE_MODULE, 'Unregistered_Module'],
+                [[ComponentRegistrar::MODULE, 'Unregistered_Module', null]],
+            ],
+            [
+                null,
+                [Context::CONTEXT_TYPE_THEME, 'frontend/Magento/unregistered'],
+                [[ComponentRegistrar::THEME, 'frontend/Magento/unregistered', null]],
+            ],
+            [
+                BP . '/lib/web/i18n/',
+                [Context::CONTEXT_TYPE_LIB, 'lib/web/module/test.phtml'],
+                [],
             ],
-            ['/i18n/', [Context::CONTEXT_TYPE_THEME, 'theme/test.phtml'], []],
-            [BP . '/lib/web/i18n/', [Context::CONTEXT_TYPE_LIB, 'lib/web/module/test.phtml'], []],
         ];
     }
 
@@ -132,10 +154,8 @@ public function dataProviderPathToLocaleDirectoryByContext()
      */
     public function testBuildPathToLocaleDirectoryByContextWithInvalidType()
     {
-        $this->componentRegistrar->expects($this->any())
-            ->method('getPaths')
-            ->with(ComponentRegistrar::MODULE)
-            ->willReturn(['module' => '/path/to/module']);
+        $this->componentRegistrar->expects($this->never())
+            ->method('getPath');
         $this->context = new Context($this->componentRegistrar);
         $this->context->buildPathToLocaleDirectoryByContext('invalid_type', 'Magento_Module');
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/AbstractFileTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/AbstractFileTest.php
new file mode 100644
index 0000000000000..08c064eee008e
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/AbstractFileTest.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Test\Unit\Module\I18n\Pack\Writer\File;
+
+use Magento\Setup\Module\I18n\Context;
+use Magento\Setup\Module\I18n\Locale;
+use Magento\Setup\Module\I18n\Dictionary;
+use Magento\Setup\Module\I18n\Dictionary\Phrase;
+use Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Tests for Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile
+ */
+class AbstractFileTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Locale|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeMock;
+
+    /**
+     * @var Dictionary|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dictionaryMock;
+
+    /**
+     * @var Phrase|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $phraseMock;
+
+    /**
+     * @var AbstractFile|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $object;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->contextMock = $this->getMock(Context::class, [], [], '', false, false);
+        $this->localeMock = $this->getMock(Locale::class, [], [], '', false, false);
+        $this->dictionaryMock = $this->getMock(Dictionary::class, [], [], '', false, false);
+        $this->phraseMock = $this->getMock(Phrase::class, [], [], '', false, false);
+
+        $constructorArguments = $objectManagerHelper->getConstructArguments(
+            AbstractFile::class,
+            ['context' => $this->contextMock]
+        );
+
+        $this->object = $this->getMockBuilder(AbstractFile::class)
+            ->setMethods(['_createDirectoryIfNotExist', '_writeFile'])
+            ->setConstructorArgs($constructorArguments)
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * @param string $contextType
+     * @param array $contextValue
+     * @dataProvider writeDictionaryWithRuntimeExceptionDataProvider
+     * @expectedException \RuntimeException
+     * @return void
+     */
+    public function testWriteDictionaryWithRuntimeException(
+        $contextType,
+        array $contextValue
+    ) {
+        $this->configureGeneralPhrasesMock($contextType, $contextValue);
+
+        $this->object->expects($this->never())
+            ->method('_createDirectoryIfNotExist');
+        $this->object->expects($this->never())
+            ->method('_writeFile');
+        $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function writeDictionaryWithRuntimeExceptionDataProvider()
+    {
+        return [
+            ['', []],
+            ['module', []],
+            ['', ['Magento_Module']],
+        ];
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Some error. Row #1.
+     * @return void
+     */
+    public function testWriteDictionaryWithInvalidArgumentException()
+    {
+        $contextType = 'module';
+        $contextValue = 'Magento_Module';
+
+        $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
+
+        $this->object->expects($this->never())
+            ->method('_createDirectoryIfNotExist');
+        $this->object->expects($this->never())
+            ->method('_writeFile');
+
+        $this->contextMock->expects($this->once())
+            ->method('buildPathToLocaleDirectoryByContext')
+            ->with($contextType, $contextValue)
+            ->willThrowException(new \InvalidArgumentException('Some error.'));
+
+        $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testWriteDictionaryWherePathIsNull()
+    {
+        $contextType = 'module';
+        $contextValue = 'Magento_Module';
+
+        $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
+
+        $this->object->expects($this->never())
+            ->method('_createDirectoryIfNotExist');
+        $this->object->expects($this->never())
+            ->method('_writeFile');
+
+        $this->contextMock->expects($this->once())
+            ->method('buildPathToLocaleDirectoryByContext')
+            ->with($contextType, $contextValue)
+            ->willReturn(null);
+
+        $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testWriteDictionary()
+    {
+        $contextType = 'module';
+        $contextValue = 'Magento_Module';
+        $path = '/some/path/';
+        $phrase = 'Phrase';
+        $locale = 'en_EN';
+        $fileExtension = 'csv';
+        $file = $path . $locale . '.' . $fileExtension;
+
+        $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
+
+        $this->phraseMock->expects($this->once())
+            ->method('getPhrase')
+            ->willReturn($phrase);
+
+        $this->localeMock->expects($this->once())
+            ->method('__toString')
+            ->willReturn($locale);
+
+        $this->object->expects($this->once())
+            ->method('_getFileExtension')
+            ->willReturn($fileExtension);
+        $this->object->expects($this->once())
+            ->method('_createDirectoryIfNotExist')
+            ->with(dirname($file));
+        $this->object->expects($this->once())
+            ->method('_writeFile')
+            ->with($file, [$phrase => $this->phraseMock]);
+
+        $this->contextMock->expects($this->once())
+            ->method('buildPathToLocaleDirectoryByContext')
+            ->with($contextType, $contextValue)
+            ->willReturn($path);
+
+        $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
+    }
+
+    /**
+     * @param string $contextType
+     * @param array $contextValue
+     * @return void
+     */
+    private function configureGeneralPhrasesMock($contextType, array $contextValue)
+    {
+        $this->phraseMock->expects($this->any())
+            ->method('getContextType')
+            ->willReturn($contextType);
+
+        $this->phraseMock->expects($this->any())
+            ->method('getContextValue')
+            ->willReturn($contextValue);
+
+        $this->dictionaryMock->expects($this->once())
+            ->method('getPhrases')
+            ->willReturn([$this->phraseMock]);
+    }
+}