Merge branch '2.2.10-develop' of https://github.com/magento/magento2ce into MAGETWO-99413

Author: Oleksandr Gorkun

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php

@@ -78,7 +78,13 @@ public function getOptions()
                 \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC
             );
 
-        return $collection->getData();
+        $collectionData = $collection->getData() ?? [];
+
+        array_walk($collectionData, function (&$attribute) {
+            $attribute['__disableTmpl'] = true;
+        });
+
+        return $collectionData;
     }
 
     /**