Merge remote-tracking branch 'origin/MAGETWO-90336' into 2.3-develop-pr14

Author: ameysar

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -468,7 +468,7 @@ public function testGetCustomAttributes()
         );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($customAttributeCode, $newCustomAttributeValue);
+        $this->category->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
         $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
         $this->assertEquals(

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1305,7 +1305,7 @@ public function testGetCustomAttributes()
         );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($customAttributeCode, $newCustomAttributeValue);
+        $this->model->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
         $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
         $this->assertEquals(

lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php

@@ -113,7 +113,12 @@ protected function initializeCustomAttributes()
             $customAttributeCodes = $this->getCustomAttributesCodes();
 
             foreach ($customAttributeCodes as $customAttributeCode) {
-                if (isset($this->_data[$customAttributeCode])) {
+                if (isset($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode])) {
+                    $customAttribute = $this->customAttributeFactory->create()
+                        ->setAttributeCode($customAttributeCode)
+                        ->setValue($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode]->getValue());
+                    $customAttributes[$customAttributeCode] = $customAttribute;
+                } elseif (isset($this->_data[$customAttributeCode])) {
                     $customAttribute = $this->customAttributeFactory->create()
                         ->setAttributeCode($customAttributeCode)
                         ->setValue($this->_data[$customAttributeCode]);