Merge remote-tracking branch 'sprank/issue-36409' into AC-7039

Author: glo17720

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -8,11 +8,11 @@
 namespace Magento\CustomerImportExport\Model\Import;
 
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\ImportExport\Model\Import;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\ImportExport\Model\Import\AbstractSource;
 use Magento\Customer\Model\Indexer\Processor;
 use Magento\Framework\App\ObjectManager;
+use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\AbstractSource;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
  * Customer entity import
@@ -41,6 +41,8 @@ class Customer extends AbstractCustomer
 
     public const COLUMN_PASSWORD = 'password';
 
+    public const COLUMN_DISABLE_AUTO_GROUP_CHANGE = 'disable_auto_group_change';
+
     /**#@-*/
 
     /**#@+
@@ -162,6 +164,7 @@ class Customer extends AbstractCustomer
         'failures_num',
         'first_failure',
         'lock_expires',
+        self::COLUMN_DISABLE_AUTO_GROUP_CHANGE,
     ];
 
     /**
@@ -488,6 +491,9 @@ protected function _prepareDataForUpdate(array $rowData)
             } else {
                 $entityRow['store_id'] = $this->getCustomerStoreId($emailInLowercase, $rowData[self::COLUMN_WEBSITE]);
             }
+            if (!empty($rowData[self::COLUMN_DISABLE_AUTO_GROUP_CHANGE])) {
+                $entityRow[self::COLUMN_DISABLE_AUTO_GROUP_CHANGE] = $rowData[self::COLUMN_DISABLE_AUTO_GROUP_CHANGE];
+            }
             $entitiesToUpdate[] = $entityRow;
         }