#3401: Merge branch 'develop' of github.com:magento/magento2 into feature/catalog-extensible-gallery-images

Author: ishakhsuvarov

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -167,6 +167,10 @@ public function __construct(
      */
     protected function parseSelections($rowData, $entityId)
     {
+        if (empty($rowData['bundle_values'])) {
+            return [];
+        }
+
         $rowData['bundle_values'] = str_replace(
             self::BEFORE_OPTION_VALUE_DELIMITER,
             $this->_entityModel->getMultipleValueSeparator(),

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -309,6 +309,11 @@ public function testSaveDataProvider()
                 'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],
                 'allowImport' => false
             ],
+            'Import without bundle values' => [
+                'skus' => ['newSku' => ['sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle']]],
+                'bunch' => ['sku' => 'sku', 'name' => 'name'],
+                'allowImport' => true,
+            ],
             [
                 'skus' => ['newSku' => [
                     'sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle'],