diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index e56711f361de2..3141cbb933c5e 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Result\Page as ResultPage;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Catalog category helper
@@ -173,25 +174,57 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
         }
 
         $urlSafeSku = rawurlencode($product->getSku());
+      
+        $enableIdHandle = $this->scopeConfig->isSetFlag(
+            'catalog/layout_settings/enable_id_handle',
+            ScopeInterface::SCOPE_STORE
+        );
+        $enableAttributeSetHandle = $this->scopeConfig->isSetFlag(
+            'catalog/layout_settings/enable_attribute_set_handle',
+            ScopeInterface::SCOPE_STORE
+        );
 
         // Load default page handles and page configurations
         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);
+                if ($enableAttributeSetHandle) {
+                    $resultPage->addPageLayoutHandles(
+                        ['attribute_set' => $product->getAttributeSetId()],
+                        $handle,
+                        false
+                    );
+                }
+                if ($enableIdHandle) {
+                    $resultPage->addPageLayoutHandles(
+                        ['id' => $product->getId(), 'sku' => $urlSafeSku],
+                        $handle
+                    );
+                }
             }
         }
 
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
-        $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
+        if ($enableAttributeSetHandle) {
+            $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
+        }
+        if ($enableIdHandle) {
+            $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(['attribute_set' => $product->getAttributeSetId()], $handle, false);
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
+                if ($enableAttributeSetHandle) {
+                    $resultPage->addPageLayoutHandles(
+                        ['attribute_set' => $product->getAttributeSetId()],
+                        $handle,
+                        false
+                    );
+                }
+                if ($enableIdHandle) {
+                    $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
+                }
             }
         }
 
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index e82b08b5229bd..614e988eabd21 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
@@ -240,6 +240,22 @@
                     <comment>Jpeg quality for resized images 1-100%.</comment>
                 </field>
             </group>
+        </section>        
+        <section id="dev" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Developer</label>
+            <tab>advanced</tab>
+            <resource>Magento_Developer::config</resource>
+            <group id="layout_settings" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                <label>Product Layout Handles</label>
+                <field id="enable_id_handle" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Enable Layout Handle by Product ID</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="enable_attribute_set_handle" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Enable Layout Handle by Attribute Set</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index 04f5e8fb3e883..c38f31d796e04 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
@@ -97,6 +97,12 @@
                     <datetime>datetime</datetime>
                 </input_types>
             </validator_data>
-        </general>
+        </general>        
+        <dev>
+            <layout_settings>
+                <enable_id_handle>1</enable_id_handle>
+                <enable_attribute_set_handle>0</enable_attribute_set_handle>
+            </layout_settings>
+        </dev>
     </default>
 </config>