Merge remote-tracking branch 'origin/MC-33361' into 2.4-develop-pr23

Author: serhii-balko

app/code/Magento/Customer/Controller/Account/CreatePost.php

@@ -149,6 +149,11 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, Ht
      */
     private $customerRepository;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -266,9 +271,15 @@ protected function extractAddress()
         $addressData = [];
 
         $regionDataObject = $this->regionDataFactory->create();
+        $userDefinedAttr = $this->getRequest()->getParam('address') ?: [];
         foreach ($allowedAttributes as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
-            $value = $this->getRequest()->getParam($attributeCode);
+            if ($attribute->isUserDefined()) {
+                $value = array_key_exists($attributeCode, $userDefinedAttr) ? $userDefinedAttr[$attributeCode] : null;
+            } else {
+                $value = $this->getRequest()->getParam($attributeCode);
+            }
+
             if ($value === null) {
                 continue;
             }
@@ -283,6 +294,9 @@ protected function extractAddress()
                     $addressData[$attributeCode] = $value;
             }
         }
+        $addressData = $addressForm->compactData($addressData);
+        unset($addressData['region_id'], $addressData['region']);
+
         $addressDataObject = $this->addressDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,