From f048d0aedecd6f6b9cbb21a21f38364f48d3510b Mon Sep 17 00:00:00 2001
From: in-session <info@in-session.de>
Date: Wed, 5 Oct 2022 08:04:53 +0200
Subject: [PATCH 1/5] Update View.php

---
 app/code/Magento/Catalog/Helper/Product/View.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index ca9b550ca31de..25cc0e3aec18c 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -190,11 +190,13 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
 
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
+        $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
+                $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);
             }
         }
 

From d09a80487a48024f1d8e00eb547d8e290295339b Mon Sep 17 00:00:00 2001
From: in-session <info@in-session.de>
Date: Wed, 5 Oct 2022 08:34:52 +0200
Subject: [PATCH 2/5] Update View.php

---
 app/code/Magento/Catalog/Helper/Product/View.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 25cc0e3aec18c..3d50f2d188469 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -188,15 +188,15 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
             }
         }
 
-        $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
+        $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);        
         $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
+        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
                 $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
 

From 0732463d899b7b8e364ca8ad11d172592d037230 Mon Sep 17 00:00:00 2001
From: in-session <info@in-session.de>
Date: Wed, 5 Oct 2022 08:54:53 +0200
Subject: [PATCH 3/5] Update View.php

---
 app/code/Magento/Catalog/Helper/Product/View.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 3d50f2d188469..62a10782d8cc4 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -184,6 +184,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
         if ($params && $params->getBeforeHandles()) {
             foreach ($params->getBeforeHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }

From 75d55c36477066979c932831e132fb0be0b939b0 Mon Sep 17 00:00:00 2001
From: in-session <info@in-session.de>
Date: Fri, 14 Oct 2022 08:46:52 +0200
Subject: [PATCH 4/5] Update View.php

---
 app/code/Magento/Catalog/Helper/Product/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 62a10782d8cc4..753c14f068d60 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -189,7 +189,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
             }
         }
 
-        $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);        
+        $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
         $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 

From 55448c832587da7831008e345ab7ce85a9bd6f85 Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Tue, 24 Dec 2024 13:20:50 +0530
Subject: [PATCH 5/5] 36244: fix static failure

---
 app/code/Magento/Catalog/Helper/Product/View.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index c19aa23f57311..4ba14794bb088 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Helper\Product;