MAGETWO-45552: Serious image issues when creating the first product in a new attribute set

Author: Michail Slabko

app/code/Magento/Eav/Model/Entity/Attribute/Set.php

@@ -190,16 +190,7 @@ public function organizeData($data)
         }
         if ($data['groups']) {
             foreach ($data['groups'] as $group) {
-                $modelGroup = $this->_attrGroupFactory->create();
-                $modelGroup->setId(
-                    is_numeric($group[0]) && $group[0] > 0 ? $group[0] : null
-                )->setAttributeGroupName(
-                    $group[1]
-                )->setAttributeSetId(
-                    $this->getId()
-                )->setSortOrder(
-                    $group[2]
-                );
+                $modelGroup = $this->initGroupModel($group);
 
                 if ($data['attributes']) {
                     foreach ($data['attributes'] as $attribute) {
@@ -253,6 +244,31 @@ public function organizeData($data)
         return $this;
     }
 
+    /**
+     * @param array $group
+     * @return Group
+     */
+    private function initGroupModel($group)
+    {
+        $modelGroup = $this->_attrGroupFactory->create();
+        $modelGroup->setId(
+            is_numeric($group[0]) && $group[0] > 0 ? $group[0] : null
+        )->setAttributeGroupName(
+            $group[1]
+        )->setAttributeSetId(
+            $this->getId()
+        )->setSortOrder(
+            $group[2]
+        );
+        if ($modelGroup->getId()) {
+            $group = $this->_attrGroupFactory->create()->load($modelGroup->getId());
+            if ($group->getId()) {
+                $modelGroup->setAttributeGroupCode($group->getAttributeGroupCode());
+            }
+        }
+        return $modelGroup;
+    }
+
     /**
      * Validate attribute set name
      *