From 5d9b89c08ac8feb223d1c3e8f03ffd44ad18b310 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Mon, 19 Oct 2020 14:16:14 +0200
Subject: [PATCH 01/13] Metallic remapping

---
 .../CHANGELOG.md                              |  1 +
 .../Documentation~/Lit-Shader.md              |  2 ++
 .../UIBlocks/LitSurfaceInputsUIBlock.cs       | 27 +++++++++++++++----
 .../Material/LayeredLit/LayeredLit.shader     |  5 ++++
 .../LayeredLit/LayeredLitTessellation.shader  |  5 ++++
 .../Runtime/Material/Lit/Lit.shader           |  1 +
 .../Material/Lit/LitDataIndividualLayer.hlsl  |  4 +--
 .../Runtime/Material/Lit/LitProperties.hlsl   | 15 ++++++++---
 .../Material/Lit/LitTessellation.shader       |  1 +
 9 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index e4f142d1b14..f79f00b2d06 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a new ray tracing only function that samples the specular part of the materials.
 - Adding missing marker for ray tracing profiling (RaytracingDeferredLighting)
 - Added the support of eye shader for ray tracing.
+- Added range remapping to metallic property for Lit shaders.
 
 ### Fixed
 - Fixed several issues with physically-based DoF (TAA ghosting of the CoC buffer, smooth layer transitions, etc)
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
index ad5fd4dbb03..0e0c4ec784d 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
@@ -38,6 +38,8 @@ To create a new Lit Material, navigate to your Project's Asset window, right-cli
 | **Property**                    | **Description**                                              |
 | ------------------------------- | ------------------------------------------------------------ |
 | **Base Map**                    | Assign a Texture that controls both the color and opacity of your Material. To assign a Texture to this field, click the radio button and select your Texture in the Select Texture window. Use the color picker to select the color of the Material. If you do not assign a Texture, this is the absolute color of the Material. If you do assign a Texture, the final color of the Material is a combination of the Texture you assign and the color you select. The alpha value of the color controls the transparency level for the Material if you select **Transparent** from the **Surface Type** drop-down. |
+| **Metallic**                    | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1). When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
+| **Metallic Remapping**          | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Smoothness**                  | Use the slider to adjust the smoothness of your Material. Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a perfectly smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
 | **Smoothness Remapping**        | Use this min-max slider to remap the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Ambient Occlusion Remapping** | Use this min-max slider to remap the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
index 0c08bbaf046..a6ce4271488 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
@@ -33,6 +33,7 @@ public class Styles
             public static GUIContent baseColorText = new GUIContent("Base Map", "Specifies the base color (RGB) and opacity (A) of the Material.");
 
             public static GUIContent metallicText = new GUIContent("Metallic", "Controls the scale factor for the Material's metallic effect.");
+            public static GUIContent metallicRemappingText = new GUIContent("Metallic Remapping", "Controls a remap for the metallic channel in the Mask Map.");
             public static GUIContent smoothnessText = new GUIContent("Smoothness", "Controls the scale factor for the Material's smoothness.");
             public static GUIContent smoothnessRemappingText = new GUIContent("Smoothness Remapping", "Controls a remap for the smoothness channel in the Mask Map.");
             public static GUIContent aoRemappingText = new GUIContent("Ambient Occlusion Remapping", "Controls a remap for the ambient occlusion channel in the Mask Map.");
@@ -113,6 +114,8 @@ public class Styles
         const string kBaseColorMap = "_BaseColorMap";
         MaterialProperty[] metallic = new MaterialProperty[kMaxLayerCount];
         const string kMetallic = "_Metallic";
+        MaterialProperty[] metallicRemapMin = new MaterialProperty[kMaxLayerCount];
+        const string kMetallicRemapMin = "_MetallicRemapMin";
         MaterialProperty[] smoothness = new MaterialProperty[kMaxLayerCount];
         const string kSmoothness = "_Smoothness";
         MaterialProperty[] smoothnessRemapMin = new MaterialProperty[kMaxLayerCount];
@@ -269,6 +272,7 @@ public override void LoadMaterialProperties()
             baseColor = FindPropertyLayered(kBaseColor, m_LayerCount);
             baseColorMap = FindPropertyLayered(kBaseColorMap, m_LayerCount);
             metallic = FindPropertyLayered(kMetallic, m_LayerCount);
+            metallicRemapMin = FindPropertyLayered(kMetallicRemapMin, m_LayerCount);
             smoothness = FindPropertyLayered(kSmoothness, m_LayerCount);
             smoothnessRemapMin = FindPropertyLayered(kSmoothnessRemapMin, m_LayerCount);
             smoothnessRemapMax = FindPropertyLayered(kSmoothnessRemapMax, m_LayerCount);
@@ -369,19 +373,32 @@ void DrawSurfaceInputsGUI()
 
             materialEditor.TexturePropertySingleLine(Styles.baseColorText, baseColorMap[m_LayerIndex], baseColor[m_LayerIndex]);
 
-            if (materials.All(m => m.GetMaterialId() == MaterialId.LitStandard ||
+            bool hasMetallic = materials.All(m =>
+                m.GetMaterialId() == MaterialId.LitStandard ||
                 m.GetMaterialId() == MaterialId.LitAniso ||
-                m.GetMaterialId() == MaterialId.LitIridescence))
-            {
-                materialEditor.ShaderProperty(metallic[m_LayerIndex], Styles.metallicText);
-            }
+                m.GetMaterialId() == MaterialId.LitIridescence);
 
             if (maskMap[m_LayerIndex].textureValue == null)
             {
+                if (hasMetallic)
+                    materialEditor.ShaderProperty(metallic[m_LayerIndex], Styles.metallicText);
                 materialEditor.ShaderProperty(smoothness[m_LayerIndex], Styles.smoothnessText);
             }
             else
             {
+                if (hasMetallic)
+                {
+                    float metallicMin = metallicRemapMin[m_LayerIndex].floatValue;
+                    float metallicMax = metallic[m_LayerIndex].floatValue;
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.MinMaxSlider(Styles.metallicRemappingText, ref metallicMin, ref metallicMax, 0.0f, 1.0f);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        metallicRemapMin[m_LayerIndex].floatValue = metallicMin;
+                        metallic[m_LayerIndex].floatValue = metallicMax;
+                    }
+                }
+
                 float remapMin = smoothnessRemapMin[m_LayerIndex].floatValue;
                 float remapMax = smoothnessRemapMax[m_LayerIndex].floatValue;
                 EditorGUI.BeginChangeCheck();
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
index 96062fd3663..f437cf10a61 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
@@ -24,6 +24,11 @@ Shader "HDRP/LayeredLit"
         _Metallic2("Metallic2", Range(0.0, 1.0)) = 0
         _Metallic3("Metallic3", Range(0.0, 1.0)) = 0
 
+        _MetallicRemapMin0("MetallicRemapMin0", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin1("MetallicRemapMin1", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin2("MetallicRemapMin2", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin3("MetallicRemapMin3", Range(0.0, 1.0)) = 0.0
+
         _Smoothness0("Smoothness0", Range(0.0, 1.0)) = 0.5
         _Smoothness1("Smoothness1", Range(0.0, 1.0)) = 0.5
         _Smoothness2("Smoothness2", Range(0.0, 1.0)) = 0.5
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
index da0726989bd..225e332b705 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
@@ -24,6 +24,11 @@ Shader "HDRP/LayeredLitTessellation"
         _Metallic2("Metallic2", Range(0.0, 1.0)) = 0
         _Metallic3("Metallic3", Range(0.0, 1.0)) = 0
 
+        _MetallicRemapMin0("MetallicRemapMin0", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin1("MetallicRemapMin1", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin2("MetallicRemapMin2", Range(0.0, 1.0)) = 0.0
+        _MetallicRemapMin3("MetallicRemapMin3", Range(0.0, 1.0)) = 0.0
+
         _Smoothness0("Smoothness0", Range(0.0, 1.0)) = 0.5
         _Smoothness1("Smoothness1", Range(0.0, 1.0)) = 0.5
         _Smoothness2("Smoothness2", Range(0.0, 1.0)) = 0.5
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
index dca1e9f2cd8..42c1efb67c4 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
@@ -13,6 +13,7 @@ Shader "HDRP/Lit"
         _Metallic("_Metallic", Range(0.0, 1.0)) = 0
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
         _MaskMap("MaskMap", 2D) = "white" {}
+        _MetallicRemapMin("MetallicRemapMin", Float) = 0.0
         _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         _AORemapMin("AORemapMin", Float) = 0.0
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
index 18b78e6a44d..c09897c3e43 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
@@ -245,13 +245,13 @@ float ADD_IDX(GetSurfaceData)(FragInputs input, LayerTexCoord layerTexCoord, out
     // MaskMap is RGBA: Metallic, Ambient Occlusion (Optional), detail Mask (Optional), Smoothness
 #ifdef _MASKMAP_IDX
     surfaceData.metallic = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_MaskMap), SAMPLER_MASKMAP_IDX, ADD_IDX(layerTexCoord.base)).r;
+    surfaceData.metallic = lerp(ADD_IDX(_MetallicRemapMin), ADD_IDX(_Metallic), surfaceData.metallic);
     surfaceData.ambientOcclusion = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_MaskMap), SAMPLER_MASKMAP_IDX, ADD_IDX(layerTexCoord.base)).g;
     surfaceData.ambientOcclusion = lerp(ADD_IDX(_AORemapMin), ADD_IDX(_AORemapMax), surfaceData.ambientOcclusion);
 #else
-    surfaceData.metallic = 1.0;
+    surfaceData.metallic = ADD_IDX(_Metallic);
     surfaceData.ambientOcclusion = 1.0;
 #endif
-    surfaceData.metallic *= ADD_IDX(_Metallic);
 
     surfaceData.diffusionProfileHash = asuint(ADD_IDX(_DiffusionProfileHash));
     surfaceData.subsurfaceMask = ADD_IDX(_SubsurfaceMask);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
index e0640512335..d92684a68c0 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
@@ -164,6 +164,7 @@ float4 _BaseColorMap_TexelSize;
 float4 _BaseColorMap_MipInfo;
 
 float _Metallic;
+float _MetallicRemapMin;
 float _Smoothness;
 float _SmoothnessRemapMin;
 float _SmoothnessRemapMax;
@@ -218,6 +219,7 @@ float4 _BaseColorMap0_TexelSize;
 float4 _BaseColorMap0_MipInfo;
 
 PROP_DECL(float, _Metallic);
+PROP_DECL(float, _MetallicRemapMin);
 PROP_DECL(float, _Smoothness);
 PROP_DECL(float, _SmoothnessRemapMin);
 PROP_DECL(float, _SmoothnessRemapMax);
@@ -304,6 +306,10 @@ UNITY_DOTS_INSTANCING_START(MaterialPropertyMetadata)
     UNITY_DOTS_INSTANCED_PROP(float , _Metallic1)
     UNITY_DOTS_INSTANCED_PROP(float , _Metallic2)
     UNITY_DOTS_INSTANCED_PROP(float , _Metallic3)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin0)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin1)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin2)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin3)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor0)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor1)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor2)
@@ -370,10 +376,10 @@ UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
 #define _Metallic1               UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Metallic1)
 #define _Metallic2               UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Metallic2)
 #define _Metallic3               UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Metallic3)
-#define _Smoothness0             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness0)
-#define _Smoothness1             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness1)
-#define _Smoothness2             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness2)
-#define _Smoothness3             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness3)
+#define _MetallicRemapMin0       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin0)
+#define _MetallicRemapMin1       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin1)
+#define _MetallicRemapMin2       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin2)
+#define _MetallicRemapMin3       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin3)
 #define _EmissiveColor0          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor0)
 #define _EmissiveColor1          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor1)
 #define _EmissiveColor2          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor2)
@@ -454,6 +460,7 @@ UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
 
 #define _BaseColor              UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4, Metadata__BaseColor)
 #define _Metallic               UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Metallic)
+#define _MetallicRemapMin       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin)
 #define _Smoothness             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness)
 #define _EmissiveColor          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor)
 #define _SpecularColor          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4, Metadata__SpecularColor)
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
index ae72203e1ca..25c481069b4 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
@@ -13,6 +13,7 @@ Shader "HDRP/LitTessellation"
         _Metallic("_Metallic", Range(0.0, 1.0)) = 0
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
         _MaskMap("MaskMap", 2D) = "white" {}
+        _MetallicRemapMin("MetallicRemapMin", Float) = 0.0
         _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         _AORemapMin("AORemapMin", Float) = 0.0

From fca37d2286b83d29037176e1a0dec621fa7f7bd6 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Mon, 19 Oct 2020 16:12:24 +0200
Subject: [PATCH 02/13] Metallic remapping for decals

---
 .../CHANGELOG.md                                 |  2 +-
 .../UIBlocks/DecalSurfaceInputsUIBlock.cs        | 16 ++++++++++++++--
 .../Runtime/Material/Decal/Decal.cs              |  2 +-
 .../Runtime/Material/Decal/Decal.cs.hlsl         |  2 +-
 .../Runtime/Material/Decal/Decal.shader          |  3 ++-
 .../Runtime/Material/Decal/DecalSystem.cs        | 11 ++++++-----
 .../Runtime/Material/Decal/DecalUtilities.hlsl   |  8 ++++----
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index f79f00b2d06..37bc2987ffc 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -39,7 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a new ray tracing only function that samples the specular part of the materials.
 - Adding missing marker for ray tracing profiling (RaytracingDeferredLighting)
 - Added the support of eye shader for ray tracing.
-- Added range remapping to metallic property for Lit shaders.
+- Added range remapping to metallic property for Lit and Decal shaders.
 
 ### Fixed
 - Fixed several issues with physically-based DoF (TAA ghosting of the CoC buffer, smooth layer transitions, etc)
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
index 6d6b9272dfc..c5b4fe70b7d 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
@@ -25,7 +25,7 @@ public class Styles
             public static GUIContent normalOpacityChannelText = new GUIContent("Normal Opacity Channel", "Specifies the source this Material uses as opacity for its Normal Map.");
             public static GUIContent smoothnessRemappingText = new GUIContent("Smoothness Remapping", "Controls a remap for the smoothness channel in the Mask Map.");
             public static GUIContent smoothnessText = new GUIContent("Smoothness", "Controls the smoothness of the decal.");
-            public static GUIContent metallicScaleText = new GUIContent("Metallic Scale", "Controls a scale factor for the metallic channel in the Mask Map.");
+            public static GUIContent metallicRemappingText = new GUIContent("Metallic Remapping", "Controls a remap for the metallic channel in the Mask Map.");
             public static GUIContent metallicText = new GUIContent("Metallic", "Controls the metallic of the decal.");
             public static GUIContent aoRemappingText = new GUIContent("Ambient Occlusion Remapping", "Controls a remap for the ambient occlusion channel in the Mask Map.");
             public static GUIContent aoText = new GUIContent("Ambient Occlusion", "Controls the ambient occlusion of the decal.");
@@ -95,6 +95,9 @@ enum BlendSource
         MaterialProperty smoothnessRemapMax = new MaterialProperty();
         const string kSmoothnessRemapMax = "_SmoothnessRemapMax";
 
+        MaterialProperty metallicRemapMin = new MaterialProperty();
+        const string kMetallicRemapMin = "_MetallicRemapMin";
+
         MaterialProperty metallicScale = new MaterialProperty();
         const string kMetallicScale = "_MetallicScale";
 
@@ -159,6 +162,7 @@ public override void LoadMaterialProperties()
             AORemapMax = FindProperty(kAORemapMax);
             smoothnessRemapMin = FindProperty(kSmoothnessRemapMin);
             smoothnessRemapMax = FindProperty(kSmoothnessRemapMax);
+            metallicRemapMin = FindProperty(kMetallicRemapMin);
             metallicScale = FindProperty(kMetallicScale);
             AO = FindProperty(kAO);
             smoothness = FindProperty(kSmoothness);
@@ -225,7 +229,15 @@ void DrawDecalGUI()
             {
                 if (perChannelMask)
                 {
-                    materialEditor.ShaderProperty(metallicScale, Styles.metallicScaleText);
+                    float MetalRemapMinValue = metallicRemapMin.floatValue;
+                    float MetalRemapMaxValue = metallicScale.floatValue;
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.MinMaxSlider(Styles.metallicRemappingText, ref MetalRemapMinValue, ref MetalRemapMaxValue, 0.0f, 1.0f);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        metallicRemapMin.floatValue = MetalRemapMinValue;
+                        metallicScale.floatValue = MetalRemapMaxValue;
+                    }
 
                     float AORemapMinValue = AORemapMin.floatValue;
                     float AORemapMaxValue = AORemapMax.floatValue;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs
index 135eaca0734..994b5ec6837 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs
@@ -60,7 +60,7 @@ struct DecalData
         public Vector4 maskScaleBias;
         public Vector4 baseColor;
         public Vector4 remappingAOS;
-        public Vector4 scalingMBAndAngle; // x metalness, y blue mask map, zw angle fade scale and bias for angle in radian
+        public Vector4 scalingBAndRemappingM; // x unused, y blue mask map, zw metallic remapping
         public Vector3 blendParams; // x normal blend source, y mask blend source, z mask blend mode
         public uint decalLayerMask;
     };
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
index 2f4c3f4ba8b..060bce6c8fe 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
@@ -31,7 +31,7 @@ struct DecalData
     float4 maskScaleBias;
     float4 baseColor;
     float4 remappingAOS;
-    float4 scalingMBAndAngle;
+    float4 scalingBAndRemappingM;
     float3 blendParams;
     uint decalLayerMask;
 };
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
index b8327d6f1fd..36afab17839 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
@@ -23,13 +23,14 @@ Shader "HDRP/Decal"
         _EmissiveExposureWeight("Emissive Pre Exposure", Range(0.0, 1.0)) = 1.0
 
         // Remapping
+        [HideInInspector] _MetallicRemapMin("_MetallicRemapMin", Range(0.0, 1.0)) = 0.0
+        [HideInInspector] _MetallicScale("_MetallicScale", Range(0.0, 1.0)) = 1.0
         [HideInInspector] _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         [HideInInspector] _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         [HideInInspector] _AORemapMin("AORemapMin", Float) = 0.0
         [HideInInspector] _AORemapMax("AORemapMax", Float) = 1.0
 
         // scaling
-        [HideInInspector] _MetallicScale("_MetallicScale", Range(0.0, 1.0)) = 1.0
         [HideInInspector] _DecalMaskMapBlueScale("_DecalMaskMapBlueScale", Range(0.0, 1.0)) = 1.0
 
         // Alternative when no mask map is provided
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
index 0c941042b8b..8627370ea1d 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
@@ -404,17 +404,18 @@ public void InitializeMaterialValues()
                     // convert to float
                     m_BlendParams.z = (float)affectFlags;
 
-                    m_ScalingMB = new Vector2(0.0f, m_Material.GetFloat("_DecalMaskMapBlueScale"));
+                    m_ScalingBAndRemappingM = new Vector4(0.0f, m_Material.GetFloat("_DecalMaskMapBlueScale"), 0.0f, 0.0f);
                     // If we have a texture, we use the remapping parameter, otherwise we use the regular one and the default texture is white
                     if (m_Material.GetTexture("_MaskMap"))
                     {
                         m_RemappingAOS = new Vector4(m_Material.GetFloat("_AORemapMin"), m_Material.GetFloat("_AORemapMax"), m_Material.GetFloat("_SmoothnessRemapMin"), m_Material.GetFloat("_SmoothnessRemapMax"));
-                        m_ScalingMB.x = m_Material.GetFloat("_MetallicScale");
+                        m_ScalingBAndRemappingM.z = m_Material.GetFloat("_MetallicRemapMin");
+                        m_ScalingBAndRemappingM.w = m_Material.GetFloat("_MetallicScale");
                     }
                     else
                     {
                         m_RemappingAOS = new Vector4(m_Material.GetFloat("_AO"), m_Material.GetFloat("_AO"), m_Material.GetFloat("_Smoothness"), m_Material.GetFloat("_Smoothness"));
-                        m_ScalingMB.x = m_Material.GetFloat("_Metallic");
+                        m_ScalingBAndRemappingM.z = m_Material.GetFloat("_Metallic");
                     }
 
                     // For HDRP/Decal, pass are always present but can be enabled/disabled
@@ -734,7 +735,7 @@ public void CreateDrawData()
                                 m_DecalDatas[m_DecalDatasCount].baseColor = m_BaseColor;
                                 m_DecalDatas[m_DecalDatasCount].blendParams = m_BlendParams;
                                 m_DecalDatas[m_DecalDatasCount].remappingAOS = m_RemappingAOS;
-                                m_DecalDatas[m_DecalDatasCount].scalingMBAndAngle = new Vector4(m_ScalingMB.x, m_ScalingMB.y, m_CachedAngleFade[decalIndex].x, m_CachedAngleFade[decalIndex].y);
+                                m_DecalDatas[m_DecalDatasCount].scalingBAndRemappingM = m_ScalingBAndRemappingM;
                                 m_DecalDatas[m_DecalDatasCount].decalLayerMask = (uint)m_CachedDecalLayerMask[decalIndex];
 
                                 // we have not allocated the textures in atlas yet, so only store references to them
@@ -896,7 +897,7 @@ public int DrawOrder
             private float m_Blend = 0.0f;
             private Vector4 m_BaseColor;
             private Vector4 m_RemappingAOS;
-            private Vector2 m_ScalingMB; // metal, mask map blue
+            private Vector4 m_ScalingBAndRemappingM; // mask map blue, metal remap
             private Vector3 m_BlendParams;
 
             private bool m_IsHDRenderPipelineDecal;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalUtilities.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalUtilities.hlsl
index be3698f1281..70a6794643b 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalUtilities.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalUtilities.hlsl
@@ -101,20 +101,20 @@ void EvalDecalMask( PositionInputs posInput, float3 vtxNormal, float3 positionRW
                 float  lodMask = ComputeTextureLOD(sampleMaskDdx, sampleMaskDdy, _DecalAtlasResolution, 0.5);
 
                 src = SAMPLE_TEXTURE2D_LOD(_DecalAtlas2D, _trilinear_clamp_sampler_DecalAtlas2D, sampleMask, lodMask);
-                src.z *= decalData.scalingMBAndAngle.y; // Blue channel (opacity)
+                src.z *= decalData.scalingBAndRemappingM.y; // Blue channel (opacity)
                 maskMapBlend *= src.z; // store before overwriting with smoothness
                 #ifdef DECALS_4RT
-                src.x *= decalData.scalingMBAndAngle.x; // Metal
+                src.x = lerp(decalData.scalingBAndRemappingM.z, decalData.scalingBAndRemappingM.w, src.x); // Remap Metal
                 src.y = lerp(decalData.remappingAOS.x, decalData.remappingAOS.y, src.y); // Remap AO
                 #endif
                 src.z = lerp(decalData.remappingAOS.z, decalData.remappingAOS.w, src.w); // Remap Smoothness
             }
             else
             {
-                src.z = decalData.scalingMBAndAngle.y; // Blue channel (opacity)
+                src.z = decalData.scalingBAndRemappingM.y; // Blue channel (opacity)
                 maskMapBlend *= src.z; // store before overwriting with smoothness
                 #ifdef DECALS_4RT
-                src.x = decalData.scalingMBAndAngle.x; // Metal
+                src.x = decalData.scalingBAndRemappingM.z; // Metal
                 src.y = decalData.remappingAOS.x; // AO
                 #endif
                 src.z = decalData.remappingAOS.z; // Smoothness

From 82a2cdce55f1f7c44707ef62fb4a066c20de76fe Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Tue, 20 Oct 2020 16:43:57 +0200
Subject: [PATCH 03/13] Update remaining doc pages

---
 .../Documentation~/Decal-Shader.md                              | 2 +-
 .../Documentation~/Layered-Lit-Shader.md                        | 2 ++
 .../Documentation~/Lit-Shader.md                                | 2 +-
 .../Documentation~/Lit-Tessellation-Shader.md                   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Decal-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Decal-Shader.md
index 496a1b313e3..ed96d735d59 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Decal-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Decal-Shader.md
@@ -31,7 +31,7 @@ These properties allow you to set the inputs that affect the behavior of the dec
 | **Metallic**                    | Use the slider to set the strength of the metallic effect of the decal. Choose a value from 0 and 1 where 0 means no effect and 1 means full effect.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.md#Decals). |
 | **Ambient Occlusion**           | Use the slider to set the strength of the ambient occlusion effect of the decal.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.md#Decals). |
 | **Smoothness**                  | Use the slider to set the strength of the smoothness of the decal. |
-| **Metallic Scale**              | Use the slider to set the strength of the metallic effect of the decal. This targets the values of the Metallic map in the Red channel of the **Mask Map**. Choose a value from 0 and 1 where 0 means no effect and 1 means full effect.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.md#Decals). |
+| **Metallic Remapping**          | Remaps the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, it condenses the original range down to the new range uniformly.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.html#Decals). |
 | **AO Remapping**                | Remaps the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, it condenses the original range down to the new range uniformly.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.html#Decals). |
 | **Smoothness Remapping**        | Remaps the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, it condenses the original range down to the new range uniformly. |
 | **Mask Opacity channel**        | Use this drop-down to select the source of the **Mask Map** opacity. You can select either **Base Color Map Alpha**, **Mask Map Blue** or **Mask Opacity**:<br />&#8226; **Base Color Map Alpha**: Uses the alpha channel of the **Base Map**’s color picker as opacity.<br />&#8226; **Mask Map Blue**: Uses the blue channel of the **Mask Map** as opacity.<br />&#8226; **Opacity Mask**: Uses the Mask Opacity. |
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
index dd64e139f9c..d17e78bcadf 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Layered-Lit-Shader.md
@@ -86,7 +86,9 @@ Unity exposes up to four Material layers for you to use in your Layered Material
 | **Property**                    | **Description**                                              |
 | ------------------------------- | ------------------------------------------------------------ |
 | **Base Map**                    | Assign a Texture that controls both the color and opacity of your Material. To assign a Texture to this field, click the radio button and select your Texture in the Select Texture window. Use the color picker to select the color of the Material. If you do not assign a Texture, this is the absolute color of the Material. If you do assign a Texture, the final color of the Material is a combination of the Texture you assign and the color you select. The alpha value of the color controls the transparency level for the Material if you select **Transparent** from the **Surface Type** drop-down. |
+| **Metallic**                    | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1). When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
 | **Smoothness**                  | Use the slider to adjust the smoothness of your Material. Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a perfectly smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
+| **Metallic Remapping**          | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Smoothness Remapping**        | Use this min-max slider to remap the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Ambient Occlusion Remapping** | Use this min-max slider to remap the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Mask Map**                    | Assign a [channel-packed Texture](Glossary.md#ChannelPacking) with the following Material maps in its RGBA channels.<br />&#8226; **Red**: Stores the metallic map. <br />&#8226; **Green**: Stores the ambient occlusion map.<br />&#8226; **Blue**: Stores the detail mask map.<br />&#8226; **Alpha**: Stores the smoothness map.<br />For more information on channel-packed Textures and the mask map, see [mask map](Mask-Map-and-Detail-Map.md#MaskMap). |
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
index 0e0c4ec784d..5d65ad4d0ad 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Shader.md
@@ -39,8 +39,8 @@ To create a new Lit Material, navigate to your Project's Asset window, right-cli
 | ------------------------------- | ------------------------------------------------------------ |
 | **Base Map**                    | Assign a Texture that controls both the color and opacity of your Material. To assign a Texture to this field, click the radio button and select your Texture in the Select Texture window. Use the color picker to select the color of the Material. If you do not assign a Texture, this is the absolute color of the Material. If you do assign a Texture, the final color of the Material is a combination of the Texture you assign and the color you select. The alpha value of the color controls the transparency level for the Material if you select **Transparent** from the **Surface Type** drop-down. |
 | **Metallic**                    | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1). When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
-| **Metallic Remapping**          | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Smoothness**                  | Use the slider to adjust the smoothness of your Material. Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a perfectly smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
+| **Metallic Remapping**          | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Smoothness Remapping**        | Use this min-max slider to remap the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Ambient Occlusion Remapping** | Use this min-max slider to remap the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Mask Map**                    | Assign a [channel-packed Texture](Glossary.md#ChannelPacking) with the following Material maps in its RGBA channels.<br />&#8226; **Red**: Stores the metallic map. <br />&#8226; **Green**: Stores the ambient occlusion map.<br />&#8226; **Blue**: Stores the detail mask map.<br />&#8226; **Alpha**: Stores the smoothness map.<br />For more information on channel-packed Textures and the mask map, see [mask map](Mask-Map-and-Detail-Map.md#MaskMap). |
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md
index 7c02a7cdadc..a1e9fa83a4c 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md
@@ -55,7 +55,9 @@ These properties control how Unity tessellates your Material's surface and smoot
 | **Property**                    | **Description**                                              |
 | ------------------------------- | ------------------------------------------------------------ |
 | **Base Map**                    | Assign a Texture that controls both the color and opacity of your Material. To assign a Texture to this field, click the radio button and select your Texture in the Select Texture window. Use the color picker to select the color of the Material. If you do not assign a Texture, this is the absolute color of the Material. If you do assign a Texture, the final color of the Material is a combination of the Texture you assign and the color you select. The alpha value of the color controls the transparency level for the Material if you select **Transparent** from the **Surface Type** drop-down. |
+| **Metallic**                    | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1). When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
 | **Smoothness**                  | Use the slider to adjust the smoothness of your Material. Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a perfectly smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.<br />This property only appears when you unassign the Texture in the **Mask Map**. |
+| **Metallic Remapping**          | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Smoothness Remapping**        | Use this min-max slider to remap the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Ambient Occlusion Remapping** | Use this min-max slider to remap the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.<br />This property only appears when you assign a **Mask Map**. |
 | **Mask Map**                    | Assign a [channel-packed Texture](Glossary.md#ChannelPacking) with the following Material maps in its RGBA channels.<br />&#8226; **Red**: Stores the metallic map. <br />&#8226; **Green**: Stores the ambient occlusion map.<br />&#8226; **Blue**: Stores the detail mask map.<br />&#8226; **Alpha**: Stores the smoothness map.<br />For more information on channel-packed Textures and the mask map, see [mask map](Mask-Map-and-Detail-Map.md#MaskMap). |

From b76c632fa0734ce7cb6c02fbea144706a4a813d5 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Wed, 21 Oct 2020 15:21:51 +0200
Subject: [PATCH 04/13] Material upgrader

---
 .../AssetProcessors/MaterialPostProcessor.cs    | 17 +++++++++++++++++
 .../UIBlocks/LitSurfaceInputsUIBlock.cs         |  7 +++++--
 .../Material/LayeredLit/LayeredLit.shader       |  5 +++++
 .../LayeredLit/LayeredLitTessellation.shader    |  5 +++++
 .../Runtime/Material/Lit/Lit.shader             |  1 +
 .../Material/Lit/LitDataIndividualLayer.hlsl    |  2 +-
 .../Runtime/Material/Lit/LitProperties.hlsl     | 11 +++++++++++
 .../Runtime/Material/Lit/LitTessellation.shader |  1 +
 8 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
index 3434746521b..f86ee04c0bd 100644
--- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
@@ -202,6 +202,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
              ExposedDecalInputsFromShaderGraph,
              FixIncorrectEmissiveColorSpace,
              ExposeRefraction,
+             MetallicRemapping,
         };
 
         #region Migrations
@@ -608,6 +609,22 @@ static void ExposeRefraction(Material material, HDShaderUtils.ShaderID id)
             }
         }
 
+        static void MetallicRemapping(Material material, HDShaderUtils.ShaderID id)
+        {
+            // Lit shaders now have metallic remapping for the mask map
+            if (id == HDShaderUtils.ShaderID.Lit || id == HDShaderUtils.ShaderID.LitTesselation
+             || id == HDShaderUtils.ShaderID.LayeredLit || id == HDShaderUtils.ShaderID.LayeredLitTesselation)
+            {
+                const string kMetallic = "_Metallic";
+                const string kMetallicRemapMax = "_MetallicRemapMax";
+                if (material.HasProperty(kMetallic) && material.HasProperty(kMetallicRemapMax))
+                {
+                    var metallic = material.GetFloat(kMetallic);
+                    material.SetFloat(kMetallicRemapMax, metallic);
+                }
+            }
+        }
+
         #region Serialization_API
         //Methods in this region interact on the serialized material
         //without filtering on what used shader knows
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
index a6ce4271488..7fcd31abf63 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs
@@ -116,6 +116,8 @@ public class Styles
         const string kMetallic = "_Metallic";
         MaterialProperty[] metallicRemapMin = new MaterialProperty[kMaxLayerCount];
         const string kMetallicRemapMin = "_MetallicRemapMin";
+        MaterialProperty[] metallicRemapMax = new MaterialProperty[kMaxLayerCount];
+        const string kMetallicRemapMax = "_MetallicRemapMax";
         MaterialProperty[] smoothness = new MaterialProperty[kMaxLayerCount];
         const string kSmoothness = "_Smoothness";
         MaterialProperty[] smoothnessRemapMin = new MaterialProperty[kMaxLayerCount];
@@ -273,6 +275,7 @@ public override void LoadMaterialProperties()
             baseColorMap = FindPropertyLayered(kBaseColorMap, m_LayerCount);
             metallic = FindPropertyLayered(kMetallic, m_LayerCount);
             metallicRemapMin = FindPropertyLayered(kMetallicRemapMin, m_LayerCount);
+            metallicRemapMax = FindPropertyLayered(kMetallicRemapMax, m_LayerCount);
             smoothness = FindPropertyLayered(kSmoothness, m_LayerCount);
             smoothnessRemapMin = FindPropertyLayered(kSmoothnessRemapMin, m_LayerCount);
             smoothnessRemapMax = FindPropertyLayered(kSmoothnessRemapMax, m_LayerCount);
@@ -389,13 +392,13 @@ void DrawSurfaceInputsGUI()
                 if (hasMetallic)
                 {
                     float metallicMin = metallicRemapMin[m_LayerIndex].floatValue;
-                    float metallicMax = metallic[m_LayerIndex].floatValue;
+                    float metallicMax = metallicRemapMax[m_LayerIndex].floatValue;
                     EditorGUI.BeginChangeCheck();
                     EditorGUILayout.MinMaxSlider(Styles.metallicRemappingText, ref metallicMin, ref metallicMax, 0.0f, 1.0f);
                     if (EditorGUI.EndChangeCheck())
                     {
                         metallicRemapMin[m_LayerIndex].floatValue = metallicMin;
-                        metallic[m_LayerIndex].floatValue = metallicMax;
+                        metallicRemapMax[m_LayerIndex].floatValue = metallicMax;
                     }
                 }
 
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
index f437cf10a61..710547ba76a 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
@@ -29,6 +29,11 @@ Shader "HDRP/LayeredLit"
         _MetallicRemapMin2("MetallicRemapMin2", Range(0.0, 1.0)) = 0.0
         _MetallicRemapMin3("MetallicRemapMin3", Range(0.0, 1.0)) = 0.0
 
+        _MetallicRemapMax0("MetallicRemapMax0", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax1("MetallicRemapMax1", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax2("MetallicRemapMax2", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax3("MetallicRemapMax3", Range(0.0, 1.0)) = 1.0
+
         _Smoothness0("Smoothness0", Range(0.0, 1.0)) = 0.5
         _Smoothness1("Smoothness1", Range(0.0, 1.0)) = 0.5
         _Smoothness2("Smoothness2", Range(0.0, 1.0)) = 0.5
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
index 225e332b705..dd22c10d298 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
@@ -29,6 +29,11 @@ Shader "HDRP/LayeredLitTessellation"
         _MetallicRemapMin2("MetallicRemapMin2", Range(0.0, 1.0)) = 0.0
         _MetallicRemapMin3("MetallicRemapMin3", Range(0.0, 1.0)) = 0.0
 
+        _MetallicRemapMax0("MetallicRemapMax0", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax1("MetallicRemapMax1", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax2("MetallicRemapMax2", Range(0.0, 1.0)) = 1.0
+        _MetallicRemapMax3("MetallicRemapMax3", Range(0.0, 1.0)) = 1.0
+
         _Smoothness0("Smoothness0", Range(0.0, 1.0)) = 0.5
         _Smoothness1("Smoothness1", Range(0.0, 1.0)) = 0.5
         _Smoothness2("Smoothness2", Range(0.0, 1.0)) = 0.5
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
index 23e3d706856..e7dae4871a5 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
@@ -14,6 +14,7 @@ Shader "HDRP/Lit"
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
         _MaskMap("MaskMap", 2D) = "white" {}
         _MetallicRemapMin("MetallicRemapMin", Float) = 0.0
+        _MetallicRemapMax("MetallicRemapMax", Float) = 1.0
         _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         _AORemapMin("AORemapMin", Float) = 0.0
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
index c09897c3e43..8d6ef077aaa 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataIndividualLayer.hlsl
@@ -245,7 +245,7 @@ float ADD_IDX(GetSurfaceData)(FragInputs input, LayerTexCoord layerTexCoord, out
     // MaskMap is RGBA: Metallic, Ambient Occlusion (Optional), detail Mask (Optional), Smoothness
 #ifdef _MASKMAP_IDX
     surfaceData.metallic = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_MaskMap), SAMPLER_MASKMAP_IDX, ADD_IDX(layerTexCoord.base)).r;
-    surfaceData.metallic = lerp(ADD_IDX(_MetallicRemapMin), ADD_IDX(_Metallic), surfaceData.metallic);
+    surfaceData.metallic = lerp(ADD_IDX(_MetallicRemapMin), ADD_IDX(_MetallicRemapMax), surfaceData.metallic);
     surfaceData.ambientOcclusion = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_MaskMap), SAMPLER_MASKMAP_IDX, ADD_IDX(layerTexCoord.base)).g;
     surfaceData.ambientOcclusion = lerp(ADD_IDX(_AORemapMin), ADD_IDX(_AORemapMax), surfaceData.ambientOcclusion);
 #else
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
index d92684a68c0..6e033288230 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl
@@ -165,6 +165,7 @@ float4 _BaseColorMap_MipInfo;
 
 float _Metallic;
 float _MetallicRemapMin;
+float _MetallicRemapMax;
 float _Smoothness;
 float _SmoothnessRemapMin;
 float _SmoothnessRemapMax;
@@ -220,6 +221,7 @@ float4 _BaseColorMap0_MipInfo;
 
 PROP_DECL(float, _Metallic);
 PROP_DECL(float, _MetallicRemapMin);
+PROP_DECL(float, _MetallicRemapMax);
 PROP_DECL(float, _Smoothness);
 PROP_DECL(float, _SmoothnessRemapMin);
 PROP_DECL(float, _SmoothnessRemapMax);
@@ -310,6 +312,10 @@ UNITY_DOTS_INSTANCING_START(MaterialPropertyMetadata)
     UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin1)
     UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin2)
     UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMin3)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMax0)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMax1)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMax2)
+    UNITY_DOTS_INSTANCED_PROP(float , _MetallicRemapMax3)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor0)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor1)
     UNITY_DOTS_INSTANCED_PROP(float3, _EmissiveColor2)
@@ -380,6 +386,10 @@ UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
 #define _MetallicRemapMin1       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin1)
 #define _MetallicRemapMin2       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin2)
 #define _MetallicRemapMin3       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin3)
+#define _MetallicRemapMax0       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMax0)
+#define _MetallicRemapMax1       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMax1)
+#define _MetallicRemapMax2       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMax2)
+#define _MetallicRemapMax3       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMax3)
 #define _EmissiveColor0          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor0)
 #define _EmissiveColor1          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor1)
 #define _EmissiveColor2          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor2)
@@ -461,6 +471,7 @@ UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
 #define _BaseColor              UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4, Metadata__BaseColor)
 #define _Metallic               UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Metallic)
 #define _MetallicRemapMin       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMin)
+#define _MetallicRemapMax       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__MetallicRemapMax)
 #define _Smoothness             UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float , Metadata__Smoothness)
 #define _EmissiveColor          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float3, Metadata__EmissiveColor)
 #define _SpecularColor          UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4, Metadata__SpecularColor)
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
index 8bec8762c6f..d8cd0be6e1d 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
@@ -14,6 +14,7 @@ Shader "HDRP/LitTessellation"
         _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
         _MaskMap("MaskMap", 2D) = "white" {}
         _MetallicRemapMin("MetallicRemapMin", Float) = 0.0
+        _MetallicRemapMax("MetallicRemapMax", Float) = 1.0
         _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         _AORemapMin("AORemapMin", Float) = 0.0

From 3b81903b1e45667e9adf88a73647e19bad26c45a Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Thu, 22 Oct 2020 16:45:16 +0200
Subject: [PATCH 05/13] Rename MetallicScale for decal shader

and doc
---
 .../Upgrading-from-2020.1-to-2020.2.md        |  4 ++++
 .../Documentation~/whats-new-10.md            |  4 ++++
 .../AssetProcessors/MaterialPostProcessor.cs  | 20 ++++++++++++++++++-
 .../UIBlocks/DecalSurfaceInputsUIBlock.cs     | 20 +++++++++----------
 .../Runtime/Material/Decal/Decal.shader       |  2 +-
 .../Runtime/Material/Decal/DecalData.hlsl     |  2 +-
 .../Material/Decal/DecalProperties.hlsl       |  3 ++-
 .../Runtime/Material/Decal/DecalSystem.cs     |  2 +-
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md
index 9d82351806f..790bcdaf38a 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md
@@ -185,6 +185,10 @@ From 10.x, HDRP includes a new optimization for [Planar Reflection Probes](Plana
 For example, the call in the Lit shader has been updated to:
 `float4 preLD = SampleEnv(lightLoopContext, lightData.envIndex, R, PerceptualRoughnessToMipmapLevel(preLightData.iblPerceptualRoughness) * lightData.roughReflections, lightData.rangeCompressionFactorCompensation, posInput.positionNDC);`
 
+From 10.x, HDRP uses range remapping for the metallic property when using a mask map.
+In the Lit, LitTessellation, LayeredLit and LayeredLitTesselation shaders, two new properties have been added: `_MetallicRemapMin` and `_MetallicRemapMax`.
+In the Decal shader, the property `_MetallicRemapMin` have been added, and `_MetallicScale` has been renamed as `_MetallicRemapMax`.
+
 ## Raytracing
 
 From Unity 2020.2, the Raytracing Node in shader graph now apply the raytraced path (previously low path) to all raytraced effects but path tracing.
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/whats-new-10.md b/com.unity.render-pipelines.high-definition/Documentation~/whats-new-10.md
index c17aad75252..fcdb4fddfa3 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/whats-new-10.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/whats-new-10.md
@@ -295,6 +295,10 @@ Ray tracing now supports VR. However, since ray tracing is resource intensive an
 
 HDRP now internally uses a Render Graph system. This has no impact on features available to you and it should improve overall memory usage significantly. In the new HDRP template, GPU memory usage decreased by 25%.
 
+### Metallic Remapping
+
+HDRP now uses range remapping for the metallic value when using a mask map on Lit Materials as well as Decals.
+
 ## Issues resolved
 
 For information on issues resolved in version 10 of HDRP, see the [changelog](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@10.0/changelog/CHANGELOG.html).
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
index f86ee04c0bd..aca9bca460b 100644
--- a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
@@ -611,18 +611,36 @@ static void ExposeRefraction(Material material, HDShaderUtils.ShaderID id)
 
         static void MetallicRemapping(Material material, HDShaderUtils.ShaderID id)
         {
+            const string kMetallicRemapMax = "_MetallicRemapMax";
+
             // Lit shaders now have metallic remapping for the mask map
             if (id == HDShaderUtils.ShaderID.Lit || id == HDShaderUtils.ShaderID.LitTesselation
              || id == HDShaderUtils.ShaderID.LayeredLit || id == HDShaderUtils.ShaderID.LayeredLitTesselation)
             {
                 const string kMetallic = "_Metallic";
-                const string kMetallicRemapMax = "_MetallicRemapMax";
                 if (material.HasProperty(kMetallic) && material.HasProperty(kMetallicRemapMax))
                 {
                     var metallic = material.GetFloat(kMetallic);
                     material.SetFloat(kMetallicRemapMax, metallic);
                 }
             }
+            else if (id == HDShaderUtils.ShaderID.Decal)
+            {
+                HDShaderUtils.ResetMaterialKeywords(material);
+                var serializedMaterial = new SerializedObject(material);
+
+                const string kMetallicScale = "_MetallicScale";
+                float metallicScale = 1.0f;
+                if (TryFindProperty(serializedMaterial, kMetallicScale, SerializedType.Float, out var propertyMetallicScale, out _, out _))
+                {
+                    metallicScale = propertyMetallicScale.floatValue;
+                    RemoveSerializedFloat(serializedMaterial, kMetallicScale);
+                }
+
+                serializedMaterial.ApplyModifiedProperties();
+
+                material.SetFloat(kMetallicRemapMax, metallicScale);
+            }
         }
 
         #region Serialization_API
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
index c5b4fe70b7d..c02be6a604d 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs
@@ -83,6 +83,12 @@ enum BlendSource
         MaterialProperty maskmapSmoothness = new MaterialProperty();
         const string kMaskmapSmoothness = "_MaskmapSmoothness";
 
+        MaterialProperty metallicRemapMin = new MaterialProperty();
+        const string kMetallicRemapMin = "_MetallicRemapMin";
+
+        MaterialProperty metallicRemapMax = new MaterialProperty();
+        const string kMetallicRemapMax = "_MetallicRemapMax";
+
         MaterialProperty AORemapMin = new MaterialProperty();
         const string kAORemapMin = "_AORemapMin";
 
@@ -95,12 +101,6 @@ enum BlendSource
         MaterialProperty smoothnessRemapMax = new MaterialProperty();
         const string kSmoothnessRemapMax = "_SmoothnessRemapMax";
 
-        MaterialProperty metallicRemapMin = new MaterialProperty();
-        const string kMetallicRemapMin = "_MetallicRemapMin";
-
-        MaterialProperty metallicScale = new MaterialProperty();
-        const string kMetallicScale = "_MetallicScale";
-
 
         MaterialProperty AO = new MaterialProperty();
         const string kAO = "_AO";
@@ -158,12 +158,12 @@ public override void LoadMaterialProperties()
             maskmapMetal = FindProperty(kMaskmapMetal);
             maskmapAO = FindProperty(kMaskmapAO);
             maskmapSmoothness = FindProperty(kMaskmapSmoothness);
+            metallicRemapMin = FindProperty(kMetallicRemapMin);
+            metallicRemapMax = FindProperty(kMetallicRemapMax);
             AORemapMin = FindProperty(kAORemapMin);
             AORemapMax = FindProperty(kAORemapMax);
             smoothnessRemapMin = FindProperty(kSmoothnessRemapMin);
             smoothnessRemapMax = FindProperty(kSmoothnessRemapMax);
-            metallicRemapMin = FindProperty(kMetallicRemapMin);
-            metallicScale = FindProperty(kMetallicScale);
             AO = FindProperty(kAO);
             smoothness = FindProperty(kSmoothness);
             metallic = FindProperty(kMetallic);
@@ -230,13 +230,13 @@ void DrawDecalGUI()
                 if (perChannelMask)
                 {
                     float MetalRemapMinValue = metallicRemapMin.floatValue;
-                    float MetalRemapMaxValue = metallicScale.floatValue;
+                    float MetalRemapMaxValue = metallicRemapMax.floatValue;
                     EditorGUI.BeginChangeCheck();
                     EditorGUILayout.MinMaxSlider(Styles.metallicRemappingText, ref MetalRemapMinValue, ref MetalRemapMaxValue, 0.0f, 1.0f);
                     if (EditorGUI.EndChangeCheck())
                     {
                         metallicRemapMin.floatValue = MetalRemapMinValue;
-                        metallicScale.floatValue = MetalRemapMaxValue;
+                        metallicRemapMax.floatValue = MetalRemapMaxValue;
                     }
 
                     float AORemapMinValue = AORemapMin.floatValue;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
index 36afab17839..7b4cdb919d2 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
@@ -24,7 +24,7 @@ Shader "HDRP/Decal"
 
         // Remapping
         [HideInInspector] _MetallicRemapMin("_MetallicRemapMin", Range(0.0, 1.0)) = 0.0
-        [HideInInspector] _MetallicScale("_MetallicScale", Range(0.0, 1.0)) = 1.0
+        [HideInInspector] _MetallicRemapMax("_MetallicRemapMax", Range(0.0, 1.0)) = 1.0
         [HideInInspector] _SmoothnessRemapMin("SmoothnessRemapMin", Float) = 0.0
         [HideInInspector] _SmoothnessRemapMax("SmoothnessRemapMax", Float) = 1.0
         [HideInInspector] _AORemapMin("AORemapMin", Float) = 0.0
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalData.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalData.hlsl
index 3c4678ff233..edaaddf7536 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalData.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalData.hlsl
@@ -60,7 +60,7 @@ void GetSurfaceData(FragInputs input, float3 V, PositionInputs posInput, float a
     surfaceData.mask.z *= _DecalMaskMapBlueScale;
 	maskMapBlend *= surfaceData.mask.z;	// store before overwriting with smoothness
     #ifdef DECALS_4RT
-    surfaceData.mask.x = _MetallicScale * surfaceData.mask.x;
+    surfaceData.mask.x = lerp(_MetallicRemapMin, _MetallicRemapMax, surfaceData.mask.x);
     surfaceData.mask.y = lerp(_AORemapMin, _AORemapMax, surfaceData.mask.y);
     #endif
     surfaceData.mask.z = lerp(_SmoothnessRemapMin, _SmoothnessRemapMax, surfaceData.mask.w);
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProperties.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProperties.hlsl
index de428ae8d3b..b0d43c243ac 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProperties.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProperties.hlsl
@@ -17,11 +17,12 @@ float4 _BaseColor;
 float3 _EmissiveColor;
 float _EmissiveExposureWeight;
 float _DecalMeshDepthBias;
+float _MetallicRemapMin;
+float _MetallicRemapMax;
 float _SmoothnessRemapMin;
 float _SmoothnessRemapMax;
 float _AORemapMin;
 float _AORemapMax;
-float _MetallicScale;
 float _DecalMaskMapBlueScale;
 
 float _Smoothness;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
index 8627370ea1d..7d5ee018e25 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs
@@ -410,7 +410,7 @@ public void InitializeMaterialValues()
                     {
                         m_RemappingAOS = new Vector4(m_Material.GetFloat("_AORemapMin"), m_Material.GetFloat("_AORemapMax"), m_Material.GetFloat("_SmoothnessRemapMin"), m_Material.GetFloat("_SmoothnessRemapMax"));
                         m_ScalingBAndRemappingM.z = m_Material.GetFloat("_MetallicRemapMin");
-                        m_ScalingBAndRemappingM.w = m_Material.GetFloat("_MetallicScale");
+                        m_ScalingBAndRemappingM.w = m_Material.GetFloat("_MetallicRemapMax");
                     }
                     else
                     {

From 62fe930211bf9fdf25a191d2f204f6775e686c22 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Thu, 22 Oct 2020 16:47:05 +0200
Subject: [PATCH 06/13] Update test project settings

---
 .../HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset    | 2 +-
 .../HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset  | 2 +-
 .../ProjectSettings/HDRPProjectSettings.asset                   | 2 +-
 .../HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset | 2 +-
 .../HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset        | 2 +-
 .../SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset     | 2 +-
 .../ProjectSettings/HDRPProjectSettings.asset                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset
index ac213ba68ad..078c26f8925 100644
--- a/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset
index 652258d83b0..951cbf903a1 100644
--- a/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset
@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset
index ac213ba68ad..078c26f8925 100644
--- a/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset
index 0355a620489..5bf066ecc89 100644
--- a/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset
@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset
index 40a40448d38..62745341dc0 100644
--- a/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset
@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset
index 3f61d8b8e10..484ec7b9502 100644
--- a/TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset
@@ -18,4 +18,4 @@ MonoBehaviour:
   m_ProjectSettingFolderPath: HDRPDefaultResources
   m_WizardPopupAtStart: 0
   m_WizardActiveTab: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset
index ac213ba68ad..078c26f8925 100644
--- a/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset
+++ b/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11

From 97cd08e743cf3e1afe75e2d825494f33771e9c1d Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 13:03:21 +0200
Subject: [PATCH 07/13] materials

---
 .../Assets/Datas/Materials/Glass_PreRefr.mat  | 16 +++++++++++++-
 .../Assets/Datas/Materials/LowResBubble.mat   | 18 ++++++++++++---
 .../Models/Bust/Materials/FacialHair.mat      | 16 +++++++++++++-
 .../Datas/Models/Bust/Materials/Head.mat      | 14 +++++++++++-
 .../Datas/Models/Bust/Materials/Jacket.mat    | 16 ++++++++++++--
 .../Assets/Datas/Models/IndoorPlant/Base.mat  | 16 +++++++++++++-
 .../Datas/Models/IndoorPlant/Leaves.mat       | 16 +++++++++++++-
 .../Datas/Models/IndoorPlant/SphereLight.mat  | 16 +++++++++++++-
 .../Assets/Datas/Models/IndoorPlant/Stems.mat | 16 +++++++++++++-
 .../Datas/Models/LucyStatue/GlassLucy.mat     | 16 +++++++++++++-
 .../Materials/ConstructionLight_Mat.mat       | 16 +++++++++++++-
 .../Materials/DryWallPainted_Mat.mat          | 16 +++++++++++++-
 .../001-HDTemplate/Materials/DryWall_Mat.mat  | 16 +++++++++++++-
 .../Scenes/001-HDTemplate/Materials/Glass.mat | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Glass_Blur.mat   | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Graffiti.mat     |  5 +++--
 .../001-HDTemplate/Materials/Ground_Mat.mat   | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Hammer_Mat.mat   | 16 +++++++++++++-
 .../001-HDTemplate/Materials/HardHat_Mat.mat  | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Jigsaw_Mat.mat   | 16 +++++++++++++-
 .../Materials/LightBulb_Mat.mat               | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Liquid_Mat.mat   | 16 +++++++++++++-
 .../Materials/Metal_Blue_Simple_Mat.mat       | 16 +++++++++++++-
 .../Materials/Metal_Simple_Mat.mat            |  2 +-
 .../001-HDTemplate/Materials/MirrorDecal.mat  |  5 +++--
 .../001-HDTemplate/Materials/OBS_Mat.mat      | 16 +++++++++++++-
 .../Materials/PaintBrush_Mat.mat              | 16 +++++++++++++-
 .../001-HDTemplate/Materials/PaintCan_mat.mat | 16 +++++++++++++-
 .../Materials/PaintLabel_Mat.mat              | 16 +++++++++++++-
 .../Materials/Plastic_Black_Mat.mat           | 16 +++++++++++++-
 .../Materials/Plastic_Gray_Mat.mat            | 16 +++++++++++++-
 .../Materials/Plastic_Ridges_Mat.mat          | 16 +++++++++++++-
 .../Materials/Plastic_Rough_Mat.mat           | 16 +++++++++++++-
 .../Materials/Plastic_Transparent.mat         | 16 +++++++++++++-
 .../Materials/Plastic_White_Mat.mat           | 16 +++++++++++++-
 .../Materials/Plastic_Yellow_Mat.mat          | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Strap_Mat.mat    | 16 +++++++++++++-
 .../001-HDTemplate/Materials/Stud_Mat.mat     | 16 +++++++++++++-
 .../001-HDTemplate/Materials/WaterPuddle.mat  |  2 +-
 .../Assets/Scenes/001-HDTemplate/Mirror.mat   | 16 +++++++++++++-
 .../Scenes/001-HDTemplate/MirrorNoSSR.mat     | 16 +++++++++++++-
 .../AllMaterials/AutodeskInteractive.mat      | 14 +++++++++++-
 .../002-HDMaterials/AllMaterials/AxF.mat      |  2 +-
 .../AllMaterials/AxF_Transparent.mat          |  2 +-
 .../002-HDMaterials/AllMaterials/Eye.mat      |  2 +-
 .../AllMaterials/Eye_Transparent.mat          |  2 +-
 .../002-HDMaterials/AllMaterials/Fabric.mat   |  2 +-
 .../AllMaterials/Fabric_Transparent.mat       |  2 +-
 .../002-HDMaterials/AllMaterials/Hair.mat     |  2 +-
 .../AllMaterials/Hair_Transparent.mat         |  2 +-
 .../AllMaterials/LayeredLit.mat               | 22 ++++++++++++++++++-
 .../AllMaterials/LayeredLitTesselation.mat    | 22 ++++++++++++++++++-
 .../LayeredLitTesselation_Transparent.mat     | 22 ++++++++++++++++++-
 .../AllMaterials/LayeredLit_Transparent.mat   | 22 ++++++++++++++++++-
 .../002-HDMaterials/AllMaterials/Lit.mat      | 16 +++++++++++++-
 .../AllMaterials/LitTesselation.mat           | 16 +++++++++++++-
 .../LitTesselation_Transparent.mat            | 16 +++++++++++++-
 .../AllMaterials/Lit_Transparent.mat          | 16 +++++++++++++-
 .../002-HDMaterials/AllMaterials/StackLit.mat |  2 +-
 .../AllMaterials/StackLit_Transparent.mat     |  2 +-
 .../002-HDMaterials/AllMaterials/Unlit.mat    |  2 +-
 .../AllMaterials/Unlit_Transparent.mat        |  2 +-
 .../002-HDMaterials/AnimatedDecal 1.mat       |  2 +-
 .../002-HDMaterials/AnimatedDecal 2.mat       |  2 +-
 .../002-HDMaterials/AnimatedDecal 3.mat       |  2 +-
 .../002-HDMaterials/AnimatedDecal 4.mat       |  2 +-
 .../Scenes/002-HDMaterials/AnimatedDecal.mat  |  2 +-
 .../002-HDMaterials/AnimatedMeshDecal.mat     |  2 +-
 .../Scenes/002-HDMaterials/Background.mat     | 16 +++++++++++++-
 .../Assets/Scenes/002-HDMaterials/Decal-2.mat |  5 +++--
 .../Assets/Scenes/002-HDMaterials/Decal.mat   |  5 +++--
 .../Scenes/002-HDMaterials/Distortion.mat     | 16 +++++++++++++-
 .../002-HDMaterials/MirrorWithoutSSR.mat      | 16 +++++++++++++-
 .../Scenes/002-HDMaterials/Refraction.mat     | 16 +++++++++++++-
 .../002-HDMaterials/RefractionDistortion.mat  | 16 +++++++++++++-
 .../003-VirtualTexturing/AnisotrpicMat.mat    |  2 +-
 .../003-VirtualTexturing/BiasGraphMat.mat     |  2 +-
 .../BiasLowQualityGraph.mat                   |  2 +-
 .../003-VirtualTexturing/CloudGraphMat.mat    | 15 ++++++++++++-
 .../003-VirtualTexturing/EmisUnlitMat.mat     |  2 +-
 .../003-VirtualTexturing/ExplicitLodMat.mat   | 21 ++++++++++++++++--
 .../003-VirtualTexturing/EyeGraphMat.mat      |  2 +-
 .../003-VirtualTexturing/FabricGraphMat.mat   |  2 +-
 .../003-VirtualTexturing/HairGraphMat.mat     |  2 +-
 .../003-VirtualTexturing/KeywordGraphMat.mat  |  2 +-
 .../KeywordGraphMat_Variant.mat               |  2 +-
 .../003-VirtualTexturing/LitGraphMat.mat      | 15 ++++++++++++-
 .../003-VirtualTexturing/LowQualGraphMat.mat  | 17 ++++++++++++--
 .../003-VirtualTexturing/MipEquivalentMat.mat |  2 +-
 .../MultiSampleGraphMat.mat                   | 17 ++++++++++++--
 .../003-VirtualTexturing/PBRGraphMat.mat      | 15 ++++++++++++-
 .../003-VirtualTexturing/SSSGraphMat.mat      | 17 ++++++++++++--
 .../003-VirtualTexturing/StackLitGraphMat.mat |  2 +-
 .../003-VirtualTexturing/UnlitGraphMat.mat    |  2 +-
 .../VTSubGraphShaderMat.mat                   |  2 +-
 .../003-VirtualTexturing/VertexShaderMat.mat  | 17 ++++++++++++--
 .../VtSubGraphTexArgShaderMat.mat             |  2 +-
 .../Material/DefaultHDDecalMaterial.mat       |  5 +++--
 .../Material/DefaultHDMaterial.mat            |  4 +++-
 .../Material/DefaultHDMirrorMaterial.mat      | 16 +++++++++++++-
 .../Material/DefaultHDParticleMaterial.mat    |  2 +-
 .../Material/DefaultHDTerrainMaterial.mat     |  2 +-
 .../CornelBox/Materials/Cornell Box.mat       | 16 +++++++++++++-
 .../CornelBox/Materials/Cornell Box_green.mat | 16 +++++++++++++-
 .../CornelBox/Materials/Cornell Box_red.mat   | 16 +++++++++++++-
 .../3DObjects/GroundLeaf/GroundLeaf.mat       | 16 +++++++++++++-
 .../3DObjects/PerryHead/Head.mat              | 16 +++++++++++++-
 .../Fonts/Font Material SG.mat                |  2 +-
 .../Fonts/Font Material.mat                   |  2 +-
 .../Materials/BW Gradient.mat                 |  2 +-
 .../ComplexMaterial/ComplexMaterial.mat       | 16 +++++++++++++-
 .../Materials/FourShapes.mat                  | 16 +++++++++++++-
 .../Materials/FourShapes_POM.mat              | 16 +++++++++++++-
 .../Materials/FourShapes_POM_DepthOffset.mat  | 16 +++++++++++++-
 .../Materials/FourShapes_Tesselation.mat      | 16 +++++++++++++-
 .../Materials/Lit_Color/LIT_BLUE.mat          | 16 +++++++++++++-
 .../Materials/Lit_Color/LIT_CYAN.mat          | 16 +++++++++++++-
 .../Materials/Lit_Color/LIT_RED.mat           | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_Black.mat         | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_DarkGrey.mat      | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_Green.mat         | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_LightGrey.mat     | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_MidGrey.mat       | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_Purple.mat        | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_White.mat         | 16 +++++++++++++-
 .../Materials/Lit_Color/Lit_Yellow.mat        | 16 +++++++++++++-
 .../Materials/Lit_PixelGrid.mat               | 16 +++++++++++++-
 .../Materials/Lit_PixelGrid_Small.mat         | 16 +++++++++++++-
 .../Materials/Numbers/Number_00.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_01.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_02.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_03.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_04.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_05.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_06.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_07.mat           | 16 +++++++++++++-
 .../Materials/Numbers/Number_08.mat           | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_00.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_01.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_02.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_03.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_04.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_05.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_06.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_07.mat         | 16 +++++++++++++-
 .../Numbers_GPUInstance/Number_08.mat         | 16 +++++++++++++-
 com.unity.testing.hdrp/Materials/PreRef.mat   | 16 +++++++++++++-
 .../Materials/PreRefractionPassTester.mat     | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_00.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_01.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_02.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_03.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_04.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_05.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_06.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_07.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_08.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_09.mat                  | 16 +++++++++++++-
 .../HDRP_Metal_Smooth_10.mat                  | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_00.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_01.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_02.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_03.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_04.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_05.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_06.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_07.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_08.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_09.mat               | 16 +++++++++++++-
 .../HDRP_NonMetal_Smooth_10.mat               | 16 +++++++++++++-
 .../Materials/SyntheticColorChart.mat         |  2 +-
 .../Materials/Tests_Default_Mat.mat           | 16 +++++++++++++-
 .../Materials/Transparent.mat                 | 16 +++++++++++++-
 .../Materials/Unlit_Black.mat                 |  2 +-
 .../Materials/Unlit_GridMarkers.mat           |  2 +-
 .../Materials/Unlit_MidGrey.mat               |  2 +-
 .../Materials/Unlit_PixelGrid.mat             |  2 +-
 .../Materials/Unlit_PixelGrid_Small.mat       |  2 +-
 .../Materials/Unlit_White.mat                 |  2 +-
 .../Materials/Unlit_White_Transparent.mat     |  2 +-
 .../Materials/White_Mate.mat                  | 16 +++++++++++++-
 181 files changed, 2005 insertions(+), 194 deletions(-)

diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/Glass_PreRefr.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/Glass_PreRefr.mat
index 11f3a95b399..8e6935eb2c6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/Glass_PreRefr.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/Glass_PreRefr.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/LowResBubble.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/LowResBubble.mat
index 9d77871ff70..b0593bbc349 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/LowResBubble.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Materials/LowResBubble.mat
@@ -10,8 +10,8 @@ Material:
   m_Name: LowResBubble
   m_Shader: {fileID: -6465566751694194690, guid: ef3fd2fe1cf6c074a9322132aa0765f2,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
-    _DOUBLESIDED_ON _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _DOUBLESIDED_ON _ENABLE_FOG_ON_TRANSPARENT _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_61D65F46: 1
     - Vector1_803C79CB: 0.05
@@ -274,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/FacialHair.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/FacialHair.mat
index 43e842e94e4..0ab13eb7d3e 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/FacialHair.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/FacialHair.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -268,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Head.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Head.mat
index 7a6fcd65de1..29c88dc514c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Head.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Head.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -148,6 +148,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_59F9E24E: 50
     - Vector1_63C349E4: 0.5
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Jacket.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Jacket.mat
index f24fd5d397c..1264b022855 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Jacket.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/Bust/Materials/Jacket.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -147,6 +147,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_59F9E24E: 0
     - Vector1_63C349E4: 0
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Base.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Base.mat
index 8dea8b54b10..455c1d424e8 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Base.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Base.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Leaves.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Leaves.mat
index 2afe367ae24..21cbecbc8c0 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Leaves.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Leaves.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/SphereLight.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/SphereLight.mat
index 6063fdb7f80..87b93b03ea0 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/SphereLight.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/SphereLight.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Stems.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Stems.mat
index f1d72eef158..042907099d0 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Stems.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/IndoorPlant/Stems.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/LucyStatue/GlassLucy.mat b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/LucyStatue/GlassLucy.mat
index 9d6dcbcf59d..9513ecc1bcc 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/LucyStatue/GlassLucy.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Datas/Models/LucyStatue/GlassLucy.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -185,6 +197,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -270,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/ConstructionLight_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/ConstructionLight_Mat.mat
index 8eb5e15ef73..0a3fddc0478 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/ConstructionLight_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/ConstructionLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWallPainted_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWallPainted_Mat.mat
index e1940d6976b..1ae3338fa18 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWallPainted_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWallPainted_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWall_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWall_Mat.mat
index 28d55914f3d..d3d87a54f6d 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWall_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/DryWall_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass.mat
index 9678e569225..9027a22d177 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass_Blur.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass_Blur.mat
index 308edbd55d2..cb0fd27f562 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass_Blur.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Glass_Blur.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Graffiti.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Graffiti.mat
index 568dcfda91e..c52da5aaff3 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Graffiti.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Graffiti.mat
@@ -196,7 +196,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 1
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -280,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Ground_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Ground_Mat.mat
index 4537b69b16f..70d8ae39cfd 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Ground_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Ground_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Hammer_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Hammer_Mat.mat
index 6dff8cda741..2d8a22d88a8 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Hammer_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Hammer_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/HardHat_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/HardHat_Mat.mat
index 757ff07814c..07e314ab70b 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/HardHat_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/HardHat_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Jigsaw_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Jigsaw_Mat.mat
index ad6517af161..0b240cdf4a9 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Jigsaw_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Jigsaw_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/LightBulb_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/LightBulb_Mat.mat
index ec4fded9552..6405933d607 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/LightBulb_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/LightBulb_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Liquid_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Liquid_Mat.mat
index 2001d71c55c..aae052d4968 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Liquid_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Liquid_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -156,6 +156,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -238,6 +250,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 3
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Blue_Simple_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Blue_Simple_Mat.mat
index a0d9930b646..457c730ccfc 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Blue_Simple_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Blue_Simple_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Simple_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Simple_Mat.mat
index 12fc347399f..7a26709dbdd 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Simple_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Metal_Simple_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/MirrorDecal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/MirrorDecal.mat
index 7f1665332c5..54a2fb0f6f3 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/MirrorDecal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/MirrorDecal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -209,7 +209,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/OBS_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/OBS_Mat.mat
index 0d1a7aa0487..f6c6fe1b4f9 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/OBS_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/OBS_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintBrush_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintBrush_Mat.mat
index f9fdf4c80f3..65f1fe5d1a7 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintBrush_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintBrush_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintCan_mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintCan_mat.mat
index 46fe59bf0cb..453dd55709f 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintCan_mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintCan_mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintLabel_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintLabel_Mat.mat
index dbb255dcea3..a122ff4d83e 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintLabel_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/PaintLabel_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Black_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Black_Mat.mat
index 81663a2c932..2544748851c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Black_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Black_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Gray_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Gray_Mat.mat
index 0cb4ad25747..19a47ff843d 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Gray_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Gray_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Ridges_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Ridges_Mat.mat
index 05950e94877..d28b8785f75 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Ridges_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Ridges_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Rough_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Rough_Mat.mat
index 51fe26ca439..bfb8f80820c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Rough_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Rough_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -236,6 +248,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Transparent.mat
index 8ca5b8027a5..8cb25855ab2 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -156,6 +156,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -238,6 +250,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 3
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_White_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_White_Mat.mat
index cf48a32ad5b..e9fdf12f4da 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_White_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_White_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Yellow_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Yellow_Mat.mat
index f49be3607d4..d7f74fcf34e 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Yellow_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Plastic_Yellow_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Strap_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Strap_Mat.mat
index 3a2c481c500..e0d6bc90887 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Strap_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Strap_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Stud_Mat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Stud_Mat.mat
index 4f964d8870c..d2d8670d55c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Stud_Mat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/Stud_Mat.mat
@@ -141,6 +141,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -223,6 +235,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -320,4 +334,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/WaterPuddle.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/WaterPuddle.mat
index a19ff07e6ff..c640de20a46 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/WaterPuddle.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Materials/WaterPuddle.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Mirror.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Mirror.mat
index 95ccd9535ad..da89b6649a9 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Mirror.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/Mirror.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/MirrorNoSSR.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/MirrorNoSSR.mat
index 5d0b007fa77..71f7dc9e72b 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/MirrorNoSSR.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/001-HDTemplate/MirrorNoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AutodeskInteractive.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AutodeskInteractive.mat
index 03fc284b6f4..c4269283bb4 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AutodeskInteractive.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AutodeskInteractive.mat
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -304,4 +316,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF.mat
index f82a89bda21..9e2ef937a55 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF.mat
@@ -351,4 +351,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF_Transparent.mat
index ed6e6662442..ec993411713 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/AxF_Transparent.mat
@@ -351,4 +351,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye.mat
index f3fa52e0378..33746db0e5f 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye_Transparent.mat
index 9a0576ac70d..8592951417e 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Eye_Transparent.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric.mat
index 1951f040aee..996b786a236 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric_Transparent.mat
index 5de76a7a223..18da6af7026 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Fabric_Transparent.mat
@@ -269,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair.mat
index bdd6f9ffd99..976444fbb91 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair.mat
@@ -272,4 +272,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair_Transparent.mat
index 5406b31cab7..87fd59f43b6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Hair_Transparent.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit.mat
index 5dd5e40e073..71779ee3b79 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit.mat
@@ -282,6 +282,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -443,6 +455,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -608,4 +628,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation.mat
index 377ba6a131a..33e65852c62 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation.mat
@@ -283,6 +283,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -444,6 +456,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -608,4 +628,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation_Transparent.mat
index 9c2ff2782aa..4f4a5e03fd6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLitTesselation_Transparent.mat
@@ -285,6 +285,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -446,6 +458,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -610,4 +630,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit_Transparent.mat
index 53e274e053a..3466aeae759 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LayeredLit_Transparent.mat
@@ -284,6 +284,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -610,4 +630,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit.mat
index 6f659c29cdd..5af1ca4f737 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -268,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation.mat
index 43779ee5c0a..293a7c38a41 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation.mat
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -278,4 +292,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation_Transparent.mat
index 626a6ef0475..2ec7a7dd2e5 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/LitTesselation_Transparent.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -279,4 +293,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit_Transparent.mat
index a2fbb9579c0..36d80553b70 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Lit_Transparent.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -270,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit.mat
index 243c6dba26f..3eab4923950 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit_Transparent.mat
index 7d0b0c670cc..14878760a1f 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/StackLit_Transparent.mat
@@ -270,4 +270,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit.mat
index d043a9a37bd..ba8033f3ad3 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit_Transparent.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit_Transparent.mat
index a12724fc9fd..0b3d911180e 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit_Transparent.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AllMaterials/Unlit_Transparent.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat
index 01e582a8b75..383d5c17ad0 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat	
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat
index 9deb9c1d5ec..fd84565fb4f 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat	
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat
index f0c5c777ebb..5f2b24d2d11 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat	
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat
index 03a29f3cc79..ad11e6b21e7 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat	
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
index 79f8822c262..2448f84c843 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
index 3bc9136e0ef..9f7a0d20395 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Background.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Background.mat
index 195fe2c1876..30a5ac91cc4 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Background.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Background.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal-2.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal-2.mat
index 5e489c45da0..ca178c2df07 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal-2.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal-2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -208,7 +208,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal.mat
index ce2c854da7d..35a74aded77 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Decal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Distortion.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Distortion.mat
index 104cd940a3c..6e913da98a6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Distortion.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Distortion.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/MirrorWithoutSSR.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/MirrorWithoutSSR.mat
index 2f520bcca80..042da26b531 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/MirrorWithoutSSR.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/MirrorWithoutSSR.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Refraction.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Refraction.mat
index 93871e83b19..f9faf223ba8 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Refraction.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/Refraction.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/RefractionDistortion.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/RefractionDistortion.mat
index 16a96658165..193b3678cb4 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/RefractionDistortion.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/RefractionDistortion.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/AnisotrpicMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/AnisotrpicMat.mat
index b0e175d49a0..b0882b50e70 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/AnisotrpicMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/AnisotrpicMat.mat
@@ -106,4 +106,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasGraphMat.mat
index 6da166d615c..f295709524c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasGraphMat.mat
@@ -115,4 +115,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasLowQualityGraph.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasLowQualityGraph.mat
index 8b46d62f7d3..9e2b06ec92c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasLowQualityGraph.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/BiasLowQualityGraph.mat
@@ -86,4 +86,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/CloudGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/CloudGraphMat.mat
index aa6a274b146..61d66295705 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/CloudGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/CloudGraphMat.mat
@@ -71,6 +71,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 402f77c2ec784934a884d97647d9fe9b, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1EC2602A: 0.5
     - Vector1_A6D4BDE2: 0.5
@@ -93,6 +105,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -136,4 +149,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EmisUnlitMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EmisUnlitMat.mat
index 826ccd066f4..6db697b1e8c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EmisUnlitMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EmisUnlitMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/ExplicitLodMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/ExplicitLodMat.mat
index 84e2735d5c8..5ac3902a4a6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/ExplicitLodMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/ExplicitLodMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -43,6 +43,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 526f56bddea1ec94abca08e368cb7006, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2DLOD_6fad39c7ec250181950b11a33ff88d86_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 526f56bddea1ec94abca08e368cb7006, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2DLOD_70f2bf17e2a1464ca267f0ccfbe702f7_Texture_1:
         m_Texture: {fileID: 2800000, guid: 526f56bddea1ec94abca08e368cb7006, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -75,6 +79,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 526f56bddea1ec94abca08e368cb7006, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -95,6 +111,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EyeGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EyeGraphMat.mat
index 2d2bc6827ed..cc98f7db804 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EyeGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/EyeGraphMat.mat
@@ -101,4 +101,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/FabricGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/FabricGraphMat.mat
index e6e8c61c327..66f1ae56ad0 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/FabricGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/FabricGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/HairGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/HairGraphMat.mat
index 817704e8507..f5f71f4fa73 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/HairGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/HairGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat.mat
index a202960497e..b5bc02a5c60 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat_Variant.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat_Variant.mat
index 165724e7c93..544aae1d58a 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat_Variant.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/KeywordGraphMat_Variant.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LitGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LitGraphMat.mat
index ee935b3d086..a51d4ee643a 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LitGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LitGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -79,6 +79,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3a5dd8b426778e14cb9f1f2e716841f8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -99,6 +111,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LowQualGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LowQualGraphMat.mat
index 28fe4f3ec19..37f5a611da5 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LowQualGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/LowQualGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -47,6 +47,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 312de1f115b043b42804703d66a0e4b8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -67,6 +79,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MipEquivalentMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MipEquivalentMat.mat
index cabf003f821..c8f6d1eaf66 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MipEquivalentMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MipEquivalentMat.mat
@@ -118,4 +118,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MultiSampleGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MultiSampleGraphMat.mat
index 623c2dd434a..f00d2e2f655 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MultiSampleGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/MultiSampleGraphMat.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -62,6 +62,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 45616a16dd1d6db4c8b22f5f0963c86a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -82,6 +94,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -125,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/PBRGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/PBRGraphMat.mat
index 2d276685960..3e497bd8fc6 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/PBRGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/PBRGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -80,6 +80,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3a5dd8b426778e14cb9f1f2e716841f8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -100,6 +112,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/SSSGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/SSSGraphMat.mat
index a8930069e3a..d1094d1074c 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/SSSGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/SSSGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -79,6 +79,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3a5dd8b426778e14cb9f1f2e716841f8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -100,6 +112,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 1
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/StackLitGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/StackLitGraphMat.mat
index efa2c46861d..0bda9fab339 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/StackLitGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/StackLitGraphMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/UnlitGraphMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/UnlitGraphMat.mat
index ec2934fcc31..bcc6257fe2b 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/UnlitGraphMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/UnlitGraphMat.mat
@@ -106,4 +106,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VTSubGraphShaderMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VTSubGraphShaderMat.mat
index c1cc038cd68..9547699b917 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VTSubGraphShaderMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VTSubGraphShaderMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VertexShaderMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VertexShaderMat.mat
index 54b1f7f696b..e68f7af8170 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VertexShaderMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VertexShaderMat.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -58,6 +58,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 312de1f115b043b42804703d66a0e4b8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -78,6 +90,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -121,4 +134,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VtSubGraphTexArgShaderMat.mat b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VtSubGraphTexArgShaderMat.mat
index 2e910effde5..db3f5a4d239 100644
--- a/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VtSubGraphTexArgShaderMat.mat
+++ b/TestProjects/HDRP_RuntimeTests/Assets/Scenes/003-VirtualTexturing/VtSubGraphTexArgShaderMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDDecalMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDDecalMaterial.mat
index 35cf5f19060..7f2e1fb97ca 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDDecalMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDDecalMaterial.mat
@@ -243,7 +243,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
@@ -317,4 +318,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
index 2504224a0bc..48242fe6a26 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -271,6 +271,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMirrorMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMirrorMaterial.mat
index 19d6877273b..6099896159f 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMirrorMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMirrorMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -167,6 +167,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -258,6 +270,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat
index 4b59a888985..6dae3bff31a 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat
index 90260c0fddc..bf25ddccb75 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box.mat b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box.mat
index 8a644296838..c2c969b511f 100644
--- a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box.mat	
+++ b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box.mat	
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -241,6 +253,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -346,4 +360,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_green.mat b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_green.mat
index 22f1813f732..10010d9b5b5 100644
--- a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_green.mat	
+++ b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_green.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -167,6 +167,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -254,6 +266,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_red.mat b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_red.mat
index 893fa7e6a26..6ccefae5eba 100644
--- a/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_red.mat	
+++ b/com.unity.testing.hdrp/3DObjects/CornelBox/Materials/Cornell Box_red.mat	
@@ -154,6 +154,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -241,6 +253,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -346,4 +360,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/3DObjects/GroundLeaf/GroundLeaf.mat b/com.unity.testing.hdrp/3DObjects/GroundLeaf/GroundLeaf.mat
index 276747d2686..7594e87926a 100644
--- a/com.unity.testing.hdrp/3DObjects/GroundLeaf/GroundLeaf.mat
+++ b/com.unity.testing.hdrp/3DObjects/GroundLeaf/GroundLeaf.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -126,6 +126,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -204,6 +216,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/3DObjects/PerryHead/Head.mat b/com.unity.testing.hdrp/3DObjects/PerryHead/Head.mat
index 9c973112b70..cf8d9198cc9 100644
--- a/com.unity.testing.hdrp/3DObjects/PerryHead/Head.mat
+++ b/com.unity.testing.hdrp/3DObjects/PerryHead/Head.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -283,4 +297,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Fonts/Font Material SG.mat b/com.unity.testing.hdrp/Fonts/Font Material SG.mat
index c4d60e2b551..2fdef24ab08 100644
--- a/com.unity.testing.hdrp/Fonts/Font Material SG.mat	
+++ b/com.unity.testing.hdrp/Fonts/Font Material SG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Fonts/Font Material.mat b/com.unity.testing.hdrp/Fonts/Font Material.mat
index 9c173005914..1835c128fd5 100644
--- a/com.unity.testing.hdrp/Fonts/Font Material.mat	
+++ b/com.unity.testing.hdrp/Fonts/Font Material.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/BW Gradient.mat b/com.unity.testing.hdrp/Materials/BW Gradient.mat
index fc763a63893..901494fa86b 100644
--- a/com.unity.testing.hdrp/Materials/BW Gradient.mat	
+++ b/com.unity.testing.hdrp/Materials/BW Gradient.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/ComplexMaterial/ComplexMaterial.mat b/com.unity.testing.hdrp/Materials/ComplexMaterial/ComplexMaterial.mat
index cad6591c1d2..696012ed969 100644
--- a/com.unity.testing.hdrp/Materials/ComplexMaterial/ComplexMaterial.mat
+++ b/com.unity.testing.hdrp/Materials/ComplexMaterial/ComplexMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/FourShapes.mat b/com.unity.testing.hdrp/Materials/FourShapes.mat
index 65557b141bf..d6ded9a327b 100644
--- a/com.unity.testing.hdrp/Materials/FourShapes.mat
+++ b/com.unity.testing.hdrp/Materials/FourShapes.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/FourShapes_POM.mat b/com.unity.testing.hdrp/Materials/FourShapes_POM.mat
index 957ded16e96..f25cc896259 100644
--- a/com.unity.testing.hdrp/Materials/FourShapes_POM.mat
+++ b/com.unity.testing.hdrp/Materials/FourShapes_POM.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -203,6 +215,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/FourShapes_POM_DepthOffset.mat b/com.unity.testing.hdrp/Materials/FourShapes_POM_DepthOffset.mat
index c346729b243..5b1a3b514c0 100644
--- a/com.unity.testing.hdrp/Materials/FourShapes_POM_DepthOffset.mat
+++ b/com.unity.testing.hdrp/Materials/FourShapes_POM_DepthOffset.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -203,6 +215,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/FourShapes_Tesselation.mat b/com.unity.testing.hdrp/Materials/FourShapes_Tesselation.mat
index 66318b04dee..0a902c81753 100644
--- a/com.unity.testing.hdrp/Materials/FourShapes_Tesselation.mat
+++ b/com.unity.testing.hdrp/Materials/FourShapes_Tesselation.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_BLUE.mat b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_BLUE.mat
index 69115bba463..c674426968b 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_BLUE.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_BLUE.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_CYAN.mat b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_CYAN.mat
index 1cc021246b2..f659f0e0427 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_CYAN.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_CYAN.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_RED.mat b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_RED.mat
index 147177069b3..2133c2242e3 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/LIT_RED.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/LIT_RED.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -192,6 +204,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -286,4 +300,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Black.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Black.mat
index 7d899e1b46e..47174dcc97c 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Black.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Black.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -280,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_DarkGrey.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_DarkGrey.mat
index b13fbdee007..a3f84990dbf 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_DarkGrey.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_DarkGrey.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Green.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Green.mat
index bf32055b92a..b4b6c1bb1f7 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Green.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Green.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_LightGrey.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_LightGrey.mat
index 786386e1e04..3c539170b1e 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_LightGrey.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_LightGrey.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -280,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_MidGrey.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_MidGrey.mat
index f737342942a..0340fc6dd9b 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_MidGrey.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_MidGrey.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Purple.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Purple.mat
index 859331b66c3..5b88596063d 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Purple.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Purple.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -280,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_White.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_White.mat
index 5f36b23eeec..01c66ef115d 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_White.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_White.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Yellow.mat b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Yellow.mat
index c29ccca06c8..179a76ceaba 100644
--- a/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Yellow.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_Color/Lit_Yellow.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -280,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_PixelGrid.mat b/com.unity.testing.hdrp/Materials/Lit_PixelGrid.mat
index 147033a57ff..cecd103bd51 100644
--- a/com.unity.testing.hdrp/Materials/Lit_PixelGrid.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_PixelGrid.mat
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3dd789714c4d7ef4ba0dd0d92fb66905, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -192,6 +204,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -285,4 +299,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Lit_PixelGrid_Small.mat b/com.unity.testing.hdrp/Materials/Lit_PixelGrid_Small.mat
index 489e6bf982e..53b706ff95e 100644
--- a/com.unity.testing.hdrp/Materials/Lit_PixelGrid_Small.mat
+++ b/com.unity.testing.hdrp/Materials/Lit_PixelGrid_Small.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -126,6 +126,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 15420b0aa689c3342ab7b09d74fc5560, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_00.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_00.mat
index 7bc8c9686b1..834999e39f2 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_00.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_00.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_01.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_01.mat
index fcaf412ce5d..6f764f4dd53 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_01.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_01.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_02.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_02.mat
index d4acd3f6b3c..d8d2fa89cae 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_02.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_02.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_03.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_03.mat
index 961f6ebda37..83e4ec435cd 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_03.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_03.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_04.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_04.mat
index 3dfba183966..e3b8b9dd544 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_04.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_04.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_05.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_05.mat
index 0151ca33b3e..867564a9240 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_05.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_05.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_06.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_06.mat
index 530db6e1523..1c1ffd25063 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_06.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_06.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_07.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_07.mat
index 463fe890194..0000392ea18 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_07.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_07.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers/Number_08.mat b/com.unity.testing.hdrp/Materials/Numbers/Number_08.mat
index 51b928033b1..f4af4995b6f 100644
--- a/com.unity.testing.hdrp/Materials/Numbers/Number_08.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers/Number_08.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_00.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_00.mat
index 92e57d8fe53..fa1d7805297 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_00.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_00.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_01.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_01.mat
index 1ec8afca2b1..dbf43c642c7 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_01.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_01.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_02.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_02.mat
index 03269d179ff..d71dc72859d 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_02.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_02.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_03.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_03.mat
index df420ddc384..dbd792f260d 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_03.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_03.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_04.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_04.mat
index ddc98424d06..dfc872ce943 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_04.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_04.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_05.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_05.mat
index 26f19204a72..0a385d1a9f3 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_05.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_05.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_06.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_06.mat
index 9cb8357a690..547ab9a80d1 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_06.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_06.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_07.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_07.mat
index c0d763b20e7..77462348322 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_07.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_07.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_08.mat b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_08.mat
index eed0d2540a9..146862b9650 100644
--- a/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_08.mat
+++ b/com.unity.testing.hdrp/Materials/Numbers_GPUInstance/Number_08.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/PreRef.mat b/com.unity.testing.hdrp/Materials/PreRef.mat
index 4e0583d7608..dba07c3ac58 100644
--- a/com.unity.testing.hdrp/Materials/PreRef.mat
+++ b/com.unity.testing.hdrp/Materials/PreRef.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/PreRefractionPassTester.mat b/com.unity.testing.hdrp/Materials/PreRefractionPassTester.mat
index fe933afc117..8de63de6be8 100644
--- a/com.unity.testing.hdrp/Materials/PreRefractionPassTester.mat
+++ b/com.unity.testing.hdrp/Materials/PreRefractionPassTester.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -291,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_00.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_00.mat
index eb509cf1671..33e0299b663 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_00.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_00.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_01.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_01.mat
index 391ce0b6f0a..90e91f9ea05 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_01.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_01.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_02.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_02.mat
index df4fc0022f0..0c22a3c41de 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_02.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_02.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_03.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_03.mat
index 51c0a0aec7b..743be45eac8 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_03.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_03.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_04.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_04.mat
index 0df5b297351..a1a6e3be251 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_04.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_04.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_05.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_05.mat
index 1afd332eec0..0cd8d032977 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_05.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_05.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_06.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_06.mat
index b0f52723c20..2d0508b0ee9 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_06.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_06.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_07.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_07.mat
index 2c818726f47..1305cff9c65 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_07.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_07.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_08.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_08.mat
index d94d91e821f..8fd39bd724d 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_08.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_08.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_09.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_09.mat
index ac9b7fb7268..88df75b9fe3 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_09.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_09.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_10.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_10.mat
index 48f0fe8cdec..12850126d65 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_10.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_Metal_Smooth_10.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_00.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_00.mat
index e17fbc1fa4f..020ba4f617f 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_00.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_00.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_01.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_01.mat
index 5d799716e14..25ed09ca3bb 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_01.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_01.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_02.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_02.mat
index cf7c7bb4b4d..483c99b4854 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_02.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_02.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_03.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_03.mat
index 56ec9953595..45cea7bff3c 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_03.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_03.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_04.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_04.mat
index 4e647af2ee7..c3bedf5f23f 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_04.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_04.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_05.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_05.mat
index e3107cddea6..959c394925a 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_05.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_05.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_06.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_06.mat
index 76cb776165e..70f9eb7fa56 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_06.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_06.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_07.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_07.mat
index 5d9b971a8ff..113e39627c9 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_07.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_07.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_08.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_08.mat
index 3f712fe7272..4dfb10decc6 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_08.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_08.mat	
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_09.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_09.mat
index c25d3657e9c..995f2215e93 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_09.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_09.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_10.mat b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_10.mat
index 5b4a43c2550..8cac6a7835e 100644
--- a/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_10.mat	
+++ b/com.unity.testing.hdrp/Materials/Smoothness Variation/HDRP_NonMetal_Smooth_10.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/SyntheticColorChart.mat b/com.unity.testing.hdrp/Materials/SyntheticColorChart.mat
index cf0f80c4e83..e8ce6a507ba 100644
--- a/com.unity.testing.hdrp/Materials/SyntheticColorChart.mat
+++ b/com.unity.testing.hdrp/Materials/SyntheticColorChart.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/Tests_Default_Mat.mat b/com.unity.testing.hdrp/Materials/Tests_Default_Mat.mat
index 576d97d79ba..98ca25316b3 100644
--- a/com.unity.testing.hdrp/Materials/Tests_Default_Mat.mat
+++ b/com.unity.testing.hdrp/Materials/Tests_Default_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.testing.hdrp/Materials/Transparent.mat b/com.unity.testing.hdrp/Materials/Transparent.mat
index 8adcd0daa6a..12607c10883 100644
--- a/com.unity.testing.hdrp/Materials/Transparent.mat
+++ b/com.unity.testing.hdrp/Materials/Transparent.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Unlit_Black.mat b/com.unity.testing.hdrp/Materials/Unlit_Black.mat
index e2f4de2c310..22673cb8004 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_Black.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_Black.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/Unlit_GridMarkers.mat b/com.unity.testing.hdrp/Materials/Unlit_GridMarkers.mat
index f9e8537cf2f..959e6f03cb4 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_GridMarkers.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_GridMarkers.mat
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Unlit_MidGrey.mat b/com.unity.testing.hdrp/Materials/Unlit_MidGrey.mat
index 061897716f3..8f66611393b 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_MidGrey.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_MidGrey.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Unlit_PixelGrid.mat b/com.unity.testing.hdrp/Materials/Unlit_PixelGrid.mat
index 715ebece4cb..117ab50b75e 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_PixelGrid.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_PixelGrid.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/Unlit_PixelGrid_Small.mat b/com.unity.testing.hdrp/Materials/Unlit_PixelGrid_Small.mat
index 94652770f19..54cd564eb6c 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_PixelGrid_Small.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_PixelGrid_Small.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/Unlit_White.mat b/com.unity.testing.hdrp/Materials/Unlit_White.mat
index 5bc3b73bf0e..d35375732f7 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_White.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_White.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.hdrp/Materials/Unlit_White_Transparent.mat b/com.unity.testing.hdrp/Materials/Unlit_White_Transparent.mat
index 390103a7953..9001e5709e7 100644
--- a/com.unity.testing.hdrp/Materials/Unlit_White_Transparent.mat
+++ b/com.unity.testing.hdrp/Materials/Unlit_White_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.hdrp/Materials/White_Mate.mat b/com.unity.testing.hdrp/Materials/White_Mate.mat
index 10e0f17b112..b22aa89feaa 100644
--- a/com.unity.testing.hdrp/Materials/White_Mate.mat
+++ b/com.unity.testing.hdrp/Materials/White_Mate.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11

From fb430ef020c9b91538e056c353de69924c28d923 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 17:32:41 +0200
Subject: [PATCH 08/13] HDRP_HybridTests

---
 .../DuplicateTestMaterial.mat                 | 18 ++++++-
 .../TestHDRPShaders/LitEmissive.mat           | 20 ++++++-
 .../LitTessellationEmissive.mat               | 20 ++++++-
 .../TestHDRPShaders/UnlitEmissive.mat         |  5 +-
 .../Decal Material.mat                        | 34 ++++++------
 .../ReflectingMaterial.mat                    | 20 ++++++-
 .../SimpleVFX.vfx                             | 52 ++++++++++++++++++-
 .../TestLayerParams/Anisotropic.mat           | 20 ++++++-
 .../Shader Graphs_New Shader Graph.mat        |  3 +-
 .../TestShaderGraphOverrides/HDRPLit.mat      | 20 ++++++-
 .../TestShaderGraphOverrides/RGBMaterial2.mat | 18 ++++++-
 .../TestShaderGraphOverrides/RGBMaterial3.mat | 18 ++++++-
 .../RGBMaterialNonInstanced.mat               | 18 ++++++-
 .../LitComputeSkinningMaterial.mat            | 26 ++++++++--
 .../TestSkinnedMeshes/LitLBSMaterial.mat      | 26 ++++++++--
 .../CommonAssets/Materials/RGBMaterial.mat    | 18 ++++++-
 .../Material/DefaultHDMaterial.mat            |  2 +-
 17 files changed, 291 insertions(+), 47 deletions(-)

diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestDuplicateProperties/DuplicateTestMaterial.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestDuplicateProperties/DuplicateTestMaterial.mat
index 18e09e738e3..0be3d10c9f1 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestDuplicateProperties/DuplicateTestMaterial.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestDuplicateProperties/DuplicateTestMaterial.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -125,6 +137,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -183,6 +196,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitEmissive.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitEmissive.mat
index 5a6ce6b72c5..5e0fdb07ae4 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitEmissive.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitEmissive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -136,6 +148,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -192,8 +205,11 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitTessellationEmissive.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitTessellationEmissive.mat
index 5eace08486b..76c7eacc6a0 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitTessellationEmissive.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/LitTessellationEmissive.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -108,6 +108,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -122,6 +134,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -178,8 +191,11 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
@@ -267,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/UnlitEmissive.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/UnlitEmissive.mat
index 70d816314d9..72d48b54758 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/UnlitEmissive.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHDRPShaders/UnlitEmissive.mat
@@ -123,6 +123,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -183,6 +184,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
@@ -209,7 +211,6 @@ Material:
     - _StencilWriteMaskGBuffer: 14
     - _StencilWriteMaskMV: 40
     - _SubsurfaceMask: 1
-    - _SupportDecals: 1
     - _SurfaceType: 0
     - _TexWorldScale: 1
     - _TexWorldScaleEmissive: 1
@@ -264,4 +265,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/Decal Material.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/Decal Material.mat
index 044b8293be2..ae7d9a17dbd 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/Decal Material.mat	
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/Decal Material.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Decal Material
   m_Shader: {fileID: 4800000, guid: 1d64af84bdc970c4fae0c1e06dd95b73, type: 3}
-  m_ShaderKeywords: _ALBEDOCONTRIBUTION _COLORMAP _NORMALMAP
+  m_ShaderKeywords: _COLORMAP _MATERIAL_AFFECTS_ALBEDO _MATERIAL_AFFECTS_NORMAL _NORMALMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -34,13 +34,8 @@ Material:
   - TransparentDepthPrepass
   - TransparentDepthPostpass
   - TransparentBackface
-  - DBufferMesh_M
-  - DBufferMesh_AO
-  - DBufferMesh_MAO
-  - Mesh_Emissive
-  - DBufferMesh_MS
-  - DBufferMesh_AOS
-  - DBufferMesh_MAOS
+  - DecalProjectorForwardEmissive
+  - DecalMeshForwardEmissive
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -129,12 +124,18 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AO: 1
     - _AORemapMax: 1
     - _AORemapMin: 0
     - _ATDistance: 1
     - _AddPrecomputedVelocity: 0
+    - _AffectAO: 0
+    - _AffectAlbedo: 1
+    - _AffectEmission: 0
+    - _AffectMetal: 0
+    - _AffectNormal: 1
+    - _AffectSmoothness: 0
     - _AlbedoAffectEmissive: 0
-    - _AlbedoMode: 1
     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _AlphaCutoffPostpass: 0.5
@@ -149,6 +150,10 @@ Material:
     - _CullModeForward: 2
     - _Cutoff: 0.5
     - _DecalBlend: 0.5
+    - _DecalColorMask0: 15
+    - _DecalColorMask1: 15
+    - _DecalColorMask2: 0
+    - _DecalColorMask3: 0
     - _DecalMaskMapBlueScale: 1
     - _DecalMeshDepthBias: 0
     - _DecalStencilRef: 16
@@ -180,7 +185,6 @@ Material:
     - _DoubleSidedNormalMode: 1
     - _DrawOrder: 0
     - _DstBlend: 0
-    - _Emissive: 0
     - _EmissiveColorMode: 1
     - _EmissiveExposureWeight: 1
     - _EmissiveIntensity: 1
@@ -203,14 +207,11 @@ Material:
     - _IridescenceMask: 1
     - _IridescenceThickness: 1
     - _LinkDetailsWithBase: 1
-    - _MaskBlendMode: 4
     - _MaskBlendSrc: 1
-    - _MaskmapAO: 0
-    - _MaskmapMetal: 0
-    - _MaskmapSmoothness: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -257,6 +258,7 @@ Material:
     - _UVBase: 0
     - _UVDetail: 0
     - _UVEmissive: 0
+    - _Unity_Identify_HDRP_Decal: 1
     - _UseEmissiveIntensity: 0
     - _UseShadowThreshold: 0
     - _ZTestDepthEqualForOpaque: 3
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/ReflectingMaterial.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/ReflectingMaterial.mat
index 12f1d922c38..52b8d8b203d 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/ReflectingMaterial.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/ReflectingMaterial.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -123,6 +135,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -179,8 +192,11 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
@@ -262,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/SimpleVFX.vfx b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/SimpleVFX.vfx
index 986a9f19476..9bc7e5f7657 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/SimpleVFX.vfx
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestHybridEntitiesConversion/SimpleVFX.vfx
@@ -33,6 +33,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
   m_Name: SimpleVFX
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children:
   - {fileID: 8926484042661614555}
@@ -46,6 +47,7 @@ MonoBehaviour:
   m_ParameterInfo: []
   m_ImportDependencies: []
   m_GraphVersion: 4
+  m_ResourceVersion: 1
   m_saved: 1
   m_SubgraphDependencies: []
   m_CategoryPath: 
@@ -81,6 +83,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73a13919d81fb7444849bae8b5c812a2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children:
   - {fileID: 8926484042661614556}
@@ -90,7 +93,7 @@ MonoBehaviour:
   m_InputSlots: []
   m_OutputSlots: []
   m_Label: Spawn system
-  m_Data: {fileID: 0}
+  m_Data: {fileID: 8926484042661614597}
   m_InputFlowSlot:
   - link: []
   - link: []
@@ -114,6 +117,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f05c6884b705ce14d82ae720f0ec209f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614555}
   m_Children: []
   m_UIPosition: {x: 233.38269, y: 57.572144}
@@ -135,6 +139,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -168,6 +173,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9dfea48843f53fc438eabc12a3a30abc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children:
   - {fileID: 8926484042661614580}
@@ -200,6 +206,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children:
   - {fileID: 8926484042661614560}
@@ -235,6 +242,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614559}
   m_Children:
   - {fileID: 8926484042661614561}
@@ -270,6 +278,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614560}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -302,6 +311,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614560}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -334,6 +344,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614560}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -366,6 +377,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614559}
   m_Children:
   - {fileID: 8926484042661614565}
@@ -401,6 +413,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614564}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -433,6 +446,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614564}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -465,6 +479,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614564}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -497,6 +512,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d78581a96eae8bf4398c282eb0b098bd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -524,6 +540,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614558}
   m_Children: []
   m_UIPosition: {x: 233.38269, y: 57.572144}
@@ -551,6 +568,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -584,6 +602,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -617,6 +636,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2dc095764ededfa4bb32fa602511ea4b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children: []
   m_UIPosition: {x: 942.3827, y: 507.57214}
@@ -638,6 +658,7 @@ MonoBehaviour:
   angularIntegration: 0
   ageParticles: 1
   reapParticles: 1
+  skipZeroDeltaUpdate: 0
 --- !u!114 &8926484042661614585
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -650,6 +671,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a0b9e6b9139e58d4c957ec54595da7d3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children:
   - {fileID: 8926484042661614589}
@@ -681,6 +703,8 @@ MonoBehaviour:
   sortPriority: 0
   sort: 0
   indirectDraw: 0
+  computeCulling: 0
+  frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
   shaderGraph: {fileID: 0}
@@ -698,6 +722,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -731,6 +756,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d16c6aeaef944094b9a1633041804207, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614585}
   m_Children: []
   m_UIPosition: {x: 233.38269, y: 57.572144}
@@ -753,6 +779,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 081ffb0090424ba4cb05370a42ead6b9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -772,6 +799,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 8926484042661614558}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -798,6 +826,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
   m_Parent: {fileID: 0}
   m_Children: []
   m_UIPosition: {x: 0, y: 0}
@@ -819,3 +848,24 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
   m_Direction: 0
   m_LinkedSlots: []
+--- !u!114 &8926484042661614597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f68759077adc0b143b6e1c101e82065e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 114350483966674976}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  title: 
+  m_Owners:
+  - {fileID: 8926484042661614555}
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLayerParams/Anisotropic.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLayerParams/Anisotropic.mat
index fc1859186a4..dc1ab574a59 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLayerParams/Anisotropic.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLayerParams/Anisotropic.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -137,6 +149,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0.725
     - _BlendMode: 0
     - _CoatMask: 0
@@ -194,8 +207,11 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 3
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLightmaps/Shader Graphs_New Shader Graph.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLightmaps/Shader Graphs_New Shader Graph.mat
index 720e398926e..de60649fa32 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLightmaps/Shader Graphs_New Shader Graph.mat	
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestLightmaps/Shader Graphs_New Shader Graph.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -71,6 +71,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/HDRPLit.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/HDRPLit.mat
index 386dfd362b8..9a938689c42 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/HDRPLit.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/HDRPLit.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -123,6 +135,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -181,8 +194,11 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
@@ -265,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial2.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial2.mat
index 144097d9e08..35fcfd90146 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial2.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -138,6 +150,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -198,6 +211,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial3.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial3.mat
index 47031aae058..f9cb17adc3b 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial3.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterial3.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -138,6 +150,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -198,6 +211,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterialNonInstanced.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterialNonInstanced.mat
index a187dfbde75..1dea1b31f8c 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterialNonInstanced.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestShaderGraphOverrides/RGBMaterialNonInstanced.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -138,6 +150,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -198,6 +211,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitComputeSkinningMaterial.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitComputeSkinningMaterial.mat
index 80fb6522575..7a24908b913 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitComputeSkinningMaterial.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitComputeSkinningMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -38,23 +38,41 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _BlendMode: 0
     - _ComputeMeshIndex: 0
     - _CullMode: 2
     - _CullModeForward: 2
+    - _DepthOffsetEnable: 0
     - _DoubleSidedEnable: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
     - _EnableFogOnTransparent: 1
+    - _OpaqueCullMode: 2
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -68,12 +86,14 @@ Material:
     - _StencilWriteMaskDistortionVec: 4
     - _StencilWriteMaskGBuffer: 14
     - _StencilWriteMaskMV: 40
+    - _SupportDecals: 1
     - _SurfaceType: 0
     - _TransparentBackfaceEnable: 0
     - _TransparentCullMode: 2
     - _TransparentDepthPostpassEnable: 0
     - _TransparentDepthPrepassEnable: 0
     - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
     - _TransparentZWrite: 0
     - _UseShadowThreshold: 0
     - _ZTestDepthEqualForOpaque: 3
diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitLBSMaterial.mat b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitLBSMaterial.mat
index ae5569740cc..c58bf2000c7 100644
--- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitLBSMaterial.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/SampleScenes/TestSkinnedMeshes/LitLBSMaterial.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -25,22 +25,40 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _BlendMode: 0
     - _CullMode: 2
     - _CullModeForward: 2
+    - _DepthOffsetEnable: 0
     - _DoubleSidedEnable: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
     - _EnableFogOnTransparent: 1
+    - _OpaqueCullMode: 2
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SkinMatricesOffset: 0
@@ -56,12 +74,14 @@ Material:
     - _StencilWriteMaskDistortionVec: 4
     - _StencilWriteMaskGBuffer: 14
     - _StencilWriteMaskMV: 40
+    - _SupportDecals: 1
     - _SurfaceType: 0
     - _TransparentBackfaceEnable: 0
     - _TransparentCullMode: 2
     - _TransparentDepthPostpassEnable: 0
     - _TransparentDepthPrepassEnable: 0
     - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
     - _TransparentZWrite: 0
     - _UseShadowThreshold: 0
     - _ZTestDepthEqualForOpaque: 3
@@ -84,4 +104,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/CommonAssets/Materials/RGBMaterial.mat b/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/CommonAssets/Materials/RGBMaterial.mat
index 15249e98d98..6ee61fc616a 100644
--- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/CommonAssets/Materials/RGBMaterial.mat
+++ b/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/CommonAssets/Materials/RGBMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -138,6 +150,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -198,6 +211,7 @@ Material:
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
+    - _OpaqueCullMode: 2
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
index 48242fe6a26..7454d601d52 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat
@@ -271,7 +271,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicRemapMax: 0
+    - _MetallicRemapMax: 1
     - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0

From 068d7f0ba3f96f6045ee038a3f5fd30b65def349 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 17:36:28 +0200
Subject: [PATCH 09/13] HDRP_DXR_Tests

---
 .../M_Opaque_Metallic.mat                     | 16 ++++++++++++-
 .../Scenes/5001_PathTracing/M_GreyDiffuse.mat | 16 ++++++++++++-
 .../Scenes/5001_PathTracing/M_RedDiffuse.mat  | 16 ++++++++++++-
 .../5001_PathTracing/M_RoughTintedGlass.mat   | 16 ++++++++++++-
 .../Scenes/5001_PathTracing/M_SoapBubble.mat  | 16 ++++++++++++-
 .../5001_PathTracing/M_ThinTintedGlass.mat    | 16 ++++++++++++-
 .../Scenes/5001_PathTracing/M_UnlitSG.mat     | 16 ++++++++++++-
 .../Scenes/5002_PathTracing_GI/box_gi.mat     | 16 ++++++++++++-
 .../Scenes/5002_PathTracing_GI/sphere_gi.mat  | 16 ++++++++++++-
 .../5003_PathTracing_transparency/Ground.mat  | 16 ++++++++++++-
 .../Transparency_box_1.mat                    | 16 ++++++++++++-
 .../Transparency_box_2.mat                    | 16 ++++++++++++-
 .../Transparency_box_3.mat                    | 16 ++++++++++++-
 .../Transparency_sphere_1.mat                 | 16 ++++++++++++-
 .../Transparency_sphere_2.mat                 | 16 ++++++++++++-
 .../Transparency_sphere_3.mat                 | 16 ++++++++++++-
 .../Transparency_texture_plane.mat            | 16 ++++++++++++-
 .../Transparency_texture_sphere.mat           | 16 ++++++++++++-
 .../Transparency_thin_1.mat                   | 16 ++++++++++++-
 .../Transparency_thin_2.mat                   | 16 ++++++++++++-
 .../Transparency_thin_3.mat                   | 16 ++++++++++++-
 .../Scenes/5004_PathTracing_arealight/Lit.mat | 16 ++++++++++++-
 .../5004_PathTracing_arealight/MirrorLit.mat  | 16 ++++++++++++-
 .../5004_PathTracing_arealight/Unlit.mat      |  2 +-
 .../5005_PathTracing_Fog/RenderPlane.mat      |  2 +-
 .../5006_PathTracing_DoF/M_Background.mat     | 16 ++++++++++++-
 .../Scenes/5006_PathTracing_DoF/M_Ground.mat  | 16 ++++++++++++-
 .../5006_PathTracing_DoF/M_Transparent.mat    | 16 ++++++++++++-
 .../M_Ground.mat                              | 16 ++++++++++++-
 .../M_ReflectivePlane.mat                     | 16 ++++++++++++-
 .../M_Ground.mat                              | 16 ++++++++++++-
 .../M_Plane.mat                               | 16 ++++++++++++-
 .../M_ReflectivePlane.mat                     | 16 ++++++++++++-
 .../MaxNormalMappingMtl.mat                   | 16 ++++++++++++-
 .../NormalMappingMtl 1.mat                    | 16 ++++++++++++-
 .../NullNormalMappingMtl 1.mat                | 16 ++++++++++++-
 .../ReflectionMtl.mat                         | 16 ++++++++++++-
 .../Scenes/6000_VertexFormats/VertexColor.mat | 14 ++++++++++-
 .../M_GradualRoughness.mat                    |  4 ++--
 .../M_ZWTexCoord_0.mat                        |  2 +-
 .../M_ZWTexCoord_1.mat                        |  2 +-
 .../M_ZWTexCoord_2.mat                        |  2 +-
 .../M_ZWTexCoord_3.mat                        |  2 +-
 .../709_CameraExtendedCulling/M_PerryHead.mat | 16 ++++++++++++-
 .../1900_AlphaTestSG_Viewer.mat               |  2 +-
 .../900_Materials_AlphaTest_SG/Backdrop.mat   | 16 ++++++++++++-
 .../900_Materials_AlphaTest_SG/Background.mat |  2 +-
 .../900_Materials_AlphaTest_SG/Foreground.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_EyeSG.mat    |  2 +-
 ...raphs_AlphaTest_HDRP_EyeSG_transparent.mat |  2 +-
 ..._AlphaTest_HDRP_EyeSG_transparent_post.mat |  2 +-
 ...s_AlphaTest_HDRP_EyeSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_FabricSG.mat |  2 +-
 ...hs_AlphaTest_HDRP_FabricSG_transparent.mat |  2 +-
 ...phaTest_HDRP_FabricSG_transparent_post.mat |  2 +-
 ...lphaTest_HDRP_FabricSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_HairSG.mat   |  2 +-
 ...aphs_AlphaTest_HDRP_HairSG_transparent.mat |  2 +-
 ...AlphaTest_HDRP_HairSG_transparent_post.mat |  2 +-
 ..._AlphaTest_HDRP_HairSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_LitSG.mat    | 15 +++++++++++-
 ...raphs_AlphaTest_HDRP_LitSG_transparent.mat | 19 ++++++++++++---
 ..._AlphaTest_HDRP_LitSG_transparent_post.mat | 21 +++++++++++++----
 ...s_AlphaTest_HDRP_LitSG_transparent_pre.mat | 19 ++++++++++++---
 ...hader Graphs_AlphaTest_HDRP_StackLitSG.mat |  2 +-
 ..._AlphaTest_HDRP_StackLitSG_transparent.mat |  2 +-
 ...aTest_HDRP_StackLitSG_transparent_post.mat |  2 +-
 ...haTest_HDRP_StackLitSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_UnlitSG.mat  |  2 +-
 ...phs_AlphaTest_HDRP_UnlitSG_transparent.mat |  2 +-
 ...lphaTest_HDRP_UnlitSG_transparent_post.mat |  2 +-
 ...AlphaTest_HDRP_UnlitSG_transparent_pre.mat |  2 +-
 .../900_Materials_AlphaTest_SG/Mirror.mat     | 16 ++++++++++++-
 .../900_Materials_AlphaTest_SG/Smooth.mat     | 16 ++++++++++++-
 .../LayeredLit_LayeredSubSurface.mat          | 22 +++++++++++++++++-
 .../LayeredLit/LayeredLit_Standard.mat        | 22 +++++++++++++++++-
 .../LayeredLit/LayeredLit_Translucent.mat     | 22 +++++++++++++++++-
 .../LayeredLit/LayeredLit_Transparent.mat     | 22 +++++++++++++++++-
 .../Lit/Lit_Anisotropy.mat                    | 16 ++++++++++++-
 .../Lit/Lit_DetailMap.mat                     | 16 ++++++++++++-
 .../Lit/Lit_Emission.mat                      | 16 ++++++++++++-
 .../Lit/Lit_Iridescence.mat                   | 16 ++++++++++++-
 .../Lit/Lit_Specular.mat                      | 16 ++++++++++++-
 .../Lit/Lit_Standard.mat                      | 16 ++++++++++++-
 .../Lit/Lit_SubSurfaceScattering.mat          | 16 ++++++++++++-
 .../Lit/Lit_Translucent.mat                   | 16 ++++++++++++-
 .../Lit/Lit_Transparent_Box.mat               | 16 ++++++++++++-
 .../Lit/Lit_Transparent_None.mat              | 16 ++++++++++++-
 .../Lit/Lit_Transparent_Sphere.mat            | 16 ++++++++++++-
 .../Lit/Lit_Transparent_Thin.mat              | 16 ++++++++++++-
 .../901_Materials_HDRP_Variants/M_Ground.mat  | 16 ++++++++++++-
 .../M_Reflection.mat                          | 16 ++++++++++++-
 .../M_Reflection_Recursive.mat                | 16 ++++++++++++-
 .../Unlit/Unlit_AlphaClip.mat                 |  2 +-
 .../Unlit/Unlit_AlphaClip_DS.mat              |  2 +-
 .../Unlit/Unlit_Opaque.mat                    |  2 +-
 .../Unlit/Unlit_Transparent.mat               |  2 +-
 .../Unlit/Unlit_Transparent_Add.mat           |  2 +-
 .../Unlit/Unlit_Transparent_Distortion.mat    |  2 +-
 .../Unlit/Unlit_Transparent_Emission.mat      |  2 +-
 .../Shader Graphs_Fabric_CottonWool.mat       |  2 +-
 ...der Graphs_Fabric_CottonWool_AlphaClip.mat |  2 +-
 ...ader Graphs_Fabric_CottonWool_Emission.mat |  2 +-
 .../Shader Graphs_Fabric_CottonWool_SSS.mat   |  2 +-
 ... Graphs_Fabric_CottonWool_Transmission.mat |  2 +-
 ...r Graphs_Fabric_CottonWool_Transparent.mat |  2 +-
 .../Fabric/Shader Graphs_Fabric_Silk.mat      |  2 +-
 ...Shader Graphs_Fabric_Silk_AlphaClip_DS.mat |  2 +-
 .../Fabric/Shader Graphs_Fabric_Silk_SSS.mat  |  2 +-
 ...Shader Graphs_Fabric_Silk_Transmission.mat |  2 +-
 .../Shader Graphs_Fabric_Silk_Transparent.mat |  2 +-
 .../Hair/Shader Graphs_Hair_Standard.mat      |  2 +-
 .../Shader Graphs_Hair_Standard_AlphaClip.mat |  2 +-
 ...ader Graphs_Hair_Standard_AlphaClip_DS.mat |  2 +-
 ...hader Graphs_Hair_Standard_Transparent.mat |  2 +-
 .../Lit/Shader Graphs_Lit_Anisotropic.mat     | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_Emission.mat        | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_Iridescence.mat     | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_Specular.mat        | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_Standard.mat        | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_SubSurface.mat      | 19 ++++++++++++---
 .../Lit/Shader Graphs_Lit_Translucent.mat     | 17 ++++++++++++--
 .../Lit/Shader Graphs_Lit_Transparent_Box.mat | 19 ++++++++++++---
 .../Shader Graphs_Lit_Transparent_None.mat    | 17 ++++++++++++--
 .../Shader Graphs_Lit_Transparent_Sphere.mat  | 19 ++++++++++++---
 .../Shader Graphs_Lit_Transparent_Thin.mat    | 19 ++++++++++++---
 .../StackLit/Shader Graphs_StackLit.mat       |  2 +-
 .../Shader Graphs_StackLit_Anisotropy.mat     |  2 +-
 .../StackLit/Shader Graphs_StackLit_Coat.mat  |  2 +-
 .../Shader Graphs_StackLit_DualSpecLobe.mat   |  2 +-
 ...ader Graphs_StackLit_DualSpecLobe_Hazy.mat |  2 +-
 .../Shader Graphs_StackLit_Emission.mat       |  2 +-
 .../Shader Graphs_StackLit_Iridescence.mat    |  2 +-
 .../StackLit/Shader Graphs_StackLit_Spec.mat  |  2 +-
 .../Shader Graphs_StackLit_SubSurface.mat     |  2 +-
 .../Shader Graphs_StackLit_Transmission.mat   |  2 +-
 .../Shader Graphs_StackLit_Transparent.mat    |  2 +-
 .../Unlit/Shader Graphs_Unlit_AlphaClip.mat   |  2 +-
 .../Shader Graphs_Unlit_AlphaClip_DS.mat      |  2 +-
 .../Unlit/Shader Graphs_Unlit_Emission.mat    |  2 +-
 .../Unlit/Shader Graphs_Unlit_Standard.mat    |  2 +-
 .../Unlit/Shader Graphs_Unlit_Transparent.mat |  2 +-
 .../Shader Graphs_Unlit_Transparent_Add.mat   |  2 +-
 ...r Graphs_Unlit_Transparent_Premultiply.mat |  2 +-
 .../Lit_RTRT_OpaqueSSROff.mat                 | 16 ++++++++++++-
 .../Lit_RTRT_OpaqueSSROn.mat                  | 16 ++++++++++++-
 .../M_Ceiling.mat                             |  2 +-
 .../M_FloorMaterial.mat                       | 16 ++++++++++++-
 ...der Graphs_SG_Fabric_RTRT_OpaqueSSROff.mat |  2 +-
 ...ader Graphs_SG_Fabric_RTRT_OpaqueSSROn.mat |  2 +-
 ...hader Graphs_SG_Hair_RTRT_OpaqueSSROff.mat |  2 +-
 ...Shader Graphs_SG_Hair_RTRT_OpaqueSSROn.mat |  2 +-
 ...Shader Graphs_SG_Lit_RTRT_OpaqueSSROff.mat | 23 +++++++++++++++----
 .../Shader Graphs_SG_Lit_RTRT_OpaqueSSROn.mat | 19 ++++++++++++---
 ...r Graphs_SG_StackLit_RTRT_OpaqueSSROff.mat |  2 +-
 ...er Graphs_SG_StackLit_RTRT_OpaqueSSROn.mat |  2 +-
 .../Scenes/AmbientOcclusionData/M_Diffuse.mat | 16 ++++++++++++-
 .../AmbientOcclusionData/M_DiffuseHead.mat    | 16 ++++++++++++-
 .../Scenes/LightClusterData/M_Chrome.mat      | 16 ++++++++++++-
 .../Scenes/LightClusterData/M_Mirror.mat      | 16 ++++++++++++-
 .../Scenes/LightClusterData/M_Rough.mat       | 16 ++++++++++++-
 .../Scenes/RayTracedReflectionsData/Floor.mat | 16 ++++++++++++-
 .../RayTracedReflectionsData/M_Anisotropy.mat | 16 ++++++++++++-
 .../RayTracedReflectionsData/M_EyeSG.mat      |  2 +-
 .../RayTracedReflectionsData/M_FabricSG.mat   |  2 +-
 .../RayTracedReflectionsData/M_HairSG.mat     |  2 +-
 .../RayTracedReflectionsData/M_LItSG.mat      | 14 ++++++++++-
 .../M_LayeredLit0.mat                         | 22 +++++++++++++++++-
 .../RayTracedReflectionsData/M_LitCutoff.mat  | 16 ++++++++++++-
 .../M_LitVariablesSmoothness.mat              | 19 ++++++++++++---
 .../RayTracedReflectionsData/M_Reflective.mat | 16 ++++++++++++-
 .../M_ReflectiveNoSSR.mat                     | 16 ++++++++++++-
 .../M_SpecularColor.mat                       | 16 ++++++++++++-
 .../RayTracedReflectionsData/M_StackLitSG.mat |  2 +-
 .../RayTracedReflectionsData/M_Standard.mat   | 16 ++++++++++++-
 .../M_TransparentSmooth.mat                   | 16 ++++++++++++-
 .../M_TransparentSmoothSG.mat                 | 16 +++++++++++--
 .../M_TransparentSmoothSSR.mat                | 16 ++++++++++++-
 .../M_TransparentSmoothSSRSG.mat              | 16 +++++++++++--
 .../RayTracedReflectionsData/M_UnlitSG.mat    |  2 +-
 .../RayTracedReflectionsData/Marker.mat       | 16 ++++++++++++-
 .../Scenes/RayTracedReflectionsData/Red.mat   | 16 ++++++++++++-
 .../Scenes/RayTracedReflectionsData/head.mat  | 16 ++++++++++++-
 .../Scenes/RayTracedReflectionsData/mat 1.mat | 16 ++++++++++++-
 .../Scenes/RayTracedReflectionsData/mat.mat   | 16 ++++++++++++-
 .../Indirect/Plane_RT_Indirect.mat            |  2 +-
 ...raphs_SGLit_RaytracingKeyword_Emission.mat | 17 ++++++++++++--
 ...SGLit_RaytracingKeyword_Emission_Unlit.mat | 19 ++++++++++++---
 .../RaytracingQualityKeyword/M_Ground.mat     | 16 ++++++++++++-
 ... Graphs_SGLit_Transparent_Refraction_1.mat | 21 +++++++++++++----
 ... Graphs_SGLit_Transparent_Refraction_2.mat | 21 +++++++++++++----
 .../Scenes/RecursiveRenderingData/M_Floor.mat | 16 ++++++++++++-
 .../Scenes/RecursiveRenderingData/M_Green.mat | 16 ++++++++++++-
 .../M_LitRecursiveTransparentSG.mat           | 20 ++++++++++++----
 .../RecursiveRenderingData/M_Mirror.mat       | 16 ++++++++++++-
 .../M_RecursiveTransparent.mat                | 16 ++++++++++++-
 .../M_RecursiveTransparentNoRefraction.mat    | 16 ++++++++++++-
 ...RecursiveTransparentNoRefractionDouble.mat | 16 ++++++++++++-
 .../M_RecursiveTransparentRefra1.1.mat        | 16 ++++++++++++-
 .../Scenes/RecursiveRenderingData/M_Red.mat   | 16 ++++++++++++-
 .../Assets/Scenes/ShadowData/M_MirrorLit.mat  | 16 ++++++++++++-
 .../Assets/Scenes/ShadowData/M_Opaque.mat     | 16 ++++++++++++-
 .../Scenes/ShadowData/M_OpaqueCutoff.mat      | 16 ++++++++++++-
 .../ShadowData/M_OpaqueCutoffShadow.mat       | 16 ++++++++++++-
 .../Assets/Scenes/ShadowData/M_OpaqueSG.mat   | 14 ++++++++++-
 .../Scenes/ShadowData/M_OpaqueSGCutoff.mat    | 14 ++++++++++-
 .../ShadowData/M_OpaqueSGCutoffShadow.mat     | 14 ++++++++++-
 .../Scenes/ShadowData/M_OpaqueUnlit.mat       |  2 +-
 .../Scenes/ShadowData/M_OpaqueUnlitSG.mat     |  2 +-
 .../Assets/Scenes/ShadowData/M_RoughLit.mat   | 16 ++++++++++++-
 .../Assets/Scenes/ShadowData/M_StackLitSG.mat |  2 +-
 .../ShadowData/M_TransmissionOpaque.mat       | 16 ++++++++++++-
 .../ShadowData/M_TransmissionOpaqueSG.mat     | 18 ++++++++++++---
 .../ShadowData/M_TransmissionTransparent.mat  | 16 ++++++++++++-
 .../M_TransmissionTransparentSG.mat           | 18 ++++++++++++---
 .../Scenes/ShadowData/M_Transparent.mat       | 16 ++++++++++++-
 .../Scenes/ShadowData/M_TransparentSG.mat     | 21 +++++++++++++----
 .../Scenes/ShadowData/M_TransparentUnlit.mat  |  2 +-
 .../ShadowData/M_TransparentUnlitSG.mat       |  2 +-
 .../Assets/Scenes/Shared/M_DiffuseLit.mat     | 16 ++++++++++++-
 .../Assets/Scenes/Shared/M_FrameIndex.mat     |  2 +-
 .../Assets/Scenes/Shared/M_Mirror.mat         | 16 ++++++++++++-
 .../M_FabricSSSGraph.mat                      |  2 +-
 .../SubSurfaceScatteringData/M_GrayLit.mat    | 16 ++++++++++++-
 .../SubSurfaceScatteringData/M_Jade.mat       | 16 ++++++++++++-
 .../M_LayeredSubSurface.mat                   | 22 +++++++++++++++++-
 .../M_LitSubSurfaceSG.mat                     | 14 ++++++++++-
 .../SubSurfaceScatteringData/M_Marble.mat     | 16 ++++++++++++-
 .../SubSurfaceScatteringData/M_OrangeLit.mat  | 16 ++++++++++++-
 .../SubSurfaceScatteringData/M_SubSurface.mat | 16 ++++++++++++-
 .../M_TurquoiseLit.mat                        | 16 ++++++++++++-
 231 files changed, 2248 insertions(+), 283 deletions(-)

diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/106_ReflectionsMultiBounceRough/M_Opaque_Metallic.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/106_ReflectionsMultiBounceRough/M_Opaque_Metallic.mat
index 287ef0c7279..f0fbcc7b886 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/106_ReflectionsMultiBounceRough/M_Opaque_Metallic.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/106_ReflectionsMultiBounceRough/M_Opaque_Metallic.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat
index c8036abb6a3..246d9070c9a 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.mat
index 41bc0afdcf0..e69da36b4bb 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.mat
index 7cb16e36053..969aca31653 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat
index d4084573a07..abb06f3f943 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.mat
index 4a8c7a41fae..01eb7b46fee 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat
index 732a4cc379c..bea2bbb890a 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.mat
index b48de91c230..da5b6df2370 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.mat
index bc2216bab42..38f7caf7814 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 8
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat
index 38e982eecf7..feba3f83712 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_1.mat
index c81820cb821..481c768d57c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_1.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_1.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_2.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_2.mat
index 3833230f5df..e2a45adfe7b 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_2.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_2.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_3.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_3.mat
index 3141faa084c..ef49b866f79 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_3.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_box_3.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_1.mat
index 51a3911f0b1..0e34d4542ef 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_1.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_1.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_2.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_2.mat
index 9bf593ad7bd..a5c071e8a5f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_2.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_2.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_3.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_3.mat
index 40fcada5e15..0ae5f8f7065 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_3.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_sphere_3.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_plane.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_plane.mat
index af2a8ca4dca..4c11c56e1f4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_plane.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_plane.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_sphere.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_sphere.mat
index 39d575723fe..0c808858094 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_sphere.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_texture_sphere.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 979383c107ed8194688bbee5b21fae49, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_1.mat
index d6e4cc7dc0d..97d53a5c0f0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_1.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_1.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_2.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_2.mat
index 944a9005e90..eb849a0cb3f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_2.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_2.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_3.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_3.mat
index 552072edfe8..23c559fe04e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_3.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Transparency_thin_3.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Lit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Lit.mat
index e423b5835ab..80edaef22d1 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Lit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Lit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/MirrorLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/MirrorLit.mat
index 70cabbc11e7..8942e487724 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/MirrorLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/MirrorLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Unlit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Unlit.mat
index 3b4137fe405..40bb8fdb66f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Unlit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight/Unlit.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog/RenderPlane.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog/RenderPlane.mat
index 3b1589f6d0a..d3503eaf59e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog/RenderPlane.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog/RenderPlane.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Background.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Background.mat
index fc1c85980cf..599241f05c4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Background.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Background.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Ground.mat
index ed32cda264e..5c4e9182788 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Ground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Transparent.mat
index b9e718e5038..3abfb0df027 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Transparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF/M_Transparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_Ground.mat
index d502e721c48..a3fed0e0ae4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_Ground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_ReflectivePlane.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_ReflectivePlane.mat
index 78e9823fba1..c82ee153629 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_ReflectivePlane.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit/M_ReflectivePlane.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Ground.mat
index d502e721c48..a3fed0e0ae4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Ground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Plane.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Plane.mat
index 70b3962bb2a..86caba4c858 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Plane.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_Plane.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_ReflectivePlane.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_ReflectivePlane.mat
index e77e4c9534e..6d1c34b5670 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_ReflectivePlane.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit/M_ReflectivePlane.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/MaxNormalMappingMtl.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/MaxNormalMappingMtl.mat
index c676af7f683..d01aa318fac 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/MaxNormalMappingMtl.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/MaxNormalMappingMtl.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 8
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NormalMappingMtl 1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NormalMappingMtl 1.mat
index 28c0d692702..6709f0d55c6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NormalMappingMtl 1.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NormalMappingMtl 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NullNormalMappingMtl 1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NullNormalMappingMtl 1.mat
index 5905646c6b4..5610ad633e6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NullNormalMappingMtl 1.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/NullNormalMappingMtl 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/ReflectionMtl.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/ReflectionMtl.mat
index 715391fb568..52bbe33be37 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/ReflectionMtl.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5008_PathTracing_NormalMapping/ReflectionMtl.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.03
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/6000_VertexFormats/VertexColor.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/6000_VertexFormats/VertexColor.mat
index 2e8cef1ee75..ab8ba47cf90 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/6000_VertexFormats/VertexColor.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/6000_VertexFormats/VertexColor.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -272,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_GradualRoughness.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_GradualRoughness.mat
index a8f909b679c..9a9f9e150f2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_GradualRoughness.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_GradualRoughness.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: M_GradualRoughness
   m_Shader: {fileID: -6465566751694194690, guid: 7d38804cada07f44390ce870356ef63b,
     type: 3}
-  m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_0.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_0.mat
index 5fd27672e37..5d82b1a981c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_0.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_0.mat
@@ -279,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_1.mat
index 5643c79b982..21cf5ffc230 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_1.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_1.mat
@@ -279,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_2.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_2.mat
index 69346031aec..c41c99cd3a6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_2.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_2.mat
@@ -279,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_3.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_3.mat
index 14350b4efbf..5422522c2a1 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_3.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/7000_QuadChannelTexCoord/M_ZWTexCoord_3.mat
@@ -280,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/709_CameraExtendedCulling/M_PerryHead.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/709_CameraExtendedCulling/M_PerryHead.mat
index 77a91dce005..b480af27c2e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/709_CameraExtendedCulling/M_PerryHead.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/709_CameraExtendedCulling/M_PerryHead.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
index 7a05889795c..22275145277 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Backdrop.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Backdrop.mat
index 67ad1358974..a2bcc2192a2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Backdrop.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Backdrop.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -126,6 +126,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 0, y: 6}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Background.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Background.mat
index 40fe564ef95..3b70ea80786 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Background.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Background.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Foreground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Foreground.mat
index 0d83fc75a0f..f87c2e7033d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Foreground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Foreground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat
index ff2be15a45f..edc295297b2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat	
@@ -94,4 +94,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat
index 6667c9af988..90c42d56982 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat	
@@ -95,4 +95,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat
index a878afa3f65..3c14120a2f9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat	
@@ -95,4 +95,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat
index 7a611bf9a70..66f1d33963a 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat	
@@ -95,4 +95,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat
index 6c857d9d822..fd4387532f4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat
index e1247d409ae..92d2c83515b 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat
index 3c10015bccb..9be35b98180 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat
index 5b33e5d0e21..2ff9c02e6e3 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat
index 19889353f95..ff0929ddb1e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat
index 5fa388b7e2a..2756c8a5030 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat
index 01f9a8699ec..122bd1c8e24 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat
index 729c4f1c9b8..8478d8e83b2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat
index f0188616052..7b1a1585451 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat	
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat
index 9aa6e1141fc..17f9f9350fd 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent
   m_Shader: {fileID: -6465566751694194690, guid: 2ced2c0022d5e8947899635406a98151,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat
index 35570ccfb1c..5f5e3759a91 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat	
@@ -10,12 +10,12 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post
   m_Shader: {fileID: -6465566751694194690, guid: 924090ed89ad3b944b9cc4f7e7384344,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -33,6 +33,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -53,6 +65,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -96,4 +109,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat
index 64ded01d7b3..14932aed84c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre
   m_Shader: {fileID: -6465566751694194690, guid: 2ced2c0022d5e8947899635406a98151,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat
index 79848b8b0c7..7bc6a0703f0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat
index cba59c336aa..740c19cc143 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat
index f9b20f052df..9fd8890f854 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat
index cb58441358b..ec25ae6b9fa 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat
index d76b9559636..11bdc8cbef5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat
index c0bf2d40af7..34f49204529 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat
index aa14096d259..643b3f30a02 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat
index 616cfacee65..b54df81a9e4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Mirror.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Mirror.mat
index 8ff435c3650..cf9aac901d3 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Mirror.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Mirror.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Smooth.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Smooth.mat
index 6f5f49c0d91..9deb8c2fd4f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Smooth.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/900_Materials_AlphaTest_SG/Smooth.mat
@@ -108,6 +108,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -179,6 +191,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -263,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_LayeredSubSurface.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_LayeredSubSurface.mat
index bf6a3da443c..c151a98efea 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_LayeredSubSurface.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_LayeredSubSurface.mat
@@ -275,6 +275,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -434,6 +446,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -592,4 +612,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Standard.mat
index a36282b30f8..3b72c803717 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Standard.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Standard.mat
@@ -278,6 +278,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -436,6 +448,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 0.9
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -593,4 +613,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Translucent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Translucent.mat
index 368acd05ad7..e46c8e12d19 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Translucent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Translucent.mat
@@ -274,6 +274,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -433,6 +445,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 0.9
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -591,4 +611,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Transparent.mat
index 686186be6f2..cb201457eae 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Transparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/LayeredLit/LayeredLit_Transparent.mat
@@ -276,6 +276,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -435,6 +447,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 0.9
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -593,4 +613,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Anisotropy.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Anisotropy.mat
index 16291f771c8..4e4f958ccad 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Anisotropy.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Anisotropy.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_DetailMap.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_DetailMap.mat
index 1eda4099141..cffbc6a95f7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_DetailMap.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_DetailMap.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Emission.mat
index 7d1ceede178..1d2a68af325 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Emission.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Emission.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Iridescence.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Iridescence.mat
index c89f2b73743..91af4f70acd 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Iridescence.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Iridescence.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Specular.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Specular.mat
index 550a7e4f89e..4429f5e4642 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Specular.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Specular.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Standard.mat
index b62f3684373..2fd4ccd3946 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Standard.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Standard.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 8
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_SubSurfaceScattering.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_SubSurfaceScattering.mat
index d388d69747d..a0540a1ce6d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_SubSurfaceScattering.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_SubSurfaceScattering.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Translucent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Translucent.mat
index f8d9f3e3edf..ef28b9020b4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Translucent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Translucent.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Box.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Box.mat
index 6760d015fca..f6a1d4d90dd 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Box.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Box.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.8
+    - _MetallicRemapMax: 0.8
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_None.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_None.mat
index f03730e4474..aa3c073af45 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_None.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_None.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.8
+    - _MetallicRemapMax: 0.8
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Sphere.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Sphere.mat
index dea82140e98..58f9912c715 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Sphere.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Sphere.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Thin.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Thin.mat
index c39d5b728d7..270779b8fc7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Thin.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Lit/Lit_Transparent_Thin.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.8
+    - _MetallicRemapMax: 0.8
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Ground.mat
index d502e721c48..a3fed0e0ae4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Ground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection.mat
index 1eaef70f12c..959dda1d787 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection_Recursive.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection_Recursive.mat
index 42e2f3bf60b..83c72362ce8 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection_Recursive.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/M_Reflection_Recursive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip.mat
index 0113ccb5aec..3dd7a0579b7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip_DS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip_DS.mat
index 819b405632d..6b8704bbab5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip_DS.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_AlphaClip_DS.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Opaque.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Opaque.mat
index 9b463be48b0..9166c5a58c8 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Opaque.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Opaque.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent.mat
index 9ddfeed0a13..552313c888b 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Add.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Add.mat
index 92918672a13..4dd39785c7f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Add.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Add.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Distortion.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Distortion.mat
index dbcd6d410e3..f8a18d7213f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Distortion.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Distortion.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Emission.mat
index 90315aabe31..e3abccd2433 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Emission.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Unlit/Unlit_Transparent_Emission.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool.mat
index 783b64c4990..42ba93b0ff9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_AlphaClip.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_AlphaClip.mat
index 501b61e14be..ed5a3051ce4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_AlphaClip.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_AlphaClip.mat	
@@ -136,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Emission.mat
index f695a04fb63..ad1530442da 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Emission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_SSS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_SSS.mat
index 42837a3a32b..61503614190 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_SSS.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_SSS.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transmission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transmission.mat
index b5258f97d84..01e9f2c40d9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transmission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transmission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transparent.mat
index 201b42fc37d..e871fe6a53d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_CottonWool_Transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk.mat
index 79b21ca1617..6fcf18a4fca 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_AlphaClip_DS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_AlphaClip_DS.mat
index 01e91dfa9de..cc8b539f320 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_AlphaClip_DS.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_AlphaClip_DS.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_SSS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_SSS.mat
index 032a271e583..3d5ccd6210c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_SSS.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_SSS.mat	
@@ -114,4 +114,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transmission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transmission.mat
index b5bcafbd23f..8836fae741d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transmission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transmission.mat	
@@ -113,4 +113,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transparent.mat
index fb445f52eb9..f37d3fcefa9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Fabric/Shader Graphs_Fabric_Silk_Transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard.mat
index e234542ea9b..0ce51e38965 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard.mat	
@@ -112,4 +112,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip.mat
index 272a1432be6..f358458b89e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip_DS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip_DS.mat
index 495a90d5cc1..a61b8fc16ed 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip_DS.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_AlphaClip_DS.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_Transparent.mat
index f387010aaf6..8484acbf5e4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_Transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Hair/Shader Graphs_Hair_Standard_Transparent.mat	
@@ -114,4 +114,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Anisotropic.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Anisotropic.mat
index b51a35ef217..d41accb105c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Anisotropic.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Anisotropic.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -30,6 +30,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -50,6 +62,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -93,4 +106,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Emission.mat
index 17ee25506a8..afe52eb8183 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Emission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Emission.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -38,6 +38,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -58,6 +70,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -102,4 +115,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Iridescence.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Iridescence.mat
index 44707e80420..645cfda044d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Iridescence.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Iridescence.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -51,6 +51,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -71,6 +83,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Specular.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Specular.mat
index ca11fbe5062..c9ba5e10954 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Specular.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Specular.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -51,6 +51,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -71,6 +83,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Standard.mat
index 9cb23c905f9..ae74bb1e3d5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Standard.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Standard.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -38,6 +38,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -58,6 +70,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -102,4 +115,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_SubSurface.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_SubSurface.mat
index 73ae9d4535e..89e14d74e64 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_SubSurface.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_SubSurface.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -25,7 +25,19 @@ Material:
   - TransparentDepthPostpass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -47,6 +59,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 1
     - _SrcBlend: 1
@@ -92,4 +105,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Translucent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Translucent.mat
index f839b617f50..b7f3a38bc43 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Translucent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Translucent.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -30,6 +30,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -51,6 +63,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -96,4 +109,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Box.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Box.mat
index a6a0f7c8416..4ba0a12dbd2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Box.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Box.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,8 +23,8 @@ Material:
   m_Name: Shader Graphs_Lit_Transparent_Box
   m_Shader: {fileID: -6465566751694194690, guid: 1fc39fac9c18a04449e6df4525598b4b,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -44,6 +44,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -64,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 1
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_None.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_None.mat
index dc4f166dd41..40547262ed4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_None.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_None.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_Lit_Transparent_None
   m_Shader: {fileID: -6465566751694194690, guid: 5e56ac555a0d9ab4b841882ac84a9355,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -44,6 +44,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -64,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Sphere.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Sphere.mat
index dc250253f10..ff21dbc3eb2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Sphere.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Sphere.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_Lit_Transparent_Sphere
   m_Shader: {fileID: -6465566751694194690, guid: 2551b7db722914f418c8d5e22f354e19,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -31,6 +31,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -51,6 +63,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Thin.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Thin.mat
index 62a619fa61c..02b4a9896ed 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Thin.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Lit/Shader Graphs_Lit_Transparent_Thin.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,8 +23,8 @@ Material:
   m_Name: Shader Graphs_Lit_Transparent_Thin
   m_Shader: {fileID: -6465566751694194690, guid: ad8709f4d1c0b814cb2ab35cd181fdb3,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_THIN _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -44,6 +44,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -64,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 3
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit.mat
index 8e98565b748..9e2dbb8c6fc 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Anisotropy.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Anisotropy.mat
index 65f740bfc7f..9fd0adc3bf8 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Anisotropy.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Anisotropy.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Coat.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Coat.mat
index 6f6bb1b1acb..3a76a18c786 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Coat.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Coat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe.mat
index 71dce9bc87f..41a6175b4e0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe_Hazy.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe_Hazy.mat
index 701938ed1d3..3c554a15b6c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe_Hazy.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_DualSpecLobe_Hazy.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Emission.mat
index b6a2709eca8..168b46eb2ce 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Emission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Iridescence.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Iridescence.mat
index 3af4fab5ff2..1d8bb605964 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Iridescence.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Iridescence.mat	
@@ -137,4 +137,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Spec.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Spec.mat
index 9ecde0e1e72..f569957cdec 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Spec.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Spec.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_SubSurface.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_SubSurface.mat
index 4e53932ad70..1a53a93cf6e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_SubSurface.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_SubSurface.mat	
@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transmission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transmission.mat
index f28b85a7fd9..cdd6f329277 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transmission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transmission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transparent.mat
index 5d03f4a9e31..3768d284bf4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip.mat
index 3260da53306..54104dc12d4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip_DS.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip_DS.mat
index b1fa40f79c7..b81adb1fa7c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip_DS.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_AlphaClip_DS.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Emission.mat
index c82da430e2e..d05123358e6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Emission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Emission.mat	
@@ -115,4 +115,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Standard.mat
index daeb1453baa..625789ad425 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Standard.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Standard.mat	
@@ -115,4 +115,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent.mat
index 268cf3a1d04..be34bacf5ca 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent.mat	
@@ -116,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Add.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Add.mat
index a9d29f851e9..8bb9aa8799f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Add.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Add.mat	
@@ -116,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Premultiply.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Premultiply.mat
index 6c1c0398a25..874d83eecdc 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Premultiply.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/Unlit/Shader Graphs_Unlit_Transparent_Premultiply.mat	
@@ -116,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROff.mat
index 07864c346d1..2f0096475e0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROff.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROn.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROn.mat
index 3b0dc5f6711..8ad4e3aff88 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROn.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Lit_RTRT_OpaqueSSROn.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_Ceiling.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_Ceiling.mat
index a9f11841490..8e740e36e17 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_Ceiling.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_Ceiling.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_FloorMaterial.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_FloorMaterial.mat
index 7a86a8ed3d2..37faa8078bc 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_FloorMaterial.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/M_FloorMaterial.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROff.mat
index 4082a346ef4..e663792f252 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROff.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROn.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROn.mat
index 9c636315225..2283862d8da 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROn.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Fabric_RTRT_OpaqueSSROn.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROff.mat
index 8dad6ed6a41..7316cf4ae06 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROff.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROn.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROn.mat
index a5179a10552..bace522e876 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROn.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Hair_RTRT_OpaqueSSROn.mat	
@@ -88,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROff.mat
index 82390465e3b..05ca2c134eb 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROff.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROff.mat	
@@ -10,12 +10,12 @@ Material:
   m_Name: Shader Graphs_SG_Lit_RTRT_OpaqueSSROff
   m_Shader: {fileID: -6465566751694194690, guid: 171c9fc3e6ae14647ab54d90f1da4382,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -26,7 +26,19 @@ Material:
   - TransparentDepthPostpass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -47,6 +59,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -90,4 +103,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROn.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROn.mat
index 943027174b9..2d880627079 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROn.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_Lit_RTRT_OpaqueSSROn.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_SG_Lit_RTRT_OpaqueSSROn
   m_Shader: {fileID: -6465566751694194690, guid: 9ec9f5ffc4c411f429ffb2f055e56d3d,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -39,7 +39,19 @@ Material:
   - TransparentDepthPostpass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -60,6 +72,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROff.mat
index 8f34007a481..bd22c437a2d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROff.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROn.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROn.mat
index ef073a3100d..40a274fa743 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROn.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/Shader Graphs_SG_StackLit_RTRT_OpaqueSSROn.mat	
@@ -88,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_Diffuse.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_Diffuse.mat
index 325f3ce7158..e27b7008088 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_Diffuse.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_Diffuse.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_DiffuseHead.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_DiffuseHead.mat
index 2b5246096c1..3091bb5e4a6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_DiffuseHead.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/M_DiffuseHead.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Chrome.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Chrome.mat
index ef5530e5f84..adf1a093cb7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Chrome.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Chrome.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Mirror.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Mirror.mat
index f2c8b99a0ce..f3d12c5175c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Mirror.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Mirror.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Rough.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Rough.mat
index cb9cce2d3de..28511aa6fa1 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Rough.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/M_Rough.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Floor.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Floor.mat
index 9d0e09458af..1ed8e1303d5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Floor.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Floor.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Anisotropy.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Anisotropy.mat
index 87f9804bc6e..221b431e325 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Anisotropy.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Anisotropy.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_EyeSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_EyeSG.mat
index 8bd2be3e4a8..0b72e8d2532 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_EyeSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_EyeSG.mat
@@ -102,4 +102,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_FabricSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_FabricSG.mat
index 25d7ccdb023..6be1e00a354 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_FabricSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_FabricSG.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_HairSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_HairSG.mat
index 329850bbc2b..60c978bab95 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_HairSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_HairSG.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LItSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LItSG.mat
index 8e6cf24b15d..19e05112092 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LItSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LItSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_14FF0E00: 0
     - Vector1_187A6532: 0
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LayeredLit0.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LayeredLit0.mat
index 28894af6ec9..a3e33da7800 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LayeredLit0.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LayeredLit0.mat
@@ -274,6 +274,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -433,6 +445,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -589,4 +609,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitCutoff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitCutoff.mat
index 7e9c21a51df..9eb55cce53e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitCutoff.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitCutoff.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitVariablesSmoothness.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitVariablesSmoothness.mat
index 27c6f147a73..ded7dd8d1a7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitVariablesSmoothness.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_LitVariablesSmoothness.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -46,6 +58,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -89,4 +102,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Reflective.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Reflective.mat
index b874bcac7b7..b86299205a0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Reflective.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Reflective.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_ReflectiveNoSSR.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_ReflectiveNoSSR.mat
index fc9ed4dc7bf..cc83dcd0665 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_ReflectiveNoSSR.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_ReflectiveNoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_SpecularColor.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_SpecularColor.mat
index da3378bfa34..2e291775712 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_SpecularColor.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_SpecularColor.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_StackLitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_StackLitSG.mat
index 6055ed3b8fe..de09c1134b4 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_StackLitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_StackLitSG.mat
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Standard.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Standard.mat
index 320b892913c..27433cb023e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Standard.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_Standard.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmooth.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmooth.mat
index 1553955a151..a376514abd9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmooth.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmooth.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSG.mat
index ec1c438320c..fee7ff838e0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSG.mat
@@ -10,7 +10,7 @@ Material:
   m_Name: M_TransparentSmoothSG
   m_Shader: {fileID: -6465566751694194690, guid: 0682f2061f5525d44a8f9cbb171761f3,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSR.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSR.mat
index 0390c78b223..3997870b674 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSR.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSR.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSRSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSRSG.mat
index e16f803ecf3..341d13e57d2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSRSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_TransparentSmoothSSRSG.mat
@@ -10,7 +10,7 @@ Material:
   m_Name: M_TransparentSmoothSSRSG
   m_Shader: {fileID: -6465566751694194690, guid: 7a6938e95b0473d488e67ffd5bb0cee4,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -269,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_UnlitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_UnlitSG.mat
index 550e5631dbb..9097be4e6ab 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_UnlitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/M_UnlitSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Marker.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Marker.mat
index db0d16992b6..e5236b33b56 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Marker.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Marker.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Red.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Red.mat
index 91cd272f242..afe1ae00653 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Red.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/Red.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/head.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/head.mat
index 35ffd3c2d85..c4c64750ca0 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/head.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/head.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat 1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat 1.mat
index 213ac2b18f1..836dda98616 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat 1.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat.mat
index 9f8ddcd90ed..8bb4f16ffb5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/mat.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Plane_RT_Indirect.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Plane_RT_Indirect.mat
index 3f0ee0e29ee..4edc98fdd1f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Plane_RT_Indirect.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Plane_RT_Indirect.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission.mat
index 2f8dc202d01..4743a27ec50 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission.mat	
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -46,6 +58,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -89,4 +102,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission_Unlit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission_Unlit.mat
index 676ba2d31e5..525e4fd9301 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission_Unlit.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/Shader Graphs_SGLit_RaytracingKeyword_Emission_Unlit.mat	
@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Shader Graphs_SGLit_RaytracingKeyword_Emission
+  m_Name: Shader Graphs_SGLit_RaytracingKeyword_Emission_Unlit
   m_Shader: {fileID: -6465566751694194690, guid: 58bceeb58a032bb40a7c4580ab3957ff,
     type: 3}
   m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -46,6 +58,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -89,4 +102,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/M_Ground.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/M_Ground.mat
index c5de785623c..933b0c589e6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/M_Ground.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/M_Ground.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_1.mat
index 8d9576bae1d..504ab50cb86 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_1.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_1.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_SGLit_Transparent_Refraction_1
   m_Shader: {fileID: -6465566751694194690, guid: 44298d8846169944ca7be93da1c2e6ec,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -26,7 +26,19 @@ Material:
   - TransparentDepthPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_20ff050e74d44620b5508234c99f478a: 1.1
     - Vector1_fbcc4ed2be2b44499a535cf5e0c80dd6: 0.25
@@ -49,6 +61,7 @@ Material:
     - _RayTracing: 1
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_2.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_2.mat
index 2b73d10daa8..d207ddf0f64 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_2.mat	
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/Shader Graphs_SGLit_Transparent_Refraction_2.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_SGLit_Transparent_Refraction_2
   m_Shader: {fileID: -6465566751694194690, guid: 44298d8846169944ca7be93da1c2e6ec,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -26,7 +26,19 @@ Material:
   - TransparentDepthPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_20ff050e74d44620b5508234c99f478a: 1.1
     - Vector1_fbcc4ed2be2b44499a535cf5e0c80dd6: 0.25
@@ -49,6 +61,7 @@ Material:
     - _RayTracing: 1
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Floor.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Floor.mat
index cbb050d2343..2a0760a1344 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Floor.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Floor.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Green.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Green.mat
index b0c2ff1f84b..33a06dc323f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Green.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Green.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.577
+    - _MetallicRemapMax: 0.577
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_LitRecursiveTransparentSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_LitRecursiveTransparentSG.mat
index d2fc238afef..fe854aa867f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_LitRecursiveTransparentSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_LitRecursiveTransparentSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,8 +23,8 @@ Material:
   m_Name: M_LitRecursiveTransparentSG
   m_Shader: {fileID: -6465566751694194690, guid: 2c6c738254831714eb28abe9be217e78,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -206,7 +218,7 @@ Material:
     - _RayTracing: 1
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
-    - _RefractionModel: 0
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SSRefractionProjectionModel: 0
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Mirror.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Mirror.mat
index a6886fdf4ae..440a9eaeb55 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Mirror.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Mirror.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparent.mat
index 8dc66e4a853..598ba762dd6 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefraction.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefraction.mat
index f43eb75b11b..47121c7a7f9 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefraction.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefraction.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefractionDouble.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefractionDouble.mat
index 6a2aee3208d..896a74499bf 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefractionDouble.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentNoRefractionDouble.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentRefra1.1.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentRefra1.1.mat
index e49318a8b76..c9c9d7fa07d 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentRefra1.1.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_RecursiveTransparentRefra1.1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Red.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Red.mat
index f49580679aa..56cfd4f55a3 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Red.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RecursiveRenderingData/M_Red.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.577
+    - _MetallicRemapMax: 0.577
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_MirrorLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_MirrorLit.mat
index 77aa21f7d5c..3e23a51cb81 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_MirrorLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_MirrorLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Opaque.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Opaque.mat
index 6ba797f9dca..fdf5ebef78a 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Opaque.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Opaque.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoff.mat
index 92c8d48e3ef..8d1b7214528 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoff.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoffShadow.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoffShadow.mat
index 096db8012c4..6ac44755217 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoffShadow.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueCutoffShadow.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSG.mat
index 4ea63e43e96..2dc7f96d1f7 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSG.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoff.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoff.mat
index 36cfb2a5d2f..08508e12467 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoff.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoff.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_de12680fa66f4d83acef056744cdab8a: 0.5
     - _AORemapMax: 1
@@ -276,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoffShadow.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoffShadow.mat
index 208d18d9838..18ec08f68bd 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoffShadow.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueSGCutoffShadow.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_d6216a6180894c54aff632d9d553e0f7: 0.5
     - Vector1_de12680fa66f4d83acef056744cdab8a: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlit.mat
index c7a1d373479..cdfae43ec7b 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlitSG.mat
index 5fbab6efcba..589e173e37e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_OpaqueUnlitSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_RoughLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_RoughLit.mat
index a4625fb8107..1460f6662c3 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_RoughLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_RoughLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_StackLitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_StackLitSG.mat
index acd83ac26a1..3fd8d938d4e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_StackLitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_StackLitSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaque.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaque.mat
index 2789fd8e9ef..d07004a4c27 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaque.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaque.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaqueSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaqueSG.mat
index 142e1545c97..46b46b7a91b 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaqueSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionOpaqueSG.mat
@@ -10,8 +10,8 @@ Material:
   m_Name: M_TransmissionOpaqueSG
   m_Shader: {fileID: -6465566751694194690, guid: ab43e220f7c9dd84c828cf1620827643,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1d63c50d8a78441986a3b52ad724fa08: 1.5
     - Vector1_87a93e9320d44d35a73d0c95bc18339d: 1
@@ -274,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparent.mat
index 1b41dd545b4..da94ab0b62f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparentSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparentSG.mat
index 8190a54c143..c953e0f290f 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparentSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransmissionTransparentSG.mat
@@ -10,8 +10,8 @@ Material:
   m_Name: M_TransmissionTransparentSG
   m_Shader: {fileID: -6465566751694194690, guid: ab43e220f7c9dd84c828cf1620827643,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1d63c50d8a78441986a3b52ad724fa08: 1.5
     - Vector1_87a93e9320d44d35a73d0c95bc18339d: 0.5
@@ -274,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Transparent.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Transparent.mat
index 04e805a5fb5..57075dc3dcf 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Transparent.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_Transparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentSG.mat
index 15ac3852ba7..050f95a6dce 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,12 +23,12 @@ Material:
   m_Name: M_TransparentSG
   m_Shader: {fileID: -6465566751694194690, guid: 7c2f461ebf2851646bddde10ef27e23f,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -40,7 +40,19 @@ Material:
   - TransparentBackface
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_0bbbeb78e27847c7a60212e1444ca1ba: 0.5
     - _AddPrecomputedVelocity: 0
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlit.mat
index 3f5b042fdcf..e4b6ca51a30 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlitSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlitSG.mat
index b4adf89ccbe..6d7c68e6229 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlitSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/ShadowData/M_TransparentUnlitSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_DiffuseLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_DiffuseLit.mat
index ce8e33c1903..83170f12af5 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_DiffuseLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_DiffuseLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_FrameIndex.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_FrameIndex.mat
index ed4468224ed..73dab7f2398 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_FrameIndex.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_FrameIndex.mat
@@ -265,4 +265,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_Mirror.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_Mirror.mat
index ecfee84194d..ab427c7af3e 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_Mirror.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Shared/M_Mirror.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_FabricSSSGraph.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_FabricSSSGraph.mat
index 740af39357c..87da715e7f2 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_FabricSSSGraph.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_FabricSSSGraph.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_GrayLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_GrayLit.mat
index dc174047eb4..56e5060733a 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_GrayLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_GrayLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Jade.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Jade.mat
index 38e845a550c..285c874a40c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Jade.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Jade.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LayeredSubSurface.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LayeredSubSurface.mat
index ec997fbe56d..cbe028562de 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LayeredSubSurface.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LayeredSubSurface.mat
@@ -275,6 +275,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -434,6 +446,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -592,4 +612,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LitSubSurfaceSG.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LitSubSurfaceSG.mat
index 1f81b549d21..8b093613a00 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LitSubSurfaceSG.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_LitSubSurfaceSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Marble.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Marble.mat
index 49310e0ce84..91559ff873c 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Marble.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_Marble.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_OrangeLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_OrangeLit.mat
index 1d6d0a17739..4beb2666818 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_OrangeLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_OrangeLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_SubSurface.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_SubSurface.mat
index 5cfd6c41c8e..86929c43ece 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_SubSurface.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_SubSurface.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_TurquoiseLit.mat b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_TurquoiseLit.mat
index 4d2fc4d8930..90ef6830214 100644
--- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_TurquoiseLit.mat
+++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/SubSurfaceScatteringData/M_TurquoiseLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2

From 7c2c6e306d2e04d4a0f50556f7ee3ba4791dfeaa Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 17:37:58 +0200
Subject: [PATCH 10/13] HDRP_Tests

---
 .../Common/Materials/UnlitCanvasMat.mat       |  2 +-
 .../Emissive_Color/01_Unlit_Simple.mat        |  2 +-
 .../Emissive_Color/02_Unlit_Trans_Alpha.mat   |  2 +-
 ...03_Unlit_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../Emissive_Color/04_Unlit_DoubleSide.mat    |  2 +-
 .../05_Unlit_DoubleSide_Transparent.mat       |  2 +-
 ...ubleSide_Transparent_PreRefractionPass.mat |  2 +-
 .../Emissive_Color/07_Unlit_Textured.mat      |  2 +-
 .../08_Unlit_Textured_Transparent.mat         |  2 +-
 ...Textured_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../10_Unlit_Textured_DoubleSide.mat          |  2 +-
 ..._Unlit_Textured_Transparent_DoubleSide.mat |  2 +-
 ...ans_Alpha_PreRefractionPass_DoubleSide.mat |  2 +-
 .../13_Unlit_Textured_AlphaCutoff.mat         |  2 +-
 ...Unlit_Textured_Transparent_AlphaCutoff.mat |  2 +-
 ...ns_Alpha_PreRefractionPass_AlphaCutoff.mat |  2 +-
 ..._Unlit_Textured_AlphaCutoff_Doubleside.mat |  2 +-
 ...red_Transparent_AlphaCutoff_Doubleside.mat |  2 +-
 ...eRefractionPass_AlphaCutoff_Doubleside.mat |  2 +-
 .../Emissive_Texture/01_Unlit_Simple.mat      |  2 +-
 .../Emissive_Texture/02_Unlit_Trans_Alpha.mat |  2 +-
 ...03_Unlit_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../Emissive_Texture/04_Unlit_DoubleSide.mat  |  2 +-
 .../05_Unlit_DoubleSide_Transparent.mat       |  2 +-
 ...ubleSide_Transparent_PreRefractionPass.mat |  2 +-
 .../Emissive_Texture/07_Unlit_Textured.mat    |  2 +-
 .../08_Unlit_Textured_Transparent.mat         |  2 +-
 ...Textured_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../10_Unlit_Textured_DoubleSide.mat          |  2 +-
 ..._Unlit_Textured_Transparent_DoubleSide.mat |  2 +-
 ...ans_Alpha_PreRefractionPass_DoubleSide.mat |  2 +-
 .../13_Unlit_Textured_AlphaCutoff.mat         |  2 +-
 ...Unlit_Textured_Transparent_AlphaCutoff.mat |  2 +-
 ...ns_Alpha_PreRefractionPass_AlphaCutoff.mat |  2 +-
 ..._Unlit_Textured_AlphaCutoff_Doubleside.mat |  2 +-
 ...red_Transparent_AlphaCutoff_Doubleside.mat |  2 +-
 ...eRefractionPass_AlphaCutoff_Doubleside.mat |  2 +-
 .../Non_Emissive/01_Unlit_Simple.mat          |  2 +-
 .../Non_Emissive/02_Unlit_Trans_Alpha.mat     |  2 +-
 ...03_Unlit_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../Non_Emissive/04_Unlit_DoubleSide.mat      |  2 +-
 .../05_Unlit_DoubleSide_Transparent.mat       |  2 +-
 ...ubleSide_Transparent_PreRefractionPass.mat |  2 +-
 .../Non_Emissive/07_Unlit_Textured.mat        |  2 +-
 .../08_Unlit_Textured_Transparent.mat         |  2 +-
 ...Textured_Trans_Alpha_PreRefractionPass.mat |  2 +-
 .../10_Unlit_Textured_DoubleSide.mat          |  2 +-
 ..._Unlit_Textured_Transparent_DoubleSide.mat |  2 +-
 ...ans_Alpha_PreRefractionPass_DoubleSide.mat |  2 +-
 .../13_Unlit_Textured_AlphaCutoff.mat         |  2 +-
 ...Unlit_Textured_Transparent_AlphaCutoff.mat |  2 +-
 ...ns_Alpha_PreRefractionPass_AlphaCutoff.mat |  2 +-
 ..._Unlit_Textured_AlphaCutoff_Doubleside.mat |  2 +-
 ...red_Transparent_AlphaCutoff_Doubleside.mat |  2 +-
 ...eRefractionPass_AlphaCutoff_Doubleside.mat |  2 +-
 .../M_Distortion.mat                          |  2 +-
 .../1101_Unlit_Smooth_Distortion/M_Plane.mat  | 16 ++++++++++-
 .../Distortion_Only/01_Unlit_Trans.mat        |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Emissive_Color/01_Unlit_Trans.mat         |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Emissive_Texture/01_Unlit_Trans.mat       |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Non_Emissive/01_Unlit_Trans.mat           |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../Non_Emissive/03_Unlit_Textured_Trans.mat  |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Distortion_Only/01_Unlit_Trans.mat        |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Emissive_Color/01_Unlit_Trans.mat         |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Emissive_Texture/01_Unlit_Trans.mat       |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../03_Unlit_Textured_Trans.mat               |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Non_Emissive/01_Unlit_Trans.mat           |  2 +-
 .../02_Unlit_Trans_DoubleSide.mat             |  2 +-
 .../Non_Emissive/03_Unlit_Textured_Trans.mat  |  2 +-
 .../04_Unlit_Textured_Trans_DoubleSide.mat    |  2 +-
 .../05_Unlit_Textured_Trans_Cutoff.mat        |  2 +-
 ...Unlit_Textured_Trans_Cutoff_DoubleSide.mat |  2 +-
 .../Lit_Add_All.mat                           | 16 ++++++++++-
 .../Lit_Add_DepthTest.mat                     | 16 ++++++++++-
 .../Unlit_Add_All.mat                         |  2 +-
 .../Unlit_Add_All_-26.7.mat                   |  2 +-
 .../Unlit_Add_All_2.mat                       |  2 +-
 .../Unlit_Add_All_DepthTest.mat               |  2 +-
 .../Unlit_BlurOnly.mat                        |  2 +-
 .../Unlit_Mult_Two.mat                        |  2 +-
 .../00 Op DbSi/1105_Op_DblSi_AlphaClip.mat    |  2 +-
 .../00 Op DbSi/1105_Op_DblSi_Color.mat        |  2 +-
 .../00 Op DbSi/1105_Op_DblSi_Emission.mat     |  2 +-
 .../00 Op DbSi/1105_Op_DblSi_ObjSpace.mat     |  2 +-
 .../00 Op Def/1105_Op_Def_AlphaClip.mat       |  2 +-
 .../00 Op Def/1105_Op_Def_Color.mat           |  2 +-
 .../00 Op Def/1105_Op_Def_Emission.mat        |  2 +-
 .../00 Op Def/1105_Op_Def_ObjSpace.mat        |  2 +-
 .../01 Tr Add/1105_Tr_Add_AlphaClip.mat       |  2 +-
 .../01 Tr Add/1105_Tr_Add_Color.mat           |  2 +-
 .../01 Tr Add/1105_Tr_Add_Emission.mat        |  2 +-
 .../01 Tr Add/1105_Tr_Add_ObjSpace.mat        |  2 +-
 .../01 Tr Alpha/1105_Tr_Alpha_AlphaClip.mat   |  2 +-
 .../01 Tr Alpha/1105_Tr_Alpha_Color.mat       |  2 +-
 .../01 Tr Alpha/1105_Tr_Alpha_Emission.mat    |  2 +-
 .../01 Tr Alpha/1105_Tr_Alpha_ObjSpace.mat    |  2 +-
 .../01 Tr Pre/1105_Tr_Premul_AlphaClip.mat    |  2 +-
 .../01 Tr Pre/1105_Tr_Premul_Color.mat        |  2 +-
 .../01 Tr Pre/1105_Tr_Premul_Emission.mat     |  2 +-
 .../01 Tr Pre/1105_Tr_Premul_ObjSpace.mat     |  2 +-
 .../1105_Tr_DblSi_Add_AlphaClip.mat           |  2 +-
 .../1105_Tr_DblSi_Add_Color.mat               |  2 +-
 .../1105_Tr_DblSi_Add_Emission.mat            |  2 +-
 .../1105_Tr_DblSi_Add_ObjSpace.mat            |  2 +-
 .../1105_Tr_DblSi_Alpha_AlphaClip.mat         |  2 +-
 .../1105_Tr_DblSi_Alpha_Color.mat             |  2 +-
 .../1105_Tr_DblSi_Alpha_Emission.mat          |  2 +-
 .../1105_Tr_DblSi_Alpha_ObjSpace.mat          |  2 +-
 .../1105_Tr_DblSi_Pre_AlphaClip.mat           |  2 +-
 .../1105_Tr_DblSi_Pre_Color.mat               |  2 +-
 .../1105_Tr_DblSi_Pre_Emission.mat            |  2 +-
 .../1105_Tr_DblSi_Pre_ObjSpace.mat            |  2 +-
 .../03 Tr BR Add/1105_Tr_BR_Add_AlphaClip.mat |  2 +-
 .../03 Tr BR Add/1105_Tr_BR_Add_Color.mat     |  2 +-
 .../03 Tr BR Add/1105_Tr_BR_Add_Emission.mat  |  2 +-
 .../03 Tr BR Add/1105_Tr_BR_Add_ObjSpace.mat  |  2 +-
 .../1105_Tr_BR_Alpha_AlphaClip.mat            |  2 +-
 .../03 Tr BR Alpha/1105_Tr_BR_Alpha_Color.mat |  2 +-
 .../1105_Tr_BR_Alpha_Emission.mat             |  2 +-
 .../1105_Tr_BR_Alpha_ObjSpace.mat             |  2 +-
 .../03 Tr BR Pre/1105_Tr_BR_Pre_AlphaClip.mat |  2 +-
 .../03 Tr BR Pre/1105_Tr_BR_Pre_Color.mat     |  2 +-
 .../03 Tr BR Pre/1105_Tr_BR_Pre_Emission.mat  |  2 +-
 .../03 Tr BR Pre/1105_Tr_BR_Pre_ObjSpace.mat  |  2 +-
 .../1105_Tr_BR_DblSi_Add_AlphaClip.mat        |  2 +-
 .../1105_Tr_BR_DblSi_Add_Color.mat            |  2 +-
 .../1105_Tr_BR_DblSi_Add_Emission.mat         |  2 +-
 .../1105_Tr_BR_DblSi_Add_ObjSpace.mat         |  2 +-
 .../1105_Tr_BR_DblSi_Alpha_AlphaClip.mat      |  2 +-
 .../1105_Tr_BR_DblSi_Alpha_Color.mat          |  2 +-
 .../1105_Tr_BR_DblSi_Alpha_Emission.mat       |  2 +-
 .../1105_Tr_BR_DblSi_Alpha_ObjSpace.mat       |  2 +-
 .../1105_Tr_BR_DblSi_Premul_AlphaClip.mat     |  2 +-
 .../1105_Tr_BR_DblSi_Premul_Color.mat         |  2 +-
 .../1105_Tr_BR_DblSi_Premul_Emission.mat      |  2 +-
 .../1105_Tr_BR_DblSi_Premul_ObjSpace.mat      |  2 +-
 .../05 Distortion/1105 Distortion Add 01.mat  |  2 +-
 .../05 Distortion/1105 Distortion Add 02.mat  |  2 +-
 .../05 Distortion/1105 Distortion Mul 01.mat  |  2 +-
 .../05 Distortion/1105 Distortion Replace.mat |  2 +-
 .../1201_Lit_Features/Lit_Detail.mat          | 16 ++++++++++-
 .../1201_Lit_Features/Lit_Detail_Mask.mat     | 16 ++++++++++-
 .../Lit_Detail_ParamsTest.mat                 | 16 ++++++++++-
 .../Lit_NormalMap_ObjectSpace.mat             | 16 ++++++++++-
 .../Lit_NormalMap_TangentSpace.mat            | 16 ++++++++++-
 .../1201_Lit_Features/Lit_Texture.mat         | 16 ++++++++++-
 .../DoubleSideNormalTest.mat                  | 16 ++++++++++-
 .../DoubleSidedLitGraph_Flip.mat              | 21 ++++++++++++--
 .../DoubleSidedLitGraph_Mirror.mat            | 21 ++++++++++++--
 .../DoubleSidedLitGraph_None.mat              | 21 ++++++++++++--
 .../Lit_Transparent_Additive.mat              | 16 ++++++++++-
 .../Lit_Transparent_Alpha.mat                 | 16 ++++++++++-
 .../Lit_Transparent_Multiplicative.mat        | 16 ++++++++++-
 .../Lit_Transparent_PremultipliedAlpha.mat    | 16 ++++++++++-
 .../1x_Materials/1204_Lit_Fog/Lit_Fog.mat     | 16 ++++++++++-
 .../Lit_Transparent_Additive_Fog_Off.mat      | 16 ++++++++++-
 .../Lit_Transparent_Additive_Fog_On.mat       | 16 ++++++++++-
 .../1204_Lit_Fog/Lit_Transparent_Fog_Off.mat  | 16 ++++++++++-
 .../1204_Lit_Fog/Lit_Transparent_Fog_On.mat   | 16 ++++++++++-
 .../Lit_Transparent_Premultiply_Fog_Off.mat   | 16 ++++++++++-
 .../Lit_Transparent_Premultiply_Fog_On.mat    | 16 ++++++++++-
 .../Lit_Transparent_Refraction_Fog_Off.mat    | 16 ++++++++++-
 .../Lit_Transparent_Refraction_Fog_On.mat     | 16 ++++++++++-
 .../Materials/1204_Lit_Fog_Display.mat        |  2 +-
 .../Lit_Refraction_Plane.mat                  | 16 ++++++++++-
 .../Lit_Refraction_Plane_NM.mat               | 16 ++++++++++-
 .../Lit_Refraction_Plane_NM_Thickness.mat     | 16 ++++++++++-
 .../Lit_Refraction_Plane_Thickness.mat        | 16 ++++++++++-
 .../Lit_Refraction_Sphere.mat                 | 16 ++++++++++-
 .../Lit_Refraction_Sphere_NM.mat              | 16 ++++++++++-
 .../Lit_Refraction_Sphere_NM_Thickness.mat    | 16 ++++++++++-
 .../Lit_Refraction_Sphere_Thickness.mat       | 16 ++++++++++-
 .../Lit_Distortion.mat                        | 16 ++++++++++-
 .../Lit_Displacement_Pixel.mat                | 16 ++++++++++-
 .../Lit_Displacement_Pixel_Tile10.mat         | 16 ++++++++++-
 .../Lit_Displacement_Vertex.mat               | 16 ++++++++++-
 .../Lit_Displacement_Vertex_Tile10.mat        | 16 ++++++++++-
 .../Lit_Displacement_Pixel.mat                | 16 ++++++++++-
 .../Lit_Displacement_Vertex.mat               | 16 ++++++++++-
 .../BentNormal_Tangent.mat                    | 16 ++++++++++-
 .../1210_Lit_BentNormal/Green_Emissive.mat    | 16 ++++++++++-
 .../1210_Lit_BentNormal/Red_Emissive.mat      | 16 ++++++++++-
 .../1211_Lit_Details/Lit_Detail.mat           | 16 ++++++++++-
 .../Lit_Detail_TilingOffset.mat               | 16 ++++++++++-
 .../1212_Lit_Emission/ColorRange.mat          | 16 ++++++++++-
 .../1212_Lit_Emission/Lit_Emissive.mat        | 16 ++++++++++-
 .../Lit_Emissive_TileOffset.mat               | 16 ++++++++++-
 .../1213_Lit_anisotropy/GGX_Base.mat          | 16 ++++++++++-
 .../1214_Lit_LowResTransparent/Background.mat | 16 ++++++++++-
 .../FullRes_Additive.mat                      | 16 ++++++++++-
 .../FullRes_Alpha.mat                         | 16 ++++++++++-
 .../FullRes_Premultiply.mat                   | 16 ++++++++++-
 .../LowRes_Additive.mat                       | 16 ++++++++++-
 .../LowRes_Alpha.mat                          | 16 ++++++++++-
 .../LowRes_Premultiply.mat                    | 16 ++++++++++-
 .../Candle/Candle_02.mat                      | 16 ++++++++++-
 .../Candle/Candle_NoTransmission.mat          | 16 ++++++++++-
 .../LayerRef.mat                              |  2 +-
 .../IndexOfRefraction1WorldScale0_1.mat       | 16 ++++++++++-
 .../IndexOfRefraction1_25WorldScale1.mat      | 16 ++++++++++-
 .../IndexOfRefraction1_5WorldScale10.mat      | 16 ++++++++++-
 .../IndexOfRefraction2WorldScale100.mat       | 16 ++++++++++-
 .../SSS_Layered.mat                           | 22 ++++++++++++++-
 .../SSS_Mask.mat                              | 16 ++++++++++-
 .../ShadowDimmerTest.mat                      | 16 ++++++++++-
 .../ThicknessTest.mat                         | 16 ++++++++++-
 .../1216_Lit_SSS_MaxRadius/GridOverlay.mat    |  2 +-
 .../1216_Lit_SSS_MaxRadius/MaxRadius_1.mat    | 16 ++++++++++-
 .../1216_Lit_SSS_MaxRadius/MaxRadius_10.mat   | 16 ++++++++++-
 .../1216_Lit_SSS_MaxRadius/MaxRadius_15.mat   | 16 ++++++++++-
 .../1216_Lit_SSS_MaxRadius/MaxRadius_20.mat   | 16 ++++++++++-
 .../1216_Lit_SSS_MaxRadius/MaxRadius_5.mat    | 16 ++++++++++-
 .../Head_Post-Scatter.mat                     | 16 ++++++++++-
 .../FabricProfile.mat                         |  2 +-
 .../HairProfile.mat                           |  2 +-
 .../1218_Lit_DiffusionProfiles/LayeredLit.mat | 22 ++++++++++++++-
 .../LitNoProfile.mat                          | 16 ++++++++++-
 .../LitProfile_Checker.mat                    | 14 +++++++++-
 .../ProjectDiffusionProfileCamera.mat         |  2 +-
 .../VolumeDiffusionProfileCamera.mat          |  2 +-
 .../ProjectFabricProfile.mat                  |  2 +-
 .../ProjectHairProfile.mat                    |  2 +-
 .../ProjectLayeredLit.mat                     | 22 ++++++++++++++-
 .../ProjectLitNoProfile.mat                   | 16 ++++++++++-
 .../ProjectLitProfile_Checker.mat             | 14 +++++++++-
 .../ProjectStackLitProfile.mat                |  2 +-
 .../StackLitProfile.mat                       |  2 +-
 .../LayeredLitTess_Displace.mat               | 22 ++++++++++++++-
 .../LayeredLitTess_Displace_Phong.mat         | 22 ++++++++++++++-
 .../ProbeVisualizer.mat                       |  2 +-
 .../Tess_Displace.mat                         | 16 ++++++++++-
 .../Tess_Displace_Phong.mat                   | 16 ++++++++++-
 .../1220_Sorting/Lit_Blue_Priority_0.mat      | 16 ++++++++++-
 .../1220_Sorting/Lit_Green_Priority_-20.mat   | 16 ++++++++++-
 .../1220_Sorting/Lit_Green_Priority_0.mat     | 16 ++++++++++-
 .../1220_Sorting/Lit_Red_Priority_0.mat       | 16 ++++++++++-
 .../1220_Sorting/Lit_Red_Priority_20.mat      | 16 ++++++++++-
 .../1220_Sorting/Unlit_Blue_Priority_0.mat    |  2 +-
 .../1220_Sorting/Unlit_Green_Priority_-20.mat |  2 +-
 .../1220_Sorting/Unlit_Green_Priority_0.mat   |  2 +-
 .../1220_Sorting/Unlit_Red_Priority_0.mat     |  2 +-
 .../1220_Sorting/Unlit_Red_Priority_20.mat    |  2 +-
 .../pom_emissive_layered_lit.mat              | 22 ++++++++++++++-
 .../pom_emissive_lit.mat                      | 16 ++++++++++-
 .../1222_Lit_Aniso_Textures/1222_Aniso.mat    | 16 ++++++++++-
 .../SG_TestStackMat_Dielectric_Base.mat       |  2 +-
 .../SG_TestStackMat_Dielectric_Irid.mat       |  2 +-
 .../SG_TestStackMat_Dielectric_SSS.mat        |  2 +-
 .../SG_TestStackMat_Metal_Aniso.mat           |  2 +-
 .../SG_TestStackMat_Metal_Base.mat            |  2 +-
 .../SG_TestStackMat_Metal_Coat.mat            |  2 +-
 .../SG_TestStackMat_Metal_Coat_DualNormal.mat |  2 +-
 .../Column_Metal_Occlusion.mat                | 16 ++++++++++-
 .../1302_03_StackLit/Column_SLSG_SpecC4.mat   |  2 +-
 .../Materials/Screenshots/Floor_Sides_03.mat  | 16 ++++++++++-
 .../Screenshots/Floor_Sides_03_nodetail.mat   | 16 ++++++++++-
 .../Materials/Screenshots/GreyFloor.mat       | 16 ++++++++++-
 .../Screenshots/GreyFloor_nomaps.mat          | 16 ++++++++++-
 .../Screenshots/SLSG_FrostedMetal.mat         |  2 +-
 .../Screenshots/SLSG_FrostedPaint.mat         |  2 +-
 .../Screenshots/SLSG_GlossyPaint.mat          |  2 +-
 .../Materials/Screenshots/SLSG_MetalFoil.mat  |  2 +-
 .../Screenshots/SLSG_MetallicPaint.mat        |  2 +-
 .../Materials/Screenshots/SLSG_Patina.mat     |  2 +-
 .../Screenshots/SLSG_TintedGlazing.mat        |  2 +-
 .../SG_TestStackMat_Metal_Base 1.mat          |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_1.mat         |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2.mat         |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2M.mat        |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Ma.mat       |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Mb.mat       |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Mc.mat       |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Mc2.mat      |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Mc3.mat      |  2 +-
 .../1302_03_StackLit/SLSG_BaseM_2Mc4.mat      |  2 +-
 .../Tester_Lit_Metal_Occlusion.mat            | 16 ++++++++++-
 .../1302_03_StackLit/Tester_SLSG.mat          |  2 +-
 .../1302_03_StackLit/Tester_SLSG_1.mat        |  2 +-
 .../1302_03_StackLit/Tester_SLSG_2.mat        |  2 +-
 .../1302_03_StackLit/Tester_SLSG_2b.mat       |  2 +-
 .../M_CottonWoolDetailNormalCutout_Graph.mat  |  2 +-
 ...CottonWoolDetailNormalFuzzDouble_Graph.mat |  2 +-
 .../M_CottonWoolDetailNormalFuzz_Graph.mat    |  2 +-
 .../M_CottonWoolDetailNormal_Graph.mat        |  2 +-
 .../1351_Fabric/M_CottonWoolDetail_Graph.mat  |  2 +-
 .../1351_Fabric/M_CottonWoolNormal_Graph.mat  |  2 +-
 .../1351_Fabric/M_CottonWoolSSS_Graph.mat     |  2 +-
 .../M_CottonWoolTransmission_Graph.mat        |  2 +-
 .../1351_Fabric/M_CottonWool_Graph.mat        |  2 +-
 .../M_SilkDetailNormalCutout_Graph.mat        |  2 +-
 .../M_SilkDetailNormalFuzzDouble_Graph.mat    |  2 +-
 .../M_SilkDetailNormalFuzz_Graph.mat          |  2 +-
 .../1351_Fabric/M_SilkDetailNormal_Graph.mat  |  2 +-
 .../1351_Fabric/M_SilkDetail_Graph.mat        |  2 +-
 .../1351_Fabric/M_SilkNormal_Graph.mat        |  2 +-
 .../1351_Fabric/M_SilkSSS_Graph.mat           |  2 +-
 .../1351_Fabric/M_SilkTransmission_Graph.mat  |  2 +-
 .../1x_Materials/1351_Fabric/M_Silk_Graph.mat |  2 +-
 .../1352_Fabric_Env/M_CottonWoolGraph.mat     |  2 +-
 .../1x_Materials/1352_Fabric_Env/M_Lit.mat    | 16 ++++++++++-
 .../1352_Fabric_Env/M_SilkGraph.mat           |  2 +-
 .../1x_Materials/1401_HairGraph/Grey.mat      | 16 ++++++++++-
 .../HairTest Light Facing Normal.mat          |  2 +-
 .../HairTest Light Facing Normal_Opaque.mat   |  2 +-
 .../HairTest No Shadow Threshold.mat          |  2 +-
 .../1x_Materials/1401_HairGraph/HairTest.mat  |  2 +-
 .../1401_HairGraph/HairTest_Opaque.mat        |  2 +-
 .../1x_Materials/1451_AxF_SVBRDF/AxF.mat      |  2 +-
 .../1451_AxF_SVBRDF/AxF_aniso/AxF_aniso.mat   |  2 +-
 .../AxF_displacement/AxF_displacement.mat     |  2 +-
 .../Materials/M_DiffuseGround.mat             | 16 ++++++++++-
 .../1501_EyeTestSG/Materials/M_EyeSG 0.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 1.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 2.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 3.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 4.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 5.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 6.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 7.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 8.mat    |  2 +-
 .../1501_EyeTestSG/Materials/M_EyeSG 9.mat    |  2 +-
 .../1x_Materials/1601_TerrainLit/Decal.mat    |  5 ++--
 .../1601_TerrainLit/MeshMaterial.mat          | 16 ++++++++++-
 .../FourShapesMaterial.mat                    | 16 ++++++++++-
 .../1x_Materials/1701_Decals/Decal_All.mat    |  5 ++--
 .../1701_Decals/Decal_All_ColorTint.mat       |  5 ++--
 .../1701_Decals/Decal_BlendMask.mat           |  5 ++--
 .../1701_Decals/Decal_BlendMask_Factor05.mat  |  5 ++--
 .../1701_Decals/Decal_BlendMask_NoAlbedo.mat  |  5 ++--
 .../1x_Materials/1701_Decals/Decal_Color.mat  |  5 ++--
 .../1x_Materials/1701_Decals/Decal_Mask.mat   |  5 ++--
 .../1x_Materials/1701_Decals/Decal_Normal.mat |  5 ++--
 .../1701_Decals/FourShapesTransparent.mat     | 16 ++++++++++-
 .../1701_Decals/FourShapes_NoDecal.mat        | 16 ++++++++++-
 .../FlatNormalDecal.mat                       |  5 ++--
 .../1704_Decals-Settings/Decal.mat            |  5 ++--
 .../1704_Decals-Settings/Decal_ColorTint.mat  |  5 ++--
 .../1704_Decals-Settings/Decal_Factor05.mat   |  5 ++--
 .../1704_Decals-Settings/Decal_NoAlbedo.mat   |  5 ++--
 .../1705_Decals-stress-test/Cloud2_03.mat     |  5 ++--
 .../1705_Decals-stress-test/Cloud_02.mat      |  5 ++--
 .../1705_Decals-stress-test/Cross_04.mat      |  5 ++--
 .../1705_Decals-stress-test/Floor.mat         | 16 ++++++++++-
 .../1705_Decals-stress-test/Floor_Grid.mat    | 16 ++++++++++-
 .../Floor_Transparent.mat                     | 16 ++++++++++-
 .../Floor_Transparent_Grid.mat                | 16 ++++++++++-
 .../1705_Decals-stress-test/Flower_05.mat     |  5 ++--
 .../1705_Decals-stress-test/Grunge_05.mat     |  5 ++--
 .../1705_Decals-stress-test/Grunge_06.mat     |  5 ++--
 .../1705_Decals-stress-test/Grunge_07.mat     |  5 ++--
 .../1705_Decals-stress-test/Leaf_07.mat       |  5 ++--
 .../1705_Decals-stress-test/Leaf_08.mat       |  5 ++--
 .../1705_Decals-stress-test/Leaf_09.mat       |  5 ++--
 .../1705_Decals-stress-test/Logo_02.mat       |  5 ++--
 .../1705_Decals-stress-test/MagCircle_07.mat  |  5 ++--
 .../1705_Decals-stress-test/MagCircle_08.mat  |  5 ++--
 .../1705_Decals-stress-test/Noise_04.mat      |  5 ++--
 .../1705_Decals-stress-test/Nyan_11.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_12.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_13.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_14.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_15.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_16.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_17.mat       |  5 ++--
 .../1705_Decals-stress-test/Nyan_18.mat       |  5 ++--
 .../1705_Decals-stress-test/Particle_01.mat   |  5 ++--
 .../PixelGrid_Small.mat                       |  5 ++--
 .../1705_Decals-stress-test/Ring_02.mat       |  5 ++--
 .../1705_Decals-stress-test/Ring_09.mat       |  5 ++--
 .../1705_Decals-stress-test/Shapes_03.mat     |  5 ++--
 .../1705_Decals-stress-test/Snow_10.mat       |  5 ++--
 .../1705_Decals-stress-test/Wood_01.mat       |  5 ++--
 .../1705_Decals-stress-test/Wood_03.mat       |  5 ++--
 .../1705_Decals-stress-test/Wood_15.mat       |  5 ++--
 .../1706_DecalsSG/Decal_All_SG.mat            |  2 +-
 .../1706_DecalsSG/Decal_Color_SG.mat          |  2 +-
 .../1706_DecalsSG/Decal_Mask_SG.mat           |  2 +-
 .../1706_DecalsSG/Decal_Normal_SG.mat         |  2 +-
 .../Decal_FactorAndStart.mat                  |  5 ++--
 .../fadeFactorFadeStart.mat                   |  2 +-
 .../FourShapes_POM_SG_mat.mat                 | 28 +++++++++++++++++--
 .../1708_DecalsSG_on_SG/FourShapes_SG_mat.mat | 24 ++++++++++++++--
 .../Tests_Default_SG_mat.mat                  | 16 +++++++++--
 .../DecalProjectorDefaultLayer.mat            |  5 ++--
 .../DecalProjectorEmissiveLayer5.mat          |  5 ++--
 .../1709_DecalLayer/DecalProjectorLayer3.mat  |  5 ++--
 .../1709_DecalLayer/DecalProjectorLayer7.mat  |  5 ++--
 .../1709_DecalLayer/DecalProjectorNoLayer.mat |  5 ++--
 .../1709_DecalLayer/NoDecal/NoDecalAxF.mat    |  2 +-
 .../NoDecal/NoDecalAxFTransparent.mat         |  2 +-
 .../1709_DecalLayer/NoDecal/NoDecalFabric.mat |  2 +-
 .../NoDecal/NoDecalFabricTransparent.mat      |  2 +-
 .../1709_DecalLayer/NoDecal/NoDecalLit.mat    | 16 ++++++++++-
 .../NoDecal/NoDecalLitTransparent.mat         | 16 ++++++++++-
 .../1709_DecalLayer/NoDecal/NoDecalSGLit.mat  | 14 +++++++++-
 .../NoDecal/NoDecalSGLitTransparent.mat       | 18 ++++++++++--
 .../Regular/ReceiveDecalAxF.mat               |  2 +-
 .../Regular/ReceiveDecalAxFTransparent.mat    |  2 +-
 .../Regular/ReceiveDecalFabric.mat            |  2 +-
 .../Regular/ReceiveDecalFabricTransparent.mat |  2 +-
 .../Regular/ReceiveDecalLit.mat               | 16 ++++++++++-
 .../Regular/ReceiveDecalLitTransparent.mat    | 16 ++++++++++-
 .../Regular/ReceiveDecalSGLit.mat             | 14 +++++++++-
 .../Regular/ReceiveDecalSGLitTransparent.mat  | 16 +++++++++--
 .../1710_Decals_Normal_Patch/AxFSSR.mat       | 16 ++++++++++-
 .../DecalModifier.mat                         |  5 ++--
 .../1710_Decals_Normal_Patch/FabricSSR.mat    |  2 +-
 .../LayeredLitSSR.mat                         | 22 ++++++++++++++-
 .../1710_Decals_Normal_Patch/LitSSR.mat       | 16 ++++++++++-
 .../1710_Decals_Normal_Patch/StackLitSSR.mat  |  2 +-
 .../Decal_All_SG_mask_dark.mat                |  2 +-
 .../Decal_All_SG_mask_grey.mat                |  2 +-
 .../Decal_All_SG_mask_grey_dontAffectBase.mat |  2 +-
 .../Decal_All_SG_mask_white.mat               |  2 +-
 .../1711_DecalMasks/Decal_All_mask_dark.mat   |  5 ++--
 .../1711_DecalMasks/Decal_All_mask_grey.mat   |  5 ++--
 .../Decal_All_mask_grey_dontAffectBase.mat    |  5 ++--
 .../1711_DecalMasks/Decal_All_mask_white.mat  |  5 ++--
 .../MaskRemap/Decal_mask_remap_AO_0.5.mat     |  5 ++--
 .../MaskRemap/Decal_mask_remap_AO_0.mat       |  5 ++--
 .../MaskRemap/Decal_mask_remap_AO_1.mat       |  5 ++--
 .../MaskRemap/Decal_mask_remap_metal_0.5.mat  |  5 ++--
 .../MaskRemap/Decal_mask_remap_metal_0.mat    |  5 ++--
 .../MaskRemap/Decal_mask_remap_metal_1.mat    |  5 ++--
 .../Decal_mask_remap_smoothness_0.5.mat       |  5 ++--
 .../Decal_mask_remap_smoothness_0.mat         |  5 ++--
 .../Decal_mask_remap_smoothness_1.mat         |  5 ++--
 .../ReceiveDecalTransparent.mat               | 16 ++++++++++-
 .../Classification_Anisotropy.mat             | 16 ++++++++++-
 .../Classification_ClearCoat.mat              | 16 ++++++++++-
 .../Classification_Diffusion.mat              | 16 ++++++++++-
 .../Classification_Iridescence.mat            | 16 ++++++++++-
 .../Classification_SSS.mat                    | 16 ++++++++++-
 .../Classification_Standard.mat               | 16 ++++++++++-
 ...hader Graphs_MaterialQualityTestShader.mat | 19 +++++++++++--
 .../1801_MaterialQuality/ShowCapture.mat      |  2 +-
 .../HD Lit Tesselation/Post.mat               | 16 ++++++++++-
 .../HD Lit Tesselation/Pre-Post.mat           | 16 ++++++++++-
 .../HD Lit Tesselation/Pre.mat                | 16 ++++++++++-
 .../HD Lit Tesselation/Ref.mat                | 16 ++++++++++-
 .../1802_Depth_Pre_Post/HD Lit/Opaque.mat     | 16 ++++++++++-
 .../1802_Depth_Pre_Post/HD Lit/Post.mat       | 16 ++++++++++-
 .../1802_Depth_Pre_Post/HD Lit/Pre-Post.mat   | 16 ++++++++++-
 .../1802_Depth_Pre_Post/HD Lit/Pre.mat        | 16 ++++++++++-
 .../1802_Depth_Pre_Post/HD Lit/Ref.mat        | 16 ++++++++++-
 .../HD Lit/Transparent.mat                    | 16 ++++++++++-
 .../HD Unlit/Depth Write.mat                  |  2 +-
 .../1802_Depth_Pre_Post/HD Unlit/Opaque.mat   |  2 +-
 .../1802_Depth_Pre_Post/HD Unlit/Ref.mat      |  2 +-
 .../HD Unlit/Transparent.mat                  |  2 +-
 .../1802_Depth_Pre_Post/SG Eye/Post.mat       |  2 +-
 .../1802_Depth_Pre_Post/SG Eye/Pre-Post.mat   |  2 +-
 .../1802_Depth_Pre_Post/SG Eye/Pre.mat        |  2 +-
 .../1802_Depth_Pre_Post/SG Eye/Ref.mat        |  2 +-
 .../1802_Depth_Pre_Post/SG Fabric/Post.mat    |  2 +-
 .../SG Fabric/Pre-Post.mat                    |  2 +-
 .../1802_Depth_Pre_Post/SG Fabric/Pre.mat     |  2 +-
 .../1802_Depth_Pre_Post/SG Fabric/Ref.mat     |  2 +-
 .../1802_Depth_Pre_Post/SG Hair/Post.mat      |  2 +-
 .../1802_Depth_Pre_Post/SG Hair/Pre-Post.mat  |  2 +-
 .../1802_Depth_Pre_Post/SG Hair/Pre.mat       |  2 +-
 .../1802_Depth_Pre_Post/SG Hair/Ref.mat       |  2 +-
 .../1802_Depth_Pre_Post/SG Lit/Post.mat       | 20 ++++++++++---
 .../1802_Depth_Pre_Post/SG Lit/Pre-Post.mat   | 20 ++++++++++---
 .../1802_Depth_Pre_Post/SG Lit/Pre.mat        | 20 ++++++++++---
 .../1802_Depth_Pre_Post/SG Lit/Ref.mat        | 20 ++++++++++---
 .../1802_Depth_Pre_Post/SG StackLit/Post.mat  |  2 +-
 .../SG StackLit/Pre-Post.mat                  |  2 +-
 .../1802_Depth_Pre_Post/SG StackLit/Pre.mat   |  2 +-
 .../1802_Depth_Pre_Post/SG StackLit/Ref.mat   |  2 +-
 .../1802_Depth_Pre_Post/SG Unlit/Post.mat     |  2 +-
 .../1802_Depth_Pre_Post/SG Unlit/Pre-Post.mat |  2 +-
 .../1802_Depth_Pre_Post/SG Unlit/Pre.mat      |  2 +-
 .../1802_Depth_Pre_Post/SG Unlit/Ref.mat      |  2 +-
 .../1900_AlphaTestSG_Viewer.mat               |  2 +-
 .../1900_AlphaTest_SG/Background.mat          |  2 +-
 .../1900_AlphaTest_SG/Foreground.mat          |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_EyeSG.mat    |  2 +-
 ...raphs_AlphaTest_HDRP_EyeSG_transparent.mat |  2 +-
 ..._AlphaTest_HDRP_EyeSG_transparent_post.mat |  2 +-
 ...s_AlphaTest_HDRP_EyeSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_FabricSG.mat |  2 +-
 ...hs_AlphaTest_HDRP_FabricSG_transparent.mat |  2 +-
 ...phaTest_HDRP_FabricSG_transparent_post.mat |  2 +-
 ...lphaTest_HDRP_FabricSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_HairSG.mat   |  2 +-
 ...aphs_AlphaTest_HDRP_HairSG_transparent.mat |  2 +-
 ...AlphaTest_HDRP_HairSG_transparent_post.mat |  2 +-
 ..._AlphaTest_HDRP_HairSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_LitSG.mat    | 15 +++++++++-
 ...raphs_AlphaTest_HDRP_LitSG_transparent.mat | 19 +++++++++++--
 ..._AlphaTest_HDRP_LitSG_transparent_post.mat |  7 +++--
 ...s_AlphaTest_HDRP_LitSG_transparent_pre.mat | 19 +++++++++++--
 ...hader Graphs_AlphaTest_HDRP_StackLitSG.mat |  2 +-
 ..._AlphaTest_HDRP_StackLitSG_transparent.mat |  2 +-
 ...aTest_HDRP_StackLitSG_transparent_post.mat |  2 +-
 ...haTest_HDRP_StackLitSG_transparent_pre.mat |  2 +-
 .../Shader Graphs_AlphaTest_HDRP_UnlitSG.mat  |  2 +-
 ...phs_AlphaTest_HDRP_UnlitSG_transparent.mat |  2 +-
 ...lphaTest_HDRP_UnlitSG_transparent_post.mat |  2 +-
 ...AlphaTest_HDRP_UnlitSG_transparent_pre.mat |  2 +-
 .../1910_DepthOffset/Eye_DepthOffset_SG.mat   |  2 +-
 .../Fabric_DepthOffset_SG.mat                 |  2 +-
 .../1910_DepthOffset/Hair_DepthOffset_SG.mat  |  2 +-
 .../1910_DepthOffset/Lit_DepthOffset.mat      | 16 ++++++++++-
 .../Lit_DepthOffset_POM_SG.mat                | 15 +++++++++-
 .../1910_DepthOffset/Lit_DepthOffset_SG.mat   | 15 +++++++++-
 .../StackLit_DepthOffset_SG.mat               |  2 +-
 .../1910_DepthOffset/Unlit_DepthOffset.mat    |  2 +-
 .../1910_DepthOffset/Unlit_DepthOffset_SG.mat |  2 +-
 .../2003_Light_Parameters/Reflective.mat      | 16 ++++++++++-
 .../Materials/New Render Texture.mat          |  2 +-
 .../2x_Lighting/2004_AnimatedCookie/NYAN.mat  |  2 +-
 .../2009_MultipleSkies/ShowCapture.mat        |  2 +-
 .../2010_IES_Cookies/Materials/Walls4.mat     | 16 ++++++++++-
 .../Layered_TextureMask_RedGreenBlue.mat      | 22 ++++++++++++++-
 ...d_TextureMask_RedGreenBlue_Transparent.mat | 22 ++++++++++++++-
 .../Layered_TextureMask_RedMultiplier.mat     | 22 ++++++++++++++-
 .../Layered_TextureMask_RedTexture.mat        | 22 ++++++++++++++-
 .../Layered_VertexColorMask_RedGreenBlue.mat  | 22 ++++++++++++++-
 .../Layered_VertexColorMask_RedMultiplier.mat | 22 ++++++++++++++-
 .../Layered_VertexColorMask_RedTexture.mat    | 22 ++++++++++++++-
 .../2101_GI_Metapass/Lit_Checker_Planar.mat   | 16 ++++++++++-
 .../Lit_Checker_Triplanar.mat                 | 16 ++++++++++-
 .../Lit_Green_CheckerAlphaCutout.mat          | 16 ++++++++++-
 .../Lit_Green_Transparent.mat                 | 16 ++++++++++-
 .../2101_GI_Metapass/Lit_Mirror_Metallic.mat  | 16 ++++++++++-
 .../2101_GI_Metapass/Lit_Mirror_Specular.mat  | 16 ++++++++++-
 .../2101_GI_Metapass/Lit_RedMultiplier.mat    | 16 ++++++++++-
 .../2101_GI_Metapass/Lit_RedTexture.mat       | 16 ++++++++++-
 .../2101_GI_Metapass/Lit_White.mat            | 16 ++++++++++-
 .../2x_Lighting/2102_GI_Emission/Floor.mat    | 16 ++++++++++-
 .../LayeredLit_BakedEmission.mat              | 22 ++++++++++++++-
 .../LayeredLit_RealtimeEmission.mat           | 22 ++++++++++++++-
 .../2102_GI_Emission/Lit_BakedEmission.mat    | 16 ++++++++++-
 .../2102_GI_Emission/Lit_RealtimeEmission.mat | 16 ++++++++++-
 .../2102_GI_Emission/Lit_White.mat            | 16 ++++++++++-
 .../2102_GI_Emission/Unlit_BakedEmission.mat  |  2 +-
 .../Unlit_RealtimeEmission.mat                |  2 +-
 .../2103_GI_BakeMixed/Emissive_Cyan.mat       | 16 ++++++++++-
 .../2103_GI_BakeMixed/Emissive_Orange.mat     | 16 ++++++++++-
 .../Ground static material.mat                | 16 ++++++++++-
 .../Sphere instance material.mat              | 16 ++++++++++-
 .../2x_Lighting/2106_GI_EmissionSG/Dark.mat   | 16 ++++++++++-
 .../2106_GI_EmissionSG/Layered.mat            | 16 ++++++++++-
 .../2x_Lighting/2106_GI_EmissionSG/Lit.mat    | 16 ++++++++++-
 .../Shader Graphs_EmissiveFabric.mat          |  2 +-
 .../Shader Graphs_EmissiveLit.mat             | 19 +++++++++++--
 .../Shader Graphs_EmissivePBR.mat             | 17 +++++++++--
 .../Shader Graphs_EmissiveStackLit.mat        |  2 +-
 .../Shader Graphs_EmissiveUnlit.mat           |  2 +-
 .../2204_ReflectionProbes_Lights/Lit_UV.mat   | 16 ++++++++++-
 .../2205_LightLoopCullWOblique/CUBE_T.mat     | 16 ++++++++++-
 .../2205_LightLoopCullWOblique/Cube.mat       | 16 ++++++++++-
 .../Dark_Metallic.mat                         | 16 ++++++++++-
 .../Dark_MetallicAndSmooth.mat                | 16 ++++++++++-
 .../Dark_Smooth.mat                           | 16 ++++++++++-
 .../2205_LightLoopCullWOblique/Floor.mat      | 16 ++++++++++-
 .../2205_LightLoopCullWOblique/Wall.mat       | 16 ++++++++++-
 .../Material/DoubleSidedFlipMode.mat          | 16 ++++++++++-
 .../Material/DoubleSidedMirrorMode.mat        | 16 ++++++++++-
 .../Material/DoubleSidedNoneMode.mat          | 16 ++++++++++-
 .../Material/Mirror.mat                       | 16 ++++++++++-
 .../2206_ReflectionCulling/Material/White.mat |  2 +-
 .../CubeIn.mat                                | 16 ++++++++++-
 .../CubeOut.mat                               | 16 ++++++++++-
 .../PlanarIn.mat                              | 16 ++++++++++-
 .../PlanarOut.mat                             | 16 ++++++++++-
 .../2211_Probes_Specular/MetalBlue.mat        | 16 ++++++++++-
 .../2211_Probes_Specular/MetalGreen.mat       | 16 ++++++++++-
 .../2211_Probes_Specular/MetalRed.mat         | 16 ++++++++++-
 .../M_MetallicRough.mat                       |  4 ++-
 .../2301_Shadow_Mask/TestCircle.mat           |  2 +-
 .../2302_Shadow_Contact/Transmission.mat      | 16 ++++++++++-
 .../Unlit.mat                                 |  2 +-
 .../ShadowTestMaterial.mat                    | 16 ++++++++++-
 .../2308_Microshadows/MicroShadowMaterial.mat | 16 ++++++++++-
 .../2316_ShadowTint/M_DiffuseMaterial.mat     | 16 ++++++++++-
 .../M_SLSmoothness_0.mat                      |  2 +-
 .../M_SLSmoothness_1.mat                      |  2 +-
 .../M_SLSmoothness_2.mat                      |  2 +-
 .../M_Smoothness_0.mat                        | 16 ++++++++++-
 .../M_Smoothness_1.mat                        | 16 ++++++++++-
 .../M_Smoothness_2.mat                        | 16 ++++++++++-
 .../M_Smoothness_3.mat                        | 16 ++++++++++-
 .../M_Smoothness_4.mat                        | 16 ++++++++++-
 .../2505_LightLayers_Viewer.mat               |  2 +-
 .../Default_GPUInstancingDisabled.mat         | 16 ++++++++++-
 .../Default_GPUInstancingEnabled.mat          | 16 ++++++++++-
 .../CastShadowTransparent.mat                 | 16 ++++++++++-
 .../Scenes/2x_Lighting/2551_SSR/M_Mirror.mat  |  2 +-
 .../2x_Lighting/2551_SSR/M_Rough0.5_SG.mat    | 14 +++++++++-
 .../2551_SSR/M_Rough0.5_SG_NoSSR.mat          | 14 +++++++++-
 .../2x_Lighting/2551_SSR/M_Rough0.8_SG.mat    | 14 +++++++++-
 .../2551_SSR/M_Rough0.8_SG_NoSSR.mat          | 14 +++++++++-
 .../Scenes/2x_Lighting/2551_SSR/M_Rough0.mat  | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough0CC.mat       | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough0CC_NoSSR.mat | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough0_NoSSR.mat   | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough1CC.mat       | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough1CC_NoSSR.mat | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough1_SG.mat      | 14 +++++++++-
 .../2551_SSR/M_Rough1_SG_NoSSR.mat            | 14 +++++++++-
 .../Scenes/2x_Lighting/2551_SSR/M_Rough2.mat  | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough2CC.mat       | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough2CC_NoSSR.mat | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough_0.5.mat      | 16 ++++++++++-
 .../2551_SSR/M_Rough_0.5_NoSSR.mat            | 16 ++++++++++-
 .../2x_Lighting/2551_SSR/M_Rough_0.8.mat      | 16 ++++++++++-
 .../2551_SSR/M_Rough_0.8_NoSSR.mat            | 16 ++++++++++-
 .../LitMaterials/M_OpaqueMirrorNoSSR.mat      | 16 ++++++++++-
 .../LitMaterials/M_OpaqueMirrorSSR.mat        | 16 ++++++++++-
 .../LitMaterials/M_SGOpaqueMirrorNoSSR.mat    | 14 +++++++++-
 .../LitMaterials/M_SGOpaqueMirrorSSR.mat      | 14 +++++++++-
 .../M_SGTransparentMirrorNoSSR.mat            | 16 +++++++++--
 .../LitMaterials/M_SGTransparentMirrorSSR.mat | 16 +++++++++--
 .../LitMaterials/M_TransparentMirrorNoSSR.mat | 16 ++++++++++-
 .../LitMaterials/M_TransparentMirrorSSR.mat   | 16 ++++++++++-
 .../2701_TransparentSSR/M_DiffuseBlue.mat     | 16 ++++++++++-
 .../2701_TransparentSSR/M_DiffuseGray.mat     | 16 ++++++++++-
 .../2701_TransparentSSR/M_DiffuseGreen.mat    | 16 ++++++++++-
 .../2701_TransparentSSR/M_DiffuseOrange.mat   | 16 ++++++++++-
 .../2701_TransparentSSR/M_DiffuseRed.mat      | 16 ++++++++++-
 .../3x_DebugView/3001_DebugView/SG_Lit.mat    | 19 +++++++++++--
 .../LightingModeUnlit_Diffuse.mat             |  2 +-
 .../LightingModeUnlit_DirectDiffuse.mat       |  2 +-
 .../LightingModeUnlit_DirectSpecular.mat      |  2 +-
 .../LightingModeUnlit_Emissive.mat            |  2 +-
 .../LightingModeUnlit_IndirectDiffuse.mat     |  2 +-
 .../LightingModeUnlit_Input.mat               |  2 +-
 .../LightingModeUnlit_Reflection.mat          |  2 +-
 .../LightingModeUnlit_Refraction.mat          |  2 +-
 .../LightingModeUnlit_Specular.mat            |  2 +-
 .../3003_LightingMode/Material/Chrome.mat     | 16 ++++++++++-
 .../3003_LightingMode/Material/Emissive 1.mat | 16 ++++++++++-
 .../3003_LightingMode/Material/Emissive.mat   | 16 ++++++++++-
 .../3003_LightingMode/Material/Fabric.mat     |  2 +-
 .../3003_LightingMode/Material/Ground.mat     | 16 ++++++++++-
 .../3003_LightingMode/Material/Lambert 1.mat  | 16 ++++++++++-
 .../3003_LightingMode/Material/Lambert.mat    | 16 ++++++++++-
 .../3003_LightingMode/Material/LitSG.mat      | 14 +++++++++-
 .../3003_LightingMode/Material/Refraction.mat | 16 ++++++++++-
 .../3003_LightingMode/Material/SSS.mat        | 16 ++++++++++-
 .../Material/transparent Add.mat              | 16 ++++++++++-
 .../Material/transparent.mat                  | 16 ++++++++++-
 .../4001_Exposure/DecalEmission.mat           |  5 ++--
 .../4001_Exposure/DecalEmissionGraph.mat      |  2 +-
 .../4001_Exposure/DecalExposureNodeGraph.mat  |  2 +-
 .../4001_Exposure/DecalReceiver.mat           | 16 ++++++++++-
 .../4001_Exposure/FabricEmissionGraph.mat     |  2 +-
 .../4001_Exposure/LayeredLitEmission.mat      | 22 ++++++++++++++-
 .../LayeredLitEmissionWeight.mat              | 22 ++++++++++++++-
 .../4001_Exposure/LitEmission.mat             | 16 ++++++++++-
 .../LitEmissionExposureNode_CurrentGraph.mat  | 14 +++++++++-
 ...issionExposureNode_InverseCurrentGraph.mat | 14 +++++++++-
 ...ssionExposureNode_InversePreviousGraph.mat | 14 +++++++++-
 .../LitEmissionExposureNode_PreviousGraph.mat | 14 +++++++++-
 .../4001_Exposure/LitEmissionGraph.mat        | 14 +++++++++-
 .../4001_Exposure/LitEmissionLess.mat         | 16 ++++++++++-
 .../4001_Exposure/LitEmissionWeight.mat       | 16 ++++++++++-
 .../4001_Exposure/PBREmissionGraph.mat        | 14 +++++++++-
 .../4001_Exposure/StackLitEmissionGraph.mat   |  2 +-
 .../4001_Exposure/UnLitEmission.mat           |  2 +-
 .../4001_Exposure/UnLitEmissionWeight.mat     |  2 +-
 .../4011_MotionBlur/M_Blue.mat                | 16 ++++++++++-
 .../4011_MotionBlur/M_Green.mat               | 16 ++++++++++-
 .../4011_MotionBlur/M_Red.mat                 | 16 ++++++++++-
 .../HDRP_Lit_TransparentWithMotionVector.mat  | 16 ++++++++++-
 ...phs_SG_Eye_TransparentWithMotionVector.mat |  2 +-
 ..._SG_Fabric_TransparentWithMotionVector.mat |  2 +-
 ...hs_SG_Hair_TransparentWithMotionVector.mat |  2 +-
 ...phs_SG_Lit_TransparentWithMotionVector.mat | 19 +++++++++++--
 ...G_StackLit_TransparentWithMotionVector.mat |  2 +-
 ...s_SG_Unlit_TransparentWithMotionVector.mat |  2 +-
 .../4014_PrecomputedVelocityAlembic/AxF.mat   |  2 +-
 .../4014_PrecomputedVelocityAlembic/Lit.mat   | 16 ++++++++++-
 .../LitTessellation.mat                       | 16 ++++++++++-
 .../Shader Graphs_EyeSG.mat                   |  2 +-
 .../Shader Graphs_FabricSG.mat                |  2 +-
 .../Shader Graphs_HairSG.mat                  |  2 +-
 .../Shader Graphs_LitSG.mat                   | 15 +++++++++-
 .../Shader Graphs_StackLitSG.mat              |  2 +-
 .../Shader Graphs_UnlitSG.mat                 |  2 +-
 .../4014_PrecomputedVelocityAlembic/Unlit.mat |  2 +-
 .../UnlitBuiltin.mat                          |  2 +-
 .../4022_PaniniProjection/TilingGrid.mat      |  2 +-
 .../4023_VignetteClassic/TilingGrid.mat       |  2 +-
 .../4052_TAA/DisplayRTT_8bit.mat              |  2 +-
 .../4053_TAA-FP16Alpha/DisplayRTT.mat         |  2 +-
 .../4060_CustomPostProcess/Transparent.mat    |  2 +-
 .../4070_Gradient.mat                         | 16 ++++++++++-
 .../4070_Viewer.mat                           |  2 +-
 .../4071_Gradient.mat                         | 16 ++++++++++-
 .../4071_Viewer.mat                           |  2 +-
 .../4080_DepthOfField/SphereMaterial.mat      | 16 ++++++++++-
 .../DisplayRTTForDoF.mat                      |  2 +-
 .../5001_Fog_FogFallback/MultiCamDisplay.mat  |  2 +-
 .../5002_Fog_DensityVolumes/Floor.mat         | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog1.mat       | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog2.mat       | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog3.mat       | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog4.mat       | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog5.mat       | 16 ++++++++++-
 .../5007_ExponentialFog/5007_NoFog6.mat       | 16 ++++++++++-
 .../8101_Opaque/BI_AlphaCutoff.mat            | 16 ++++++++++-
 .../8101_Opaque/BI_AmbientOcclusion.mat       | 16 ++++++++++-
 .../8101_Opaque/BI_AnisoTangent.mat           | 16 ++++++++++-
 .../8101_Opaque/BI_DS_Enabled.mat             | 16 ++++++++++-
 .../8101_Opaque/BI_DS_Flipped.mat             | 16 ++++++++++-
 .../8101_Opaque/BI_DS_MirroredSpec.mat        | 16 ++++++++++-
 .../8x_ShaderGraph/8101_Opaque/BI_DS_None.mat | 16 ++++++++++-
 .../8x_ShaderGraph/8101_Opaque/BI_GSAA.mat    | 16 ++++++++++-
 .../8101_Opaque/BI_IrideBentNormal.mat        | 16 ++++++++++-
 .../8101_Opaque/BI_IrideMask.mat              | 16 ++++++++++-
 .../BI_IrideSpecOcclusionBentNormal.mat       | 16 ++++++++++-
 .../8101_Opaque/BI_ShinyStone.mat             | 16 ++++++++++-
 .../8101_Opaque/BI_Standard.mat               | 16 ++++++++++-
 .../8101_Opaque/BI_SubSurface.mat             | 16 ++++++++++-
 .../8101_Opaque/BI_TransNormal.mat            | 16 ++++++++++-
 .../8101_Opaque/FrontCulling.mat              | 14 +++++++++-
 .../8101_Opaque/OP_BentNormalFrontCull.mat    | 17 +++++++++--
 .../8x_ShaderGraph/8101_Opaque/SG_AO.mat      | 15 +++++++++-
 .../8101_Opaque/SG_AlphaCutoff.mat            | 15 +++++++++-
 .../8101_Opaque/SG_AnisoTangent.mat           | 15 +++++++++-
 .../8101_Opaque/SG_DS_Enabled.mat             | 14 +++++++++-
 .../8101_Opaque/SG_DS_MirroredSpec.mat        | 14 +++++++++-
 .../8x_ShaderGraph/8101_Opaque/SG_DS_None.mat | 14 +++++++++-
 .../8x_ShaderGraph/8101_Opaque/SG_GSAA.mat    | 15 +++++++++-
 .../8101_Opaque/SG_IrideBentNormal.mat        | 15 +++++++++-
 .../SG_IrideBentNormalSpecularOcclusion.mat   | 15 +++++++++-
 .../8101_Opaque/SG_IrideMask.mat              | 15 +++++++++-
 .../8101_Opaque/SG_OpaqueFrontCullModeSSS.mat | 17 +++++++++--
 .../8101_Opaque/SG_ShinyStone.mat             | 14 +++++++++-
 .../8101_Opaque/SG_Standard.mat               | 14 +++++++++-
 .../8101_Opaque/SG_SubSurface.mat             | 14 +++++++++-
 .../8101_Opaque/SG_TransNormal.mat            | 15 +++++++++-
 .../8x_ShaderGraph/8102_Transparent/BG.mat    | 16 ++++++++++-
 .../8102_Transparent/BI_Additive.mat          | 16 ++++++++++-
 .../8102_Transparent/BI_Alpha.mat             | 16 ++++++++++-
 .../8102_Transparent/BI_BackThenFront.mat     | 16 ++++++++++-
 .../BI_BlendPerserveSpecularOff.mat           | 16 ++++++++++-
 .../BI_BlendPerserveSpecularOn.mat            | 16 ++++++++++-
 .../BI_DistortionMultiply.mat                 | 16 ++++++++++-
 .../BI_DistortionSimpleAdd.mat                | 16 ++++++++++-
 .../BI_DistortionVectorMap.mat                | 16 ++++++++++-
 .../BI_DistortionVectorMapDepthTest.mat       | 16 ++++++++++-
 .../BI_DistortionVectorMapNoDepthTest.mat     | 16 ++++++++++-
 .../8102_Transparent/BI_FogOn0.mat            | 16 ++++++++++-
 .../8102_Transparent/BI_PostPass.mat          | 16 ++++++++++-
 .../8102_Transparent/BI_PrePass.mat           | 16 ++++++++++-
 .../8102_Transparent/BI_Premultiply.mat       | 16 ++++++++++-
 .../BI_RefractionPlaneHiZNormal.mat           | 16 ++++++++++-
 .../BI_RefractionPlaneProxy.mat               | 16 ++++++++++-
 .../BI_RefractionSphereHiZ.mat                | 16 ++++++++++-
 .../BI_RefractionSphereProxy.mat              | 16 ++++++++++-
 .../8102_Transparent/SG_Additive.mat          | 16 +++++++++--
 .../8102_Transparent/SG_Alpha.mat             | 16 +++++++++--
 .../8102_Transparent/SG_BackThenFront.mat     | 22 +++++++++++----
 .../SG_BlendPerserveSpecularOff.mat           | 17 +++++++++--
 .../SG_BlendPerserveSpecularOn.mat            | 19 +++++++++++--
 .../SG_DistortionMultiply.mat                 | 19 +++++++++++--
 .../SG_DistortionSimpleAdd.mat                | 19 +++++++++++--
 .../SG_DistortionVectorMap.mat                | 19 +++++++++++--
 .../SG_DistortionVectorMapDepthTest.mat       | 17 +++++++++--
 .../SG_DistortionVectorMapNoDepthTest.mat     | 19 +++++++++++--
 .../8102_Transparent/SG_FogOn.mat             | 19 +++++++++++--
 .../8102_Transparent/SG_PostRefraction.mat    | 19 +++++++++++--
 .../8102_Transparent/SG_PreRefraction.mat     | 19 +++++++++++--
 .../8102_Transparent/SG_Premultiply.mat       | 18 ++++++++++--
 .../SG_RefractionPlaneHiZNormal.mat           | 17 +++++++++--
 .../SG_RefractionPlaneProxy.mat               | 17 +++++++++--
 .../SG_RefractionSphereHiZ.mat                | 17 +++++++++--
 .../SG_RefractionSphereProxy.mat              | 17 +++++++++--
 .../8103_PrePostPass/Materials/PrePassRT.mat  | 16 ++++++++++-
 .../8103_PrePostPass/PostPass.mat             | 16 ++++++++++-
 .../8103_PrePostPass/PostPassColor.mat        | 16 +++++++++--
 .../8103_PrePostPass/PostPassRed.mat          | 16 +++++++++--
 .../8103_PrePostPass/PrePass.mat              | 16 ++++++++++-
 .../8103_PrePostPass/PrePass2.mat             | 16 ++++++++++-
 .../8103_PrePostPass/PrePassGreen.mat         | 16 +++++++++--
 .../8103_PrePostPass/PrePassRT.mat            |  2 +-
 .../8103_PrePostPass/SG_PostPass.mat          | 18 ++++++++++--
 .../8103_PrePostPass/SG_PrePass 1.mat         | 22 +++++++++++----
 .../8103_PrePostPass/SG_PrePass.mat           | 18 ++++++++++--
 .../8103_PrePostPass/SG_PrePassDisabled.mat   | 18 ++++++++++--
 .../8104_Unlit/BI_UnlitAlphaClip.mat          |  2 +-
 .../BI_UnlitAlphaClipDoubleSided.mat          |  2 +-
 ...I_UnlitAlphaClipDoubleSidedTransparent.mat |  2 +-
 .../8104_Unlit/BI_UnlitBlendAdditive.mat      |  2 +-
 .../8104_Unlit/BI_UnlitBlendAlpha.mat         |  2 +-
 .../8104_Unlit/BI_UnlitBlendPremult.mat       |  2 +-
 .../8104_Unlit/BI_UnlitYellow.mat             |  2 +-
 .../8104_Unlit/BackgroundHoleQuad.mat         | 16 ++++++++++-
 .../8104_Unlit/SG_UnlitAdditive.mat           |  2 +-
 .../8104_Unlit/SG_UnlitAlpha.mat              |  2 +-
 ...SG_UnlitAlphablendAlphaclipDoublesided.mat |  2 +-
 .../8104_Unlit/SG_UnlitAlphaclip.mat          |  2 +-
 .../SG_UnlitAlphaclipDoublesided.mat          |  2 +-
 .../8104_Unlit/SG_UnlitPremult.mat            |  2 +-
 .../8104_Unlit/SG_UnlitYellow.mat             |  2 +-
 .../BlendStateRenderTexture.mat               |  2 +-
 .../Shader Graphs_FabricGraphCullBack.mat     |  2 +-
 ...Graphs_FabricGraphCullBackZTestGreater.mat |  2 +-
 .../Shader Graphs_FabricGraphCullFront.mat    |  2 +-
 ...hader Graphs_FabricGraphCullFrontEqual.mat |  2 +-
 .../Shader Graphs_FabricGraphDoubleSided.mat  |  2 +-
 .../Shader Graphs_FabricGraphZTestAlways.mat  |  2 +-
 ...Shader Graphs_FabricGraphZTestDisabled.mat |  2 +-
 ...hader Graphs_FabricGraphZTestLessEqual.mat |  2 +-
 ...phs_FabricGraphZTestNeverBackThenFront.mat |  2 +-
 ...r Graphs_FabricGraphZWriteGreaterEqual.mat |  2 +-
 ...ader Graphs_FabricGraphZWriteLessEqual.mat |  2 +-
 .../Shader Graphs_FabricGraphZWriteOff.mat    |  2 +-
 .../Shader Graphs_FabricGraphZWriteOn.mat     |  2 +-
 ...hader Graphs_FabricGraphZWriteOnAlpha1.mat |  2 +-
 ... Graphs_FabricGraphZWriteOnTransparent.mat |  2 +-
 .../Shader Graphs_UnLitGraphCullBack.mat      |  2 +-
 ... Graphs_UnLitGraphCullBackZTestGreater.mat |  2 +-
 .../Shader Graphs_UnLitGraphCullFront.mat     |  2 +-
 ...Shader Graphs_UnLitGraphCullFrontEqual.mat |  2 +-
 .../Shader Graphs_UnLitGraphDoubleSided.mat   |  2 +-
 .../Shader Graphs_UnLitGraphZTestAlways.mat   |  2 +-
 .../Shader Graphs_UnLitGraphZTestDisabled.mat |  2 +-
 ...Shader Graphs_UnLitGraphZTestLessEqual.mat |  2 +-
 ...aphs_UnLitGraphZTestNeverBackThenFront.mat |  2 +-
 ...er Graphs_UnLitGraphZWriteGreaterEqual.mat |  2 +-
 ...hader Graphs_UnLitGraphZWriteLessEqual.mat |  2 +-
 .../Shader Graphs_UnLitGraphZWriteOff.mat     |  2 +-
 .../Shader Graphs_UnLitGraphZWriteOn.mat      |  2 +-
 ...Shader Graphs_UnLitGraphZWriteOnAlpha1.mat |  2 +-
 ...r Graphs_UnLitGraphZWriteOnTransparent.mat |  2 +-
 .../Shader Graphs_HairGraphCullBack.mat       |  2 +-
 ...r Graphs_HairGraphCullBackZTestGreater.mat |  2 +-
 .../Shader Graphs_HairGraphCullFront.mat      |  2 +-
 .../Shader Graphs_HairGraphCullFrontEqual.mat |  2 +-
 .../Shader Graphs_HairGraphDoubleSided.mat    |  2 +-
 .../Shader Graphs_HairGraphZTestAlways.mat    |  2 +-
 .../Shader Graphs_HairGraphZTestDisabled.mat  |  2 +-
 .../Shader Graphs_HairGraphZTestLessEqual.mat |  2 +-
 ...raphs_HairGraphZTestNeverBackThenFront.mat |  2 +-
 ...der Graphs_HairGraphZWriteGreaterEqual.mat |  2 +-
 ...Shader Graphs_HairGraphZWriteLessEqual.mat |  2 +-
 .../Shader Graphs_HairGraphZWriteOff.mat      |  2 +-
 .../Shader Graphs_HairGraphZWriteOn.mat       |  2 +-
 .../Shader Graphs_HairGraphZWriteOnAlpha1.mat |  2 +-
 ...er Graphs_HairGraphZWriteOnTransparent.mat |  2 +-
 .../8105_BlendStates/Lit/LitCullBack.mat      | 16 ++++++++++-
 .../Lit/LitCullBackZTestGreater.mat           | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitCullFront.mat     | 16 ++++++++++-
 .../Lit/LitCullFrontEqual.mat                 | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitDoubleSided.mat   | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitZTestAlways.mat   | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitZTestDisabled.mat | 16 ++++++++++-
 .../Lit/LitZTestLessEqual.mat                 | 16 ++++++++++-
 .../Lit/LitZTestNeverBackThenFront.mat        | 16 ++++++++++-
 .../Lit/LitZWriteGreaterEqual.mat             | 16 ++++++++++-
 .../Lit/LitZWriteLessEqual.mat                | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitZWriteOff.mat     | 16 ++++++++++-
 .../8105_BlendStates/Lit/LitZWriteOn.mat      | 16 ++++++++++-
 .../Lit/LitZWriteOnAlpha1.mat                 | 16 ++++++++++-
 .../Lit/LitZWriteOnTransparent.mat            | 16 ++++++++++-
 .../Shader Graphs_LitGraphCullBack.mat        | 19 +++++++++++--
 ...er Graphs_LitGraphCullBackZTestGreater.mat | 19 +++++++++++--
 .../Shader Graphs_LitGraphCullFront.mat       | 19 +++++++++++--
 .../Shader Graphs_LitGraphCullFrontEqual.mat  | 19 +++++++++++--
 .../Shader Graphs_LitGraphDoubleSided.mat     | 19 +++++++++++--
 .../Shader Graphs_LitGraphZTestAlways.mat     | 19 +++++++++++--
 .../Shader Graphs_LitGraphZTestDisabled.mat   | 19 +++++++++++--
 .../Shader Graphs_LitGraphZTestLessEqual.mat  | 19 +++++++++++--
 ...Graphs_LitGraphZTestNeverBackThenFront.mat | 19 +++++++++++--
 ...ader Graphs_LitGraphZWriteGreaterEqual.mat | 19 +++++++++++--
 .../Shader Graphs_LitGraphZWriteLessEqual.mat | 19 +++++++++++--
 .../Shader Graphs_LitGraphZWriteOff.mat       | 19 +++++++++++--
 .../Shader Graphs_LitGraphZWriteOn.mat        | 19 +++++++++++--
 .../Shader Graphs_LitGraphZWriteOnAlpha1.mat  | 19 +++++++++++--
 ...der Graphs_LitGraphZWriteOnTransparent.mat | 19 +++++++++++--
 .../Shader Graphs_StackLitGraphCullBack.mat   |  2 +-
 ...aphs_StackLitGraphCullBackZTestGreater.mat |  2 +-
 .../Shader Graphs_StackLitGraphCullFront.mat  |  2 +-
 ...der Graphs_StackLitGraphCullFrontEqual.mat |  2 +-
 ...Shader Graphs_StackLitGraphDoubleSided.mat |  2 +-
 ...Shader Graphs_StackLitGraphZTestAlways.mat |  2 +-
 ...ader Graphs_StackLitGraphZTestDisabled.mat |  2 +-
 ...der Graphs_StackLitGraphZTestLessEqual.mat |  2 +-
 ...s_StackLitGraphZTestNeverBackThenFront.mat |  2 +-
 ...Graphs_StackLitGraphZWriteGreaterEqual.mat |  2 +-
 ...er Graphs_StackLitGraphZWriteLessEqual.mat |  2 +-
 .../Shader Graphs_StackLitGraphZWriteOff.mat  |  2 +-
 .../Shader Graphs_StackLitGraphZWriteOn.mat   |  2 +-
 ...der Graphs_StackLitGraphZWriteOnAlpha1.mat |  2 +-
 ...raphs_StackLitGraphZWriteOnTransparent.mat |  2 +-
 .../8105_BlendStates/Unlit/UnlitCullBack.mat  |  2 +-
 .../Unlit/UnlitCullBackZTestGreater.mat       |  2 +-
 .../8105_BlendStates/Unlit/UnlitCullFront.mat |  2 +-
 .../Unlit/UnlitCullFrontEqual.mat             |  2 +-
 .../Unlit/UnlitDoubleSided.mat                |  2 +-
 .../Unlit/UnlitZTestAlways.mat                |  2 +-
 .../Unlit/UnlitZTestDisabled.mat              |  2 +-
 .../Unlit/UnlitZTestLessEqual.mat             |  2 +-
 .../Unlit/UnlitZTestNeverBackThenFront.mat    |  2 +-
 .../Unlit/UnlitZWriteGreaterEqual.mat         |  2 +-
 .../Unlit/UnlitZWriteLessEqual.mat            |  2 +-
 .../8105_BlendStates/Unlit/UnlitZWriteOff.mat |  2 +-
 .../8105_BlendStates/Unlit/UnlitZWriteOn.mat  |  2 +-
 .../Unlit/UnlitZWriteOnAlpha1.mat             |  2 +-
 .../Unlit/UnlitZWriteOnTransparent.mat        |  2 +-
 .../8106_UnlitShadowMatte/00.mat              |  2 +-
 .../8106_UnlitShadowMatte/01.mat              |  2 +-
 .../8106_UnlitShadowMatte/02.mat              |  2 +-
 .../8106_UnlitShadowMatte/03.mat              |  2 +-
 .../8106_UnlitShadowMatte/10.mat              |  2 +-
 .../8106_UnlitShadowMatte/11.mat              |  2 +-
 .../8106_UnlitShadowMatte/12.mat              |  2 +-
 .../8106_UnlitShadowMatte/13.mat              |  2 +-
 .../8106_UnlitShadowMatte/20.mat              |  2 +-
 .../8106_UnlitShadowMatte/21.mat              |  2 +-
 .../8106_UnlitShadowMatte/22.mat              |  2 +-
 .../8106_UnlitShadowMatte/23.mat              |  2 +-
 .../8106_UnlitShadowMatte/Cube.mat            | 16 ++++++++++-
 .../M_LitCubeMat.mat                          | 16 ++++++++++-
 .../M_NoShadowMatte.mat                       |  2 +-
 .../M_ShadowMatte.mat                         |  2 +-
 .../8201_VertexAnimation/HD.mat               | 19 +++++++++++--
 .../8201_VertexAnimation/PBRboi.mat           | 17 +++++++++--
 .../SGVertexRotationHDLit.mat                 | 17 +++++++++--
 .../SGVertexRotationPBR.mat                   | 15 +++++++++-
 .../SGVertexWaveHDLit.mat                     | 19 +++++++++++--
 .../SGVertexWaveUnlit.mat                     |  2 +-
 .../8202_BentNormals/SG_Bent.mat              | 17 +++++++++--
 .../8203_Emission/Lit_BakedEmission.mat       | 16 ++++++++++-
 .../8203_Emission/Lit_RealtimeEmission.mat    | 16 ++++++++++-
 .../SG_EmissionAlbedoNoAffects.mat            | 17 +++++++++--
 .../SG_EmissionAlbedoNoAffectsBaked.mat       | 17 +++++++++--
 .../8203_Emission/SG_EmissionBaked.mat        | 19 +++++++++++--
 .../8203_Emission/SG_EmissionRealT.mat        | 19 +++++++++++--
 .../CustomSpecOcclusion.mat                   | 17 +++++++++--
 .../HDSceneColorMaterialLit.mat               | 16 +++++++++--
 .../HDSceneColorMaterialUnlit.mat             |  2 +-
 .../SceneColorMaterialLit.mat                 | 16 +++++++++--
 .../SceneColorMaterialUnlit.mat               |  2 +-
 .../SceneDepthMaterialLit.mat                 | 16 +++++++++--
 .../SceneDepthMaterialUnlit.mat               |  2 +-
 ...ader Graphs_SG_vertexNormalTangent_Lit.mat | 17 +++++++++--
 .../9001_LOD-Transition_Display.mat           |  2 +-
 .../9002_FrameSettings_LOD/9801_Lit_Blue.mat  | 16 ++++++++++-
 .../9002_FrameSettings_LOD/9801_Lit_Green.mat | 16 ++++++++++-
 .../9002_FrameSettings_LOD/9801_Lit_Red.mat   | 16 ++++++++++-
 .../9002_FrameSettings_LOD/9801_Viewer.mat    |  2 +-
 .../9002_FrameSettings_LOD/checker.mat        | 16 ++++++++++-
 .../9003_CameraRelativeRendering/Floor.mat    | 16 ++++++++++-
 .../pointlighht.mat                           | 16 ++++++++++-
 .../triplanar.mat                             | 16 ++++++++++-
 .../MultiViewport_Material.mat                |  2 +-
 .../TestAfterPostProcess_Unlit.mat            |  2 +-
 .../TestAfterPostProcess_Unlit_Add.mat        |  2 +-
 ...stAfterPostProcess_Unlit_Add_AfterPost.mat |  2 +-
 .../TestAfterPostProcess_Unlit_AfterPost.mat  |  2 +-
 .../TestAfterPostProcess_Unlit_Alpha.mat      |  2 +-
 ...AfterPostProcess_Unlit_Alpha_AfterPost.mat |  2 +-
 .../9006_StencilUsage/Stencil_Lit.mat         | 16 ++++++++++-
 .../9006_StencilUsage/Stencil_Lit_Decals.mat  | 16 ++++++++++-
 .../Stencil_Lit_Decals_SSS.mat                | 16 ++++++++++-
 .../9006_StencilUsage/Stencil_Lit_SSR.mat     | 16 ++++++++++-
 .../Stencil_Lit_SSR_Decals.mat                | 16 ++++++++++-
 .../Stencil_Lit_SSR_Decals_SSS.mat            | 16 ++++++++++-
 .../9006_StencilUsage/Stencil_Lit_SSR_SSS.mat | 16 ++++++++++-
 .../9006_StencilUsage/Stencil_Lit_SSS.mat     | 16 ++++++++++-
 .../9006_StencilUsage/Stencil_Projector.mat   |  5 ++--
 .../Stencil_StackLit_Decal_Mat.mat            |  2 +-
 .../Stencil_StackLit_Decal_SSS_Mat.mat        |  2 +-
 .../Stencil_StackLit_Mat.mat                  |  2 +-
 .../Stencil_StackLit_SSR_Decal_Mat.mat        |  2 +-
 .../Stencil_StackLit_SSR_Decal_SSS_Mat.mat    |  2 +-
 .../Stencil_StackLit_SSR_Mat.mat              |  2 +-
 .../Stencil_StackLit_SSR_SSS_Mat.mat          |  2 +-
 .../Stencil_StackLit_SSS_Mat.mat              |  2 +-
 .../9006_StencilUsage/Stencil_Unlit.mat       |  2 +-
 .../Stencil_Unlit_SG_Mat.mat                  |  2 +-
 .../AlphaCompositingMaterial_Alpha.mat        | 16 ++++++++++-
 .../GenerateComposite.mat                     |  2 +-
 .../UseComposite.mat                          |  2 +-
 .../9x_Other/9301_MotionVectors/M_AxF.mat     |  2 +-
 .../9x_Other/9301_MotionVectors/M_Fabric.mat  |  2 +-
 .../9301_MotionVectors/M_LayeredLit.mat       | 22 ++++++++++++++-
 .../9301_MotionVectors/M_LineMaterial.mat     |  2 +-
 .../9x_Other/9301_MotionVectors/M_Lit.mat     | 16 ++++++++++-
 .../9301_MotionVectors/M_StackLit.mat         |  2 +-
 .../9x_Other/9301_MotionVectors/M_Unlit.mat   |  2 +-
 .../Scenes/9x_Other/9401_MSAA/M_GreenLit.mat  | 16 ++++++++++-
 .../Scenes/9x_Other/9401_MSAA/M_RedLit.mat    | 16 ++++++++++-
 .../9401_MSAA/M_TransparentBlueLit.mat        | 16 ++++++++++-
 .../9401_MSAA/M_TransparentRefractive.mat     | 16 ++++++++++-
 .../9x_Other/9402_AlphaToMask/M_HDRP_AxF.mat  |  2 +-
 .../9402_AlphaToMask/M_HDRP_LayeredLit.mat    | 22 ++++++++++++++-
 .../M_HDRP_LayeredLitTessellation.mat         | 22 ++++++++++++++-
 .../9x_Other/9402_AlphaToMask/M_HDRP_Lit.mat  | 16 ++++++++++-
 .../M_HDRP_LitTessellation.mat                | 16 ++++++++++-
 .../9402_AlphaToMask/M_HDRP_Unlit.mat         |  2 +-
 .../9x_Other/9402_AlphaToMask/M_SG_Eye.mat    |  2 +-
 .../9x_Other/9402_AlphaToMask/M_SG_Fabric.mat |  2 +-
 .../9x_Other/9402_AlphaToMask/M_SG_Hair.mat   |  2 +-
 .../9x_Other/9402_AlphaToMask/M_SG_Lit.mat    | 18 +++++++++++-
 .../9402_AlphaToMask/M_SG_StackLit.mat        |  2 +-
 .../9x_Other/9402_AlphaToMask/M_SG_Unlit.mat  |  2 +-
 .../trasnparnetShadowCasting.mat              | 16 ++++++++++-
 .../9601_LOD-Transition_Display.mat           |  2 +-
 .../HeadInstanced.mat                         | 16 ++++++++++-
 .../9700_CustomPass_FullScreen/Opaque.mat     | 16 ++++++++++-
 .../Transparent.mat                           | 16 ++++++++++-
 .../9700_CustomPass_FullScreen/Unlit.mat      |  2 +-
 .../9701_UnlitRT.mat                          |  2 +-
 .../BackgroundCube.mat                        | 16 ++++++++++-
 .../9702_CustomPass_API/9702_LitUV.mat        | 16 ++++++++++-
 .../9702_UnlitUVChecker.mat                   |  2 +-
 1047 files changed, 7622 insertions(+), 1245 deletions(-)

diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Materials/UnlitCanvasMat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Materials/UnlitCanvasMat.mat
index 7d293eb5509..11f9200ce5d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Materials/UnlitCanvasMat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Common/Materials/UnlitCanvasMat.mat
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/01_Unlit_Simple.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/01_Unlit_Simple.mat
index a5d5612c2aa..942ed271a16 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/01_Unlit_Simple.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/01_Unlit_Simple.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/02_Unlit_Trans_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/02_Unlit_Trans_Alpha.mat
index 558c79955e6..d2f25c06422 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/02_Unlit_Trans_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/02_Unlit_Trans_Alpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/03_Unlit_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/03_Unlit_Trans_Alpha_PreRefractionPass.mat
index 892132c02ac..4b7e7a5a279 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/03_Unlit_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/03_Unlit_Trans_Alpha_PreRefractionPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/04_Unlit_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/04_Unlit_DoubleSide.mat
index 5a2d454bbf9..d83babe8eae 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/04_Unlit_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/04_Unlit_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/05_Unlit_DoubleSide_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/05_Unlit_DoubleSide_Transparent.mat
index 325c112390f..d65fcc9f46b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/05_Unlit_DoubleSide_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/05_Unlit_DoubleSide_Transparent.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
index 0f32f3ad630..ceb21c1f11a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/07_Unlit_Textured.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/07_Unlit_Textured.mat
index b4d8d124322..c0ab7fe91ff 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/07_Unlit_Textured.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/07_Unlit_Textured.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/08_Unlit_Textured_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/08_Unlit_Textured_Transparent.mat
index fbf19791c40..32b14499df9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/08_Unlit_Textured_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/08_Unlit_Textured_Transparent.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
index 3ddcd2abc2c..42e33f5f962 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/10_Unlit_Textured_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/10_Unlit_Textured_DoubleSide.mat
index 99ba5e308dd..58e1ed2098c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/10_Unlit_Textured_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/10_Unlit_Textured_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/11_Unlit_Textured_Transparent_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/11_Unlit_Textured_Transparent_DoubleSide.mat
index 6d526443d3b..ab222c5fa95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/11_Unlit_Textured_Transparent_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/11_Unlit_Textured_Transparent_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
index f1062ff2396..71fd3350746 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/13_Unlit_Textured_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/13_Unlit_Textured_AlphaCutoff.mat
index e258ee0f7f8..1a163022035 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/13_Unlit_Textured_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/13_Unlit_Textured_AlphaCutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/14_Unlit_Textured_Transparent_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/14_Unlit_Textured_Transparent_AlphaCutoff.mat
index a07f3ec576d..3ee55731de9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/14_Unlit_Textured_Transparent_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/14_Unlit_Textured_Transparent_AlphaCutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
index 9c73aec66fe..29c723500b8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/16_Unlit_Textured_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
index b6a6149f7dd..d5bd73c69c7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
index 3e660a049bb..afba22d116e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
index d410a88572d..0e209b00242 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Color/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/01_Unlit_Simple.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/01_Unlit_Simple.mat
index 2f03fc18626..427b44581db 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/01_Unlit_Simple.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/01_Unlit_Simple.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/02_Unlit_Trans_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/02_Unlit_Trans_Alpha.mat
index a993f08f2ee..23d7ee43c68 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/02_Unlit_Trans_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/02_Unlit_Trans_Alpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/03_Unlit_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/03_Unlit_Trans_Alpha_PreRefractionPass.mat
index 50e94b7b13f..781ebd9aa9b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/03_Unlit_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/03_Unlit_Trans_Alpha_PreRefractionPass.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/04_Unlit_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/04_Unlit_DoubleSide.mat
index 5e9ede389e4..fa67e27a670 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/04_Unlit_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/04_Unlit_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/05_Unlit_DoubleSide_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/05_Unlit_DoubleSide_Transparent.mat
index 66f704f9487..d62c7d1abf9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/05_Unlit_DoubleSide_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/05_Unlit_DoubleSide_Transparent.mat
@@ -226,4 +226,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
index bd826aa5c2c..fced0e0fae2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
@@ -226,4 +226,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/07_Unlit_Textured.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/07_Unlit_Textured.mat
index b9de21e73ab..a82ed2fa360 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/07_Unlit_Textured.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/07_Unlit_Textured.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/08_Unlit_Textured_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/08_Unlit_Textured_Transparent.mat
index 324e90594d2..9e0eb115f6b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/08_Unlit_Textured_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/08_Unlit_Textured_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
index 3b79b45584f..31302cc481d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/10_Unlit_Textured_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/10_Unlit_Textured_DoubleSide.mat
index dff9835f9a0..589d5d23337 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/10_Unlit_Textured_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/10_Unlit_Textured_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/11_Unlit_Textured_Transparent_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/11_Unlit_Textured_Transparent_DoubleSide.mat
index 0c302cb5d1c..79968b79142 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/11_Unlit_Textured_Transparent_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/11_Unlit_Textured_Transparent_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
index 2dd7a59a298..3c388b4b88a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/13_Unlit_Textured_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/13_Unlit_Textured_AlphaCutoff.mat
index 0c278258914..7619f063366 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/13_Unlit_Textured_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/13_Unlit_Textured_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/14_Unlit_Textured_Transparent_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/14_Unlit_Textured_Transparent_AlphaCutoff.mat
index 839afcae291..7feb1ede4aa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/14_Unlit_Textured_Transparent_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/14_Unlit_Textured_Transparent_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
index 6a12be3b426..e9987b6dd92 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/16_Unlit_Textured_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
index 16f3fc2985d..6e69a2f3cea 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
index 95522f232c1..8b5cd1b2fec 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
@@ -226,4 +226,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
index bc9d085888a..79308ab5f04 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Emissive_Texture/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
@@ -226,4 +226,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/01_Unlit_Simple.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/01_Unlit_Simple.mat
index d4f43363699..6d8becf2831 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/01_Unlit_Simple.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/01_Unlit_Simple.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/02_Unlit_Trans_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/02_Unlit_Trans_Alpha.mat
index d557c7d2827..aece216a491 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/02_Unlit_Trans_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/02_Unlit_Trans_Alpha.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/03_Unlit_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/03_Unlit_Trans_Alpha_PreRefractionPass.mat
index c310555b738..5c0d2508686 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/03_Unlit_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/03_Unlit_Trans_Alpha_PreRefractionPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/04_Unlit_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/04_Unlit_DoubleSide.mat
index e743e9c78a2..718a004cba0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/04_Unlit_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/04_Unlit_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/05_Unlit_DoubleSide_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/05_Unlit_DoubleSide_Transparent.mat
index 6a4b3df9a4e..a433172c707 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/05_Unlit_DoubleSide_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/05_Unlit_DoubleSide_Transparent.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
index da0d79b7786..814145c14c6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/06_Unlit_DoubleSide_Transparent_PreRefractionPass.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/07_Unlit_Textured.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/07_Unlit_Textured.mat
index e2ea01447a4..78bf676c67f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/07_Unlit_Textured.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/07_Unlit_Textured.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/08_Unlit_Textured_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/08_Unlit_Textured_Transparent.mat
index 573a1d66c10..66572876832 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/08_Unlit_Textured_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/08_Unlit_Textured_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
index 2f9405d1449..a27102673fa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/09_Unlit_Textured_Trans_Alpha_PreRefractionPass.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/10_Unlit_Textured_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/10_Unlit_Textured_DoubleSide.mat
index 8cbab750f4b..05fe4320d83 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/10_Unlit_Textured_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/10_Unlit_Textured_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/11_Unlit_Textured_Transparent_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/11_Unlit_Textured_Transparent_DoubleSide.mat
index 5dc51d20616..8d11ae7e4b5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/11_Unlit_Textured_Transparent_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/11_Unlit_Textured_Transparent_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
index 49bba3d7a26..a2b2c5c7bab 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/12_Unlit_Textured_Trans_Alpha_PreRefractionPass_DoubleSide.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/13_Unlit_Textured_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/13_Unlit_Textured_AlphaCutoff.mat
index d722297c4c3..014f462529d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/13_Unlit_Textured_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/13_Unlit_Textured_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/14_Unlit_Textured_Transparent_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/14_Unlit_Textured_Transparent_AlphaCutoff.mat
index 447a1d5fd4f..c54024cd07d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/14_Unlit_Textured_Transparent_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/14_Unlit_Textured_Transparent_AlphaCutoff.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
index f1f0c35b95f..073203b5c43 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/15_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/16_Unlit_Textured_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
index db7b9269c0e..a0c4c52f2e2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/16_Unlit_Textured_AlphaCutoff_Doubleside.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
index 3049fa40bf2..b659c8b3f6e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/17_Unlit_Textured_Transparent_AlphaCutoff_Doubleside.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
index e945f35093a..c7c85156ddf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit/Non_Emissive/18_Unlit_Textured_Trans_Alpha_PreRefractionPass_AlphaCutoff_Doubleside.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Distortion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Distortion.mat
index c4220165498..230236938e6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Distortion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Distortion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Plane.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Plane.mat
index 167afae6a94..415386c1e9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Plane.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit_Smooth_Distortion/M_Plane.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/01_Unlit_Trans.mat
index d4d697c7e0b..d6bfbb63d8a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/01_Unlit_Trans.mat
@@ -237,4 +237,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
index f0a6a7d65b4..465b244b7f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
@@ -237,4 +237,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/03_Unlit_Textured_Trans.mat
index c03c642fb98..27eb7ad0160 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/03_Unlit_Textured_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
index 753ed561099..21cb9544a53 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
index d56906e9d5a..9d6e1d77da1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 55a1611b74c..45b9f1db07e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -237,4 +237,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/01_Unlit_Trans.mat
index a7632fef162..75cab3a58e9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/01_Unlit_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
index 83972c38502..6a1c5ca89d5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/03_Unlit_Textured_Trans.mat
index a43d801f115..70688affdef 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/03_Unlit_Textured_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
index c4df4084c3c..c6cabd8a39f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
index 490c0e1fd4a..a4346eafc27 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 5a4d94e7502..4fe17d7a4c8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/01_Unlit_Trans.mat
index c79ec449d27..0ef11bf52f1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/01_Unlit_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
index 4b12cc4dad1..e02436a0d91 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/03_Unlit_Textured_Trans.mat
index 783f297a046..7af722b6ab6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/03_Unlit_Textured_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
index 2c4fe2c3ed7..555dc3b1f6e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
index 00c9a6ab531..85b25f291cf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index bce4b7ff59e..33135955a35 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/01_Unlit_Trans.mat
index 5b8a61b3045..ebb48242922 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/01_Unlit_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
index 876486438c0..54d94c259d7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/03_Unlit_Textured_Trans.mat
index 75ff60b7cf6..02ce7c773a4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/03_Unlit_Textured_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
index f2bf7c74ec4..5147f6fbc6f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
index 5b5483ee7c5..dd72be02a6a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 86bf1c0d789..d73f26baff9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1102_Unlit_Distortion/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/01_Unlit_Trans.mat
index 60a90f48203..8bfe0beed0b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/01_Unlit_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
index 2c80c4d1bb2..1903b4ae348 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/02_Unlit_Trans_DoubleSide.mat
@@ -237,4 +237,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/03_Unlit_Textured_Trans.mat
index 5c8f2db1de0..bf556f0de48 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/03_Unlit_Textured_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
index d3f54907297..4e495f0e421 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
index 27eaf147104..da70b406649 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/05_Unlit_Textured_Trans_Cutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 3e392a1546e..d264befac29 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Distortion_Only/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/01_Unlit_Trans.mat
index 15f6e6b3743..0846887f893 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/01_Unlit_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
index d2bd29d213c..fa352854eb1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/02_Unlit_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/03_Unlit_Textured_Trans.mat
index 421cd5bd4b3..23677e4e45b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/03_Unlit_Textured_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
index 04f46d0a3a1..e170d0090b4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
index 81e4e229a86..fc744eb60f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/05_Unlit_Textured_Trans_Cutoff.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 79f9dec512b..bf2309a7201 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Color/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/01_Unlit_Trans.mat
index 6b92ae7957b..dca631b2848 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/01_Unlit_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
index ac61c0babe0..99143f24ffc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/02_Unlit_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/03_Unlit_Textured_Trans.mat
index 5c5a079d4a0..38c1a7af789 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/03_Unlit_Textured_Trans.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
index cfc3d24f4ee..9673161224a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
index facf36b0291..a445a748e2e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/05_Unlit_Textured_Trans_Cutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index af0b52967d9..7afde6bf436 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Emissive_Texture/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -225,4 +225,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/01_Unlit_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/01_Unlit_Trans.mat
index 2218948bf7d..ed52941dadc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/01_Unlit_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/01_Unlit_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/02_Unlit_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
index 8e148c70fd1..c4b38aa494f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/02_Unlit_Trans_DoubleSide.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/03_Unlit_Textured_Trans.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/03_Unlit_Textured_Trans.mat
index a8c9ccd0e5d..3bc049a829c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/03_Unlit_Textured_Trans.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/03_Unlit_Textured_Trans.mat
@@ -224,4 +224,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
index 1a02f1ffb12..c56754f7232 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/04_Unlit_Textured_Trans_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
index 455409e8d42..db85241a69a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/05_Unlit_Textured_Trans_Cutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
index 8abab75521c..9819713d2b7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1103_Unlit_Distortion_DepthTest/Non_Emissive/06_Unlit_Textured_Trans_Cutoff_DoubleSide.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_All.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_All.mat
index b22854c88d3..db444b54c8a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_All.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_All.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_DepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_DepthTest.mat
index 7293b512940..3a61f5c3990 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_DepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Lit_Add_DepthTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All.mat
index a4a0572867a..f2c8da4627e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_-26.7.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_-26.7.mat
index 71395396b99..710d86bf1d8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_-26.7.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_-26.7.mat
@@ -278,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_2.mat
index 51b266a7e5f..3b7acccc535 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_DepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_DepthTest.mat
index d7e2f14e10b..761ab68ea61 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_DepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Add_All_DepthTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_BlurOnly.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_BlurOnly.mat
index b43a1518fc4..c8c7c669c3d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_BlurOnly.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_BlurOnly.mat
@@ -278,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Mult_Two.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Mult_Two.mat
index 49b11012ac6..9141a3ae255 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Mult_Two.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1104_Unlit_Distortion_Compose/Unlit_Mult_Two.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_AlphaClip.mat
index 04ca2790db7..79b0f3fff3f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_AlphaClip.mat	
@@ -302,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Color.mat
index 2f2b6a3d6cd..0b74667a52d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Emission.mat
index adf9f137976..43940e1f3db 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_Emission.mat	
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_ObjSpace.mat
index b5991202327..8449af16834 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op DbSi/1105_Op_DblSi_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_AlphaClip.mat
index 7075eb9455d..aed183f91cd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Color.mat
index a4fe3ab67af..541643b7774 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Color.mat	
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Emission.mat
index ef9a6696d20..41e7649814f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_Emission.mat	
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_ObjSpace.mat
index 49773ef856b..bc485cb2e4b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/00 Op Def/1105_Op_Def_ObjSpace.mat	
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_AlphaClip.mat
index e3d4ab8bbf8..aeb801479ac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_AlphaClip.mat	
@@ -302,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Color.mat
index 7eb6a23acdb..8c2912fb7aa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Emission.mat
index f7c57bfcb62..f6efcfe3f3a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_ObjSpace.mat
index 317f327c141..299bf92a990 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Add/1105_Tr_Add_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_AlphaClip.mat
index 702e6a36491..8ce8cdb506d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_AlphaClip.mat	
@@ -302,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Color.mat
index 056827376ea..f25e830b33a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Emission.mat
index f385cec90ed..84a1fe9148d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_Emission.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_ObjSpace.mat
index aeac53f77f4..8af856127c8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Alpha/1105_Tr_Alpha_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_AlphaClip.mat
index 32dd86ad58a..848f967303f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Color.mat
index 49fa5aaf201..8e4013df5de 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Emission.mat
index 3f1fa6a2781..416d5afcf93 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_Emission.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_ObjSpace.mat
index a289c728a24..5882c9d7d09 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/01 Tr Pre/1105_Tr_Premul_ObjSpace.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_AlphaClip.mat
index 0088666fe48..87cca4a0003 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Color.mat
index d46494cde16..6014ca0c83d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Emission.mat
index d44fb4c9dc1..ec8812f22d1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_ObjSpace.mat
index 0f9411a6d2b..fc4dc46e985 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Add/1105_Tr_DblSi_Add_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_AlphaClip.mat
index da2b7852733..8dfe49c27bc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_AlphaClip.mat	
@@ -303,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Color.mat
index 1559041b8fb..267a1ace280 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Emission.mat
index e320aba72de..e00fee57dce 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_Emission.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_ObjSpace.mat
index e1699196c41..ab3805ea0ec 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Alpha/1105_Tr_DblSi_Alpha_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_AlphaClip.mat
index c6c53193763..c173b9b4818 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Color.mat
index 0737847aa01..ad40aef42be 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Emission.mat
index 1c01db8ef24..bb7baff201f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_ObjSpace.mat
index fa2a3469375..a0257ec965c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/02 Tr DbSi Pret/1105_Tr_DblSi_Pre_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_AlphaClip.mat
index d34bfafc4a4..309553463b6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_AlphaClip.mat	
@@ -302,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Color.mat
index dde6c782452..79151991f35 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Emission.mat
index 8b55fe0ff12..f9b6d3c9f12 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_Emission.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_ObjSpace.mat
index 557b9f750b8..944627b9779 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Add/1105_Tr_BR_Add_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_AlphaClip.mat
index 51c4d8929e0..31df5ad736b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_AlphaClip.mat	
@@ -302,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Color.mat
index c1787e07b63..095b1d54092 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Emission.mat
index 6f7bd28e260..8e5a1996ae0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_Emission.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_ObjSpace.mat
index bb44d7ee786..a0124dba0e3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Alpha/1105_Tr_BR_Alpha_ObjSpace.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_AlphaClip.mat
index 3425cb25923..8d08527d892 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Color.mat
index 988ad1199ed..072fe269f6b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Emission.mat
index e18ec66ba04..64f19371367 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_ObjSpace.mat
index 271307e0a5e..edcfda9e255 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/03 Tr BR Pre/1105_Tr_BR_Pre_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_AlphaClip.mat
index 79855de3a29..8b8881bf830 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_AlphaClip.mat	
@@ -303,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Color.mat
index be2accf6a94..ae9ef9eec69 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Color.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Emission.mat
index 2c86b5ee653..fc67cb24c2f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_ObjSpace.mat
index 0ac41a732eb..0c6c7191da1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Add/1105_Tr_BR_DblSi_Add_ObjSpace.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_AlphaClip.mat
index 762df4ffb08..4fe5a381efb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Color.mat
index 96a26fea80d..fa93ff40bef 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Emission.mat
index 95c0224eb49..8e909350f9d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_ObjSpace.mat
index 45454ae4815..1a2225a9bc6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Alpha/1105_Tr_BR_DblSi_Alpha_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_AlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_AlphaClip.mat
index 4a9d4e55b47..26485d857a1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_AlphaClip.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_AlphaClip.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Color.mat
index d7a65b0d7c2..5b070485277 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Color.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Color.mat	
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Emission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Emission.mat
index 8de1814793f..efc18bdf0dc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Emission.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_Emission.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_ObjSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_ObjSpace.mat
index 740bee10b23..23786571a08 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_ObjSpace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/04 Tr BR DbSi Pre/1105_Tr_BR_DblSi_Premul_ObjSpace.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 01.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 01.mat
index e870d44d743..024d7539a4c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 01.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 01.mat	
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 02.mat
index 712d42aee59..92999bae88b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 02.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Add 02.mat	
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Mul 01.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Mul 01.mat
index a0318a0151c..f21c3ec3178 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Mul 01.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Mul 01.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Replace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Replace.mat
index e018b75a48d..1d19162fc78 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Replace.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1105_UnlitSG/05 Distortion/1105 Distortion Replace.mat	
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail.mat
index 748b06ccf7b..17e84b22233 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_Mask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_Mask.mat
index dc6de4fc9ed..45e3beb0399 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_Mask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_Mask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_ParamsTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_ParamsTest.mat
index cf149d8e1aa..3f336e2495a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_ParamsTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Detail_ParamsTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_ObjectSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_ObjectSpace.mat
index a615cca6777..f3b786f6f24 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_ObjectSpace.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_ObjectSpace.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 1
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_TangentSpace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_TangentSpace.mat
index b1830efbdeb..13a924ea49c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_TangentSpace.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_NormalMap_TangentSpace.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Texture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Texture.mat
index 0e597b16a7e..e97ffd1f4cc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Texture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1201_Lit_Features/Lit_Texture.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSideNormalTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSideNormalTest.mat
index b985616c251..59d528dc93e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSideNormalTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSideNormalTest.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Flip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Flip.mat
index 6d2dd4ddb01..4c16c3f0a16 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Flip.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Flip.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -30,6 +30,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 72c21bad8ebd4a043882b302f9837ae3, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5d808ed1aefeae87b29f97b524023dcb_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_74B26E6_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -54,6 +58,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -75,6 +91,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -118,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Mirror.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Mirror.mat
index 52ce5d52c08..bee9451ede3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Mirror.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_Mirror.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -43,6 +43,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5d808ed1aefeae87b29f97b524023dcb_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_74B26E6_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -67,6 +71,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -88,6 +104,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_None.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_None.mat
index 809b7637d25..afde78f1aad 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_None.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1202_Lit_DoubleSideNormalMode/DoubleSidedLitGraph_None.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -30,6 +30,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 72c21bad8ebd4a043882b302f9837ae3, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5d808ed1aefeae87b29f97b524023dcb_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_74B26E6_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -54,6 +58,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -75,6 +91,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -118,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Additive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Additive.mat
index 7bf2a7e03eb..4e6ac40e909 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Additive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Additive.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Alpha.mat
index b488ef64804..31c9b1964b2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Alpha.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Multiplicative.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Multiplicative.mat
index b9ee8ca20ec..e403ccb87d8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Multiplicative.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_Multiplicative.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_PremultipliedAlpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_PremultipliedAlpha.mat
index 1f76d694066..c4099c186a8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_PremultipliedAlpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1203_Lit_Transparent/Lit_Transparent_PremultipliedAlpha.mat
@@ -117,6 +117,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -291,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Fog.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Fog.mat
index cf191c6b2e1..e589fa5eca7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Fog.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Fog.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_Off.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_Off.mat
index b09380b7eee..0be64a8e10d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_Off.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_Off.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_On.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_On.mat
index 852f81c0848..31a1ddd3709 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_On.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Additive_Fog_On.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_Off.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_Off.mat
index 3e79a163277..da5785d7933 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_Off.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_Off.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_On.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_On.mat
index 987403de7c4..97f1f934082 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_On.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Fog_On.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_Off.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_Off.mat
index 7d54fd45397..8a832eb6460 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_Off.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_Off.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_On.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_On.mat
index 5fe720c5d1f..f31b9ecbb53 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_On.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Premultiply_Fog_On.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -130,6 +130,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -210,6 +222,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_Off.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_Off.mat
index 532a1eccbd7..31d219321e0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_Off.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_Off.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_On.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_On.mat
index 381597afcc5..5551a4c701d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_On.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Lit_Transparent_Refraction_Fog_On.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Materials/1204_Lit_Fog_Display.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Materials/1204_Lit_Fog_Display.mat
index 0f7c6c75797..8aa620ca559 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Materials/1204_Lit_Fog_Display.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1204_Lit_Fog/Materials/1204_Lit_Fog_Display.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane.mat
index b50485fdd23..117b18df555 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane.mat
@@ -120,6 +120,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -296,4 +310,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
index e14ff447d8d..fc50977e031 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -297,4 +311,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
index bfb3bb2cbcc..f000e18fa57 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -214,6 +226,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Thickness.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Thickness.mat
index 32e452f57cd..0f47c141911 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Thickness.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Thickness.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -214,6 +226,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere.mat
index a426025d245..abdae43d112 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere.mat
@@ -120,6 +120,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -296,4 +310,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM.mat
index 1a8282a066d..d21a4ffd972 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM.mat
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -297,4 +311,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM_Thickness.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM_Thickness.mat
index af874418927..342756c02c4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM_Thickness.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_NM_Thickness.mat
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -297,4 +311,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_Thickness.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_Thickness.mat
index 482623bace0..ba108c8af3b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_Thickness.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Sphere_Thickness.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -214,6 +226,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1206_Lit_Transparent_Distortion/Lit_Distortion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1206_Lit_Transparent_Distortion/Lit_Distortion.mat
index 3cc72cb0c21..7a29ef1fc0d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1206_Lit_Transparent_Distortion/Lit_Distortion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1206_Lit_Transparent_Distortion/Lit_Distortion.mat
@@ -115,6 +115,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel.mat
index 1837e34361a..d5d7e9c4aa4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel_Tile10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel_Tile10.mat
index 0e6b65c0f60..e7c1cc4d301 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel_Tile10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Pixel_Tile10.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex.mat
index f4771068c3f..178ed8c9f18 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex.mat
@@ -115,6 +115,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex_Tile10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex_Tile10.mat
index 2c8de0d2fbc..68d4ec45484 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex_Tile10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1207_Lit_Displacement/Lit_Displacement_Vertex_Tile10.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1208_Lit_Displacement_POM/Lit_Displacement_Pixel.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1208_Lit_Displacement_POM/Lit_Displacement_Pixel.mat
index cfaeb0e1830..370a01e4683 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1208_Lit_Displacement_POM/Lit_Displacement_Pixel.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1208_Lit_Displacement_POM/Lit_Displacement_Pixel.mat
@@ -115,6 +115,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1209_Lit_Displacement_Vertex/Lit_Displacement_Vertex.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1209_Lit_Displacement_Vertex/Lit_Displacement_Vertex.mat
index d49a5b126ae..ffd8a7cd09d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1209_Lit_Displacement_Vertex/Lit_Displacement_Vertex.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1209_Lit_Displacement_Vertex/Lit_Displacement_Vertex.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/BentNormal_Tangent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/BentNormal_Tangent.mat
index 0070b58dd48..9d991c2cadf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/BentNormal_Tangent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/BentNormal_Tangent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -208,6 +220,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Green_Emissive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Green_Emissive.mat
index ad387fbb36a..d5d23cad08e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Green_Emissive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Green_Emissive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Red_Emissive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Red_Emissive.mat
index 4b2736667ed..9de7bae6e23 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Red_Emissive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1210_Lit_BentNormal/Red_Emissive.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail.mat
index 7f568cc2c9c..ca334b51377 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail.mat
@@ -118,6 +118,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail_TilingOffset.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail_TilingOffset.mat
index 8eff489a6d7..afa9253a3af 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail_TilingOffset.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1211_Lit_Details/Lit_Detail_TilingOffset.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/ColorRange.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/ColorRange.mat
index aaeccb01431..4260984b437 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/ColorRange.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/ColorRange.mat
@@ -118,6 +118,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive.mat
index 6d2429bf51d..12c45c5ced5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -131,6 +131,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -211,6 +223,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive_TileOffset.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive_TileOffset.mat
index 3d7ac236737..0cfe0885e42 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive_TileOffset.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1212_Lit_Emission/Lit_Emissive_TileOffset.mat
@@ -118,6 +118,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/GGX_Base.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/GGX_Base.mat
index 40e4d55c484..cbd195a3bf3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/GGX_Base.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/GGX_Base.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -183,6 +183,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -279,6 +291,8 @@ Material:
     - _MaterialID: 2
     - _Metalic: 0
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _Mettalic: 0
     - _Mode: 0
     - _NormalMapSpace: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/Background.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/Background.mat
index 9eed8be1119..26451af8ac9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/Background.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/Background.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Additive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Additive.mat
index 00703bd52da..d41a6582240 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Additive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Additive.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Alpha.mat
index a1649e08ffd..4ce9891a34b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Alpha.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Premultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Premultiply.mat
index 3e33ecd5fed..f92f441baae 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Premultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/FullRes_Premultiply.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Additive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Additive.mat
index 16ff1dcf642..4f14d716dbf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Additive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Additive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Alpha.mat
index b05c1ef5c4f..aabb0303d52 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Alpha.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Premultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Premultiply.mat
index b0896e191b5..7590159a40d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Premultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent/LowRes_Premultiply.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_02.mat
index 5f6cddc7737..dfd15d65505 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_02.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_02.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -279,4 +293,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_NoTransmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_NoTransmission.mat
index 59c07a9cf36..fd2a6d0134c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_NoTransmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Candle/Candle_NoTransmission.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/LayerRef.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/LayerRef.mat
index 4fb66f18ee4..fbf293fb48a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/LayerRef.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/LayerRef.mat
@@ -570,4 +570,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1WorldScale0_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1WorldScale0_1.mat
index 6de28f9ff4b..3d5b972642f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1WorldScale0_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1WorldScale0_1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_25WorldScale1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_25WorldScale1.mat
index 22e2d46d9c3..fae61d12311 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_25WorldScale1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_25WorldScale1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_5WorldScale10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_5WorldScale10.mat
index 5b1d1823638..34f0027cd9c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_5WorldScale10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction1_5WorldScale10.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction2WorldScale100.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction2WorldScale100.mat
index bca9383a1ec..7369b2275ce 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction2WorldScale100.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/Materials/IndexOfRefraction2WorldScale100.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Layered.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Layered.mat
index 1f88a30f76a..8b174c21ed6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Layered.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Layered.mat
@@ -268,6 +268,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -428,6 +440,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -590,4 +610,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Mask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Mask.mat
index aef734b75b1..54ca54b587b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Mask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/SSS_Mask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -292,6 +292,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -453,6 +465,8 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ShadowDimmerTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ShadowDimmerTest.mat
index 20e270a3d89..95d432d5f0b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ShadowDimmerTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ShadowDimmerTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ThicknessTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ThicknessTest.mat
index c377c8aa8f4..3949c00aa57 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ThicknessTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1215_Lit_SubSurfaceScattering/ThicknessTest.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -281,4 +295,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/GridOverlay.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/GridOverlay.mat
index 878c63d599d..0a46068e846 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/GridOverlay.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/GridOverlay.mat
@@ -247,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_1.mat
index 9684606c870..d741636c4cb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_10.mat
index fe15e10ce6d..637fb0d1cc6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_10.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_15.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_15.mat
index bf8cc63ef77..55ff6871f7b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_15.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_15.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_20.mat
index 100248b1480..746dfe919da 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_20.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -283,4 +297,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_5.mat
index a9bd2415aef..4b72eb9e973 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1216_Lit_SSS_MaxRadius/MaxRadius_5.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1217_Lit_SSS_Pre-Post/Head_Post-Scatter.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1217_Lit_SSS_Pre-Post/Head_Post-Scatter.mat
index ac087645cd1..c0be1af1804 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1217_Lit_SSS_Pre-Post/Head_Post-Scatter.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1217_Lit_SSS_Pre-Post/Head_Post-Scatter.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -283,4 +297,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/FabricProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/FabricProfile.mat
index a37810ba41a..c19d59365fc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/FabricProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/FabricProfile.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/HairProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/HairProfile.mat
index 0c0f7970be9..1c18d73f989 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/HairProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/HairProfile.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LayeredLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LayeredLit.mat
index d11763dbb19..2a27817306b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LayeredLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LayeredLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -458,6 +470,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitNoProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitNoProfile.mat
index 629e2a68c57..690d2a4dc4f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitNoProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitNoProfile.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitProfile_Checker.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitProfile_Checker.mat
index 41bafaba59c..5fdd6715676 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitProfile_Checker.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/LitProfile_Checker.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/ProjectDiffusionProfileCamera.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/ProjectDiffusionProfileCamera.mat
index 4f19fd13af4..08dd8f54a93 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/ProjectDiffusionProfileCamera.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/ProjectDiffusionProfileCamera.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/VolumeDiffusionProfileCamera.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/VolumeDiffusionProfileCamera.mat
index 271bb6147d9..a7f377c53a9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/VolumeDiffusionProfileCamera.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/Materials/VolumeDiffusionProfileCamera.mat
@@ -111,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectFabricProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectFabricProfile.mat
index ac533ebc433..7a748d435bd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectFabricProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectFabricProfile.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectHairProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectHairProfile.mat
index d1fb5af39e4..f120b21335c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectHairProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectHairProfile.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLayeredLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLayeredLit.mat
index 0e010a04f16..b04c4e44e8b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLayeredLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLayeredLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -458,6 +470,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitNoProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitNoProfile.mat
index cecfe66be01..392c6e41576 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitNoProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitNoProfile.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitProfile_Checker.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitProfile_Checker.mat
index fe389f54cb0..69d5b3adef0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitProfile_Checker.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectLitProfile_Checker.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectStackLitProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectStackLitProfile.mat
index 86c48b3551e..de1d18ec298 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectStackLitProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/ProjectStackLitProfile.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/StackLitProfile.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/StackLitProfile.mat
index 4a1a32d2ab2..fb377d0bd47 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/StackLitProfile.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1218_Lit_DiffusionProfiles/StackLitProfile.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace.mat
index 567bb93dca7..31cabb95e96 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -298,6 +298,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -466,6 +478,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 1
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace_Phong.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace_Phong.mat
index 63cefb1ede4..afe9da528a0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace_Phong.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/LayeredLitTess_Displace_Phong.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -298,6 +298,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -466,6 +478,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 1
     - _Metallic3: 1
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/ProbeVisualizer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/ProbeVisualizer.mat
index 9f2b52056c8..65b3027c93d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/ProbeVisualizer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/ProbeVisualizer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace.mat
index 37bb2a7f0ba..5b5161210eb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace_Phong.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace_Phong.mat
index 7c8d88dbd1e..015619c9090 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace_Phong.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation/Tess_Displace_Phong.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Blue_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Blue_Priority_0.mat
index 92076fc6070..55da2efceb1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Blue_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Blue_Priority_0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_-20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_-20.mat
index ac44e5f8393..ca509006e69 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_-20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_-20.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_0.mat
index 73d6cef7241..fe35b45fd26 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Green_Priority_0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_0.mat
index ccb87f7f444..eeccd72cad6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_20.mat
index c47d6d9a781..c1f05ecb940 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Lit_Red_Priority_20.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Blue_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Blue_Priority_0.mat
index 4d0ac63ec87..1c230246944 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Blue_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Blue_Priority_0.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_-20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_-20.mat
index a8310faebb4..a11289a54ad 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_-20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_-20.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_0.mat
index c02ea89e2d8..d261fc698a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Green_Priority_0.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_0.mat
index ef72d9a370e..26df6d4ab9f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_0.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_20.mat
index df4e8866687..2424f9416f6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1220_Sorting/Unlit_Red_Priority_20.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_layered_lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_layered_lit.mat
index ce677a157db..495ee769432 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_layered_lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_layered_lit.mat
@@ -279,6 +279,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -437,6 +449,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -594,4 +614,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_lit.mat
index b327ce49d65..40ef45ff6e5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1221_Lit_POM_Emission/pom_emissive_lit.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1222_Lit_Aniso_Textures/1222_Aniso.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1222_Lit_Aniso_Textures/1222_Aniso.mat
index 388c01ace11..d719fcb6f53 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1222_Lit_Aniso_Textures/1222_Aniso.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1222_Lit_Aniso_Textures/1222_Aniso.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Base.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Base.mat
index 55fb918a154..7b4777737ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Base.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Base.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Irid.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Irid.mat
index ec6c6dc7eec..b531a2fe7d4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Irid.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_Irid.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_SSS.mat
index d7e16cc3544..577f0e10681 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Dielectric_SSS.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Aniso.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Aniso.mat
index 711fcebaae3..4f0e901ad9b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Aniso.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Aniso.mat
@@ -714,4 +714,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Base.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Base.mat
index 8a4f4643a68..9f7edbd6c3a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Base.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Base.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat.mat
index be16e727cd8..becb64ef129 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat_DualNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat_DualNormal.mat
index f1e4adfd393..e31464163f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat_DualNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/SG_TestStackMat_Metal_Coat_DualNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_Metal_Occlusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_Metal_Occlusion.mat
index 76a8fe52147..a8ac0644105 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_Metal_Occlusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_Metal_Occlusion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_SLSG_SpecC4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_SLSG_SpecC4.mat
index e8c05f2fcfc..d8638392654 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_SLSG_SpecC4.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Column_SLSG_SpecC4.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03.mat
index a1f91da96bd..3f998f1d0c5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -210,6 +222,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1.1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03_nodetail.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03_nodetail.mat
index 3c7475ea490..76b5583d5e0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03_nodetail.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/Floor_Sides_03_nodetail.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1.1
     - _OpaqueCullMode: 2
@@ -291,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor.mat
index 1cdd40cee07..597b9a11f1e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -210,6 +222,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.5
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor_nomaps.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor_nomaps.mat
index b2e4eea8b7c..f50bd335538 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor_nomaps.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/GreyFloor_nomaps.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.5
     - _OpaqueCullMode: 2
@@ -291,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedMetal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedMetal.mat
index 656215595dd..9972aa2568a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedMetal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedMetal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedPaint.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedPaint.mat
index d82385e683c..494e5f04553 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedPaint.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_FrostedPaint.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_GlossyPaint.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_GlossyPaint.mat
index d18126fdfe6..460becba70d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_GlossyPaint.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_GlossyPaint.mat
@@ -717,4 +717,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetalFoil.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetalFoil.mat
index 81babb0b8bb..19f502d794e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetalFoil.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetalFoil.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetallicPaint.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetallicPaint.mat
index 71dbbbcaddf..15ec7d7d2c6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetallicPaint.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_MetallicPaint.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_Patina.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_Patina.mat
index 104c4afa4c4..6ed5e2e4264 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_Patina.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_Patina.mat
@@ -717,4 +717,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_TintedGlazing.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_TintedGlazing.mat
index ca392e5e108..76fb1f65d0b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_TintedGlazing.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/PixarLM/Materials/Screenshots/SLSG_TintedGlazing.mat
@@ -717,4 +717,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SG_TestStackMat_Metal_Base 1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SG_TestStackMat_Metal_Base 1.mat
index 190b844a8f6..75b3a0db44e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SG_TestStackMat_Metal_Base 1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SG_TestStackMat_Metal_Base 1.mat	
@@ -714,4 +714,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_1.mat
index c3dd1facac7..ee66bfb980e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_1.mat
@@ -859,4 +859,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2.mat
index de39bc65575..2843de7045b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2M.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2M.mat
index 949500322cc..782fc42ffa2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2M.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2M.mat
@@ -866,4 +866,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Ma.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Ma.mat
index 1a36dd36458..058d0832eb0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Ma.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Ma.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mb.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mb.mat
index 7e18933a38a..3e973bac388 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mb.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mb.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc.mat
index ad489fcbfbb..f287185aef7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc.mat
@@ -866,4 +866,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc2.mat
index b081c39217b..e6b4d4d18ee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc3.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc3.mat
index 6ee6894f64b..99e77c09a95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc3.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc3.mat
@@ -866,4 +866,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc4.mat
index 95d60c45949..086366b0fb6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc4.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/SLSG_BaseM_2Mc4.mat
@@ -866,4 +866,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_Lit_Metal_Occlusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_Lit_Metal_Occlusion.mat
index 61c6b943d60..ddd5ec806f4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_Lit_Metal_Occlusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_Lit_Metal_Occlusion.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0.99999994
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG.mat
index 84b1280682e..be18084693f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG.mat
@@ -715,4 +715,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_1.mat
index 6579c200767..79a93a627db 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_1.mat
@@ -717,4 +717,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2.mat
index 83bb1aff370..9dfc451dcd8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2b.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2b.mat
index 6509e4650b5..7abf5405bf1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2b.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1302_03_StackLit/Tester_SLSG_2b.mat
@@ -714,4 +714,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalCutout_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalCutout_Graph.mat
index fe2c2ee5299..901a068b6bd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalCutout_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalCutout_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzzDouble_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzzDouble_Graph.mat
index f5a5220fd48..4f5091dcccd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzzDouble_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzzDouble_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzz_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzz_Graph.mat
index a1c66c32a47..12e58f54c68 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzz_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormalFuzz_Graph.mat
@@ -307,4 +307,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormal_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormal_Graph.mat
index b14762716f4..73a59156a64 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormal_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetailNormal_Graph.mat
@@ -305,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetail_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetail_Graph.mat
index fc34b33f13c..4bf85754afb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetail_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolDetail_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolNormal_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolNormal_Graph.mat
index 7d926670de8..65ec54e08b9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolNormal_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolNormal_Graph.mat
@@ -307,4 +307,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolSSS_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolSSS_Graph.mat
index 40f9d01ccdf..69d20f6f255 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolSSS_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolSSS_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolTransmission_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolTransmission_Graph.mat
index e3050be49b2..572354b1f99 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolTransmission_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWoolTransmission_Graph.mat
@@ -310,4 +310,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWool_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWool_Graph.mat
index db64c723ea6..24513dda044 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWool_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_CottonWool_Graph.mat
@@ -305,4 +305,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalCutout_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalCutout_Graph.mat
index 57379eb3350..4ef7283d06f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalCutout_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalCutout_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzzDouble_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzzDouble_Graph.mat
index e6bd01a7355..d5d11ea9d0e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzzDouble_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzzDouble_Graph.mat
@@ -308,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzz_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzz_Graph.mat
index c1f1c0ed86f..4e7428a1452 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzz_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormalFuzz_Graph.mat
@@ -307,4 +307,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormal_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormal_Graph.mat
index 4777632f51b..40b1c71928b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormal_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetailNormal_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetail_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetail_Graph.mat
index 0f705cdc9d3..7731f271143 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetail_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkDetail_Graph.mat
@@ -307,4 +307,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkNormal_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkNormal_Graph.mat
index 3906a002c14..229bc362261 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkNormal_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkNormal_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkSSS_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkSSS_Graph.mat
index 518d46b316e..1b000185331 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkSSS_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkSSS_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkTransmission_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkTransmission_Graph.mat
index 6dabc139304..0e9a7b1f10a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkTransmission_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_SilkTransmission_Graph.mat
@@ -310,4 +310,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_Silk_Graph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_Silk_Graph.mat
index adf6a306c3e..c5dd6bbfb6d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_Silk_Graph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1351_Fabric/M_Silk_Graph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_CottonWoolGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_CottonWoolGraph.mat
index 14820e844d2..63d679fc298 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_CottonWoolGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_CottonWoolGraph.mat
@@ -301,4 +301,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_Lit.mat
index 6c6f7a3b066..d6813010629 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_Lit.mat
@@ -117,6 +117,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -294,4 +308,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_SilkGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_SilkGraph.mat
index 16e86382de1..4496f0b5ba2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_SilkGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/M_SilkGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/Grey.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/Grey.mat
index a1dabc1c4dc..a5edf4766d1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/Grey.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/Grey.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal.mat
index 1103ea4974a..4bd80f40927 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal_Opaque.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal_Opaque.mat
index c962f5991ce..993ceda7568 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal_Opaque.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest Light Facing Normal_Opaque.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest No Shadow Threshold.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest No Shadow Threshold.mat
index 249c909899a..97115a16932 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest No Shadow Threshold.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest No Shadow Threshold.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest.mat
index f5668896b03..1df1757da5a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest_Opaque.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest_Opaque.mat
index 03a420989d8..bd0945d78a8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest_Opaque.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1401_HairGraph/HairTest_Opaque.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF.mat
index b55280247dd..7db1017ea0f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_aniso/AxF_aniso.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_aniso/AxF_aniso.mat
index 7165faea7d5..e261faff40e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_aniso/AxF_aniso.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_aniso/AxF_aniso.mat
@@ -353,4 +353,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_displacement/AxF_displacement.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_displacement/AxF_displacement.mat
index 989f6fd5026..5aa3e1d7d15 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_displacement/AxF_displacement.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1451_AxF_SVBRDF/AxF_displacement/AxF_displacement.mat
@@ -353,4 +353,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_DiffuseGround.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_DiffuseGround.mat
index 13ac530ecc3..8c9f6b32eb2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_DiffuseGround.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_DiffuseGround.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 0.mat
index c70c0b73564..d650bbc5d2a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 0.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 0.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 1.mat
index 6a90d0c287e..6f4cd264ced 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 2.mat
index 07b41ec1f89..1fce25ee0a6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 2.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 3.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 3.mat
index 970bc0d3d92..259c3ed55e3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 3.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 3.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 4.mat
index 3e6be813d29..4990a9be331 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 4.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 4.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 5.mat
index 795d3456fda..fd1cfec97f8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 5.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 5.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 6.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 6.mat
index c551dc14a79..ea830318fd6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 6.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 6.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 7.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 7.mat
index bc24f449644..c6dc72d0428 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 7.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 7.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 8.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 8.mat
index 55124936513..443611c3207 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 8.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 8.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 9.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 9.mat
index 01503dd0f5a..3f0f998305c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 9.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1501_EyeTestSG/Materials/M_EyeSG 9.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/Decal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/Decal.mat
index ac90c529ba8..3ca077b7937 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/Decal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/Decal.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -269,4 +270,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/MeshMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/MeshMaterial.mat
index a941c7d172f..50c5cac0e54 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/MeshMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1601_TerrainLit/MeshMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal/FourShapesMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal/FourShapesMaterial.mat
index 5ce35656cca..89115690ae7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal/FourShapesMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal/FourShapesMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All.mat
index 86c25dc890d..5574953d5d7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All_ColorTint.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All_ColorTint.mat
index 98eb6ed63ba..a5e940fb9ff 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All_ColorTint.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_All_ColorTint.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask.mat
index 30d43a1a22e..a1d11c19479 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_Factor05.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_Factor05.mat
index 20819b32f03..0fc4adb3b78 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_Factor05.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_Factor05.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_NoAlbedo.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_NoAlbedo.mat
index 4acb6fadbe8..f54b3080cfc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_NoAlbedo.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_BlendMask_NoAlbedo.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Color.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Color.mat
index 511c1bea56e..59a89877bd5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Color.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Color.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Mask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Mask.mat
index 000b9d86c62..52b5b92375a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Mask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Mask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -192,7 +192,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Normal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Normal.mat
index ac800067bc2..057fe21d487 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Normal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/Decal_Normal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapesTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapesTransparent.mat
index fe21be969fa..9bebc6adf3a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapesTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapesTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -204,6 +216,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapes_NoDecal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapes_NoDecal.mat
index f3c3c45046d..390c457c2ee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapes_NoDecal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1701_Decals/FourShapes_NoDecal.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -190,6 +202,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1703_Decals-ReorientedNormals/FlatNormalDecal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1703_Decals-ReorientedNormals/FlatNormalDecal.mat
index 3717288d9f5..ffcaca001b0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1703_Decals-ReorientedNormals/FlatNormalDecal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1703_Decals-ReorientedNormals/FlatNormalDecal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal.mat
index e0868f3f31e..07d8ebad6ea 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_ColorTint.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_ColorTint.mat
index d3d610fa41f..71a79792cac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_ColorTint.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_ColorTint.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_Factor05.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_Factor05.mat
index 7edab96ed30..84b0c773e9b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_Factor05.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_Factor05.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_NoAlbedo.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_NoAlbedo.mat
index a0a57a9b01e..9c2168fe6c9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_NoAlbedo.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1704_Decals-Settings/Decal_NoAlbedo.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud2_03.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud2_03.mat
index 45ad17568e8..4b4c02194ac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud2_03.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud2_03.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud_02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud_02.mat
index 2b751b2403e..210a9d8853c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud_02.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cloud_02.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cross_04.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cross_04.mat
index cb149d29ea7..497e5d19ef3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cross_04.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Cross_04.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor.mat
index 0f25d5b6ae6..67b64586291 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Grid.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Grid.mat
index 7c5dc58b0e3..b9bf50f3154 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Grid.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Grid.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent.mat
index 3c3ce1b0480..ed369e07e00 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent_Grid.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent_Grid.mat
index 80174292e17..43838a810ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent_Grid.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Floor_Transparent_Grid.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Flower_05.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Flower_05.mat
index 14e8617bb30..ef60ead90f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Flower_05.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Flower_05.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_05.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_05.mat
index 2ef7b08f1ee..7d43a681c03 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_05.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_05.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_06.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_06.mat
index 0c9428b9284..9c92f91d91c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_06.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_06.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_07.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_07.mat
index 68bbbdf0703..942ffeef5f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_07.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Grunge_07.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_07.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_07.mat
index 5206fa309f0..17d34b450f1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_07.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_07.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_08.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_08.mat
index d711eb8dd0b..c67ca03291e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_08.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_08.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_09.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_09.mat
index 2aa1f5cd6c3..be375ef0850 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_09.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Leaf_09.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Logo_02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Logo_02.mat
index 79a22bbfbb7..915533d8c26 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Logo_02.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Logo_02.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_07.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_07.mat
index 1ee2171003a..c54c8c358c7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_07.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_07.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_08.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_08.mat
index 4f4097f2fc8..7801bbd78fa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_08.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/MagCircle_08.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Noise_04.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Noise_04.mat
index 546400f0a72..2dee18751fc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Noise_04.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Noise_04.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_11.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_11.mat
index ce91b07277d..10f2e70d2e8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_11.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_11.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_12.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_12.mat
index a5e095be12f..3e95fc4a41b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_12.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_12.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_13.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_13.mat
index 9151b1293c3..4358c79dcfc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_13.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_13.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_14.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_14.mat
index e3a5b42ddf3..ce9ca61911c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_14.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_14.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_15.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_15.mat
index 54d961d25ae..807bbe3e7e5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_15.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_15.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_16.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_16.mat
index 9e2e060c4b8..2b6967be8b3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_16.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_16.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_17.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_17.mat
index 0a101238153..22a54c66e20 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_17.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_17.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_18.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_18.mat
index e6ebb7dbcd0..08cddfd2a9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_18.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Nyan_18.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Particle_01.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Particle_01.mat
index 52cc1d204f5..491ca1935cb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Particle_01.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Particle_01.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/PixelGrid_Small.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/PixelGrid_Small.mat
index a1eda4e7e81..e0d7bc52eee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/PixelGrid_Small.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/PixelGrid_Small.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -269,4 +270,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_02.mat
index 4e39f8a31d6..d7feebab18b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_02.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_02.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_09.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_09.mat
index 8ebf6e78c4c..7d638348a7a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_09.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Ring_09.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Shapes_03.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Shapes_03.mat
index 32612104265..a8a3f1f7f52 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Shapes_03.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Shapes_03.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Snow_10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Snow_10.mat
index 57160f169fc..0d65a400053 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Snow_10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Snow_10.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_01.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_01.mat
index 38ba258768e..933e7f42684 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_01.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_01.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -207,7 +207,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_03.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_03.mat
index d88829aabb0..5c0e3887c9b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_03.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_03.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_15.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_15.mat
index 19c38b25236..bf3b6a6d543 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_15.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1705_Decals-stress-test/Wood_15.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -268,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_All_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_All_SG.mat
index 3cf303392e4..b1e792107e7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_All_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_All_SG.mat
@@ -286,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Color_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Color_SG.mat
index 2d9c5e68f26..beb1bdd5133 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Color_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Color_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Mask_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Mask_SG.mat
index c01b1e3f104..8a4d3a14628 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Mask_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Mask_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Normal_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Normal_SG.mat
index 2f5ce966504..66ed8b6e8d3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Normal_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1706_DecalsSG/Decal_Normal_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/Decal_FactorAndStart.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/Decal_FactorAndStart.mat
index 9a3fdf6b340..c24a332a0fd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/Decal_FactorAndStart.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/Decal_FactorAndStart.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/fadeFactorFadeStart.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/fadeFactorFadeStart.mat
index ebae0a80c28..28c4fa89d6a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/fadeFactorFadeStart.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1707-Decals-FadeFactorAndDistance/fadeFactorFadeStart.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_POM_SG_mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_POM_SG_mat.mat
index 988386a6775..ea9dbef8d0b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_POM_SG_mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_POM_SG_mat.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -114,6 +114,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 765ed877b92d01c4f8d6c6d2be61fd99, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _ParallaxOcclusionMapping_e5d78a234397458abba4434dd0f44354_Heightmap_2:
+        m_Texture: {fileID: 2800000, guid: 765ed877b92d01c4f8d6c6d2be61fd99, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_096e777818a84c28a06e00a4f7e87d32_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -126,6 +130,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_47c0cbf0a8c19b84a93c163473ec8c54_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_490166ae34164936967e02ffb3bacbfe_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -146,6 +154,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 97a5684bc72c1704fadc965467f242ea, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_9598fd369c5c8e88a829a2184f95844f_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 97a5684bc72c1704fadc965467f242ea, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_9717bfb4819b4c599979249d7d217aac_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -186,6 +198,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -352,4 +376,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_SG_mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_SG_mat.mat
index 21d172eceb4..3ef47450c41 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_SG_mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/FourShapes_SG_mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -99,6 +99,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_105e4b80ec2ab28aa7e304d03d0b059b_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 97a5684bc72c1704fadc965467f242ea, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_297c0a35a378449c9f7464a0061940ab_Texture_1:
         m_Texture: {fileID: 2800000, guid: 97a5684bc72c1704fadc965467f242ea, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -143,6 +147,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_e395a9eafb51728dbafa9a23d0a08769_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_e893d43f6daa4d4a86b76ca8894399d1_Texture_1:
         m_Texture: {fileID: 2800000, guid: 6c9639b085103f447815e2965a30810a, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -171,6 +179,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/Tests_Default_SG_mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/Tests_Default_SG_mat.mat
index 1ea06a98653..fb0b082a06c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/Tests_Default_SG_mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1708_DecalsSG_on_SG/Tests_Default_SG_mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorDefaultLayer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorDefaultLayer.mat
index 3cc27d081f5..5b35144778b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorDefaultLayer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorDefaultLayer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -214,7 +214,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorEmissiveLayer5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorEmissiveLayer5.mat
index 61b1c3c92b1..1e97085a023 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorEmissiveLayer5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorEmissiveLayer5.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -212,7 +212,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer3.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer3.mat
index e2697bb07c3..04e1407a578 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer3.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer3.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -214,7 +214,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer7.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer7.mat
index 477b7258b1f..90cfe12cb56 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer7.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorLayer7.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -214,7 +214,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorNoLayer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorNoLayer.mat
index e8dae66d7ed..4b221a5bbfd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorNoLayer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/DecalProjectorNoLayer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -214,7 +214,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxF.mat
index 96b006bd736..7dfa645a426 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxF.mat
@@ -355,4 +355,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxFTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxFTransparent.mat
index f30820d72e9..af52bc299a1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxFTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalAxFTransparent.mat
@@ -356,4 +356,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabric.mat
index 4d9b465c464..cc723522b58 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabric.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabric.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabricTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabricTransparent.mat
index 0524536f761..d3dcafbeb80 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabricTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalFabricTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLit.mat
index 244d7f733d9..46fac6d5c6e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLitTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLitTransparent.mat
index 3c1ea0da535..fe7e0cedfdc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLitTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalLitTransparent.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLit.mat
index 791d7236fe0..3ed03f0d9cd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLit.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -268,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLitTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLitTransparent.mat
index 7315c36f98d..864b39e6762 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLitTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/NoDecal/NoDecalSGLitTransparent.mat
@@ -10,8 +10,8 @@ Material:
   m_Name: NoDecalSGLitTransparent
   m_Shader: {fileID: -6465566751694194690, guid: e89bd123d4f6bd1488338ebfa9d2c65c,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxF.mat
index 46a91dbd77a..52d62bcfe5c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxF.mat
@@ -354,4 +354,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxFTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxFTransparent.mat
index bd360b6c9f7..386d7cc5d1b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxFTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalAxFTransparent.mat
@@ -356,4 +356,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabric.mat
index 88a19059049..937bfa4ebf7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabric.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabric.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabricTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabricTransparent.mat
index ade3037b44a..8ee08be87f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabricTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalFabricTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLit.mat
index eb4f8f4dc1d..14c8d6b0600 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLitTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLitTransparent.mat
index a3ffeeb3006..876d5404b77 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLitTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalLitTransparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLit.mat
index e7a8ebf00c8..30dbecff553 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLit.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -268,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLitTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLitTransparent.mat
index 1b19efa239f..2444274cabd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLitTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer/Regular/ReceiveDecalSGLitTransparent.mat
@@ -10,7 +10,7 @@ Material:
   m_Name: ReceiveDecalSGLitTransparent
   m_Shader: {fileID: -6465566751694194690, guid: e89bd123d4f6bd1488338ebfa9d2c65c,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/AxFSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/AxFSSR.mat
index 4af4d5e82de..2fac719de21 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/AxFSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/AxFSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/DecalModifier.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/DecalModifier.mat
index f7b280f565a..93c04f58bbe 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/DecalModifier.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/DecalModifier.mat
@@ -199,7 +199,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -284,4 +285,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/FabricSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/FabricSSR.mat
index 7250333686d..175a6664dc7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/FabricSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/FabricSSR.mat
@@ -87,4 +87,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LayeredLitSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LayeredLitSSR.mat
index 9f7d73fca7c..99fd774e1d2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LayeredLitSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LayeredLitSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -291,6 +291,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -450,6 +462,14 @@ Material:
     - _Metallic1: 1
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LitSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LitSSR.mat
index d98a1326312..05733b2cd59 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LitSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/LitSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/StackLitSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/StackLitSSR.mat
index 985fc29a32c..fb567a44876 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/StackLitSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1710_Decals_Normal_Patch/StackLitSSR.mat
@@ -87,4 +87,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_dark.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_dark.mat
index c6e8b12038a..1620d861e05 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_dark.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_dark.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey.mat
index 7b53128074e..2a6aaad7e6b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey.mat
@@ -286,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey_dontAffectBase.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey_dontAffectBase.mat
index 56962a1f5d3..dfd2136f513 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey_dontAffectBase.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_grey_dontAffectBase.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_white.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_white.mat
index d139b545c5b..0b8cbc4482e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_white.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_SG_mask_white.mat
@@ -286,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_dark.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_dark.mat
index 2c86f4e611c..f08666d417e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_dark.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_dark.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey.mat
index b6606377ffa..1a26d694a10 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey.mat
@@ -180,7 +180,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -246,4 +247,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey_dontAffectBase.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey_dontAffectBase.mat
index 4a2b0671908..7d6d1931e42 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey_dontAffectBase.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_grey_dontAffectBase.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_white.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_white.mat
index 7b48ce3bc48..8e3651a9861 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_white.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/Decal_All_mask_white.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -193,7 +193,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.5.mat
index 729c032e540..d277641e22d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.5.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -192,7 +192,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.mat
index 4a30bd0d352..f0c49c1325b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_0.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_1.mat
index 6ea1f3fa5a0..ae0c486ed61 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_AO_1.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.5.mat
index 97eadc23bc1..e192af7f680 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.5.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.mat
index bdae0f151aa..c0c243b5fcd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -192,7 +192,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_1.mat
index cd2478f800a..4da7dd24454 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_metal_1.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.5.mat
index a45a2217d4b..49d359a53b8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.5.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -192,7 +192,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.mat
index 6d7991d67e8..2c26588a697 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_0.mat
@@ -179,7 +179,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -245,4 +246,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_1.mat
index 47d942cff63..8f57b2aa08c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1711_DecalMasks/MaskRemap/Decal_mask_remap_smoothness_1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -192,7 +192,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1712_DecalAngleFading/ReceiveDecalTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1712_DecalAngleFading/ReceiveDecalTransparent.mat
index 579a73f827f..ead36ab2256 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1712_DecalAngleFading/ReceiveDecalTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1712_DecalAngleFading/ReceiveDecalTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Anisotropy.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Anisotropy.mat
index 7baee50286c..5f9908b6269 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Anisotropy.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Anisotropy.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_ClearCoat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_ClearCoat.mat
index 1a1640a236f..5afd378a468 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_ClearCoat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_ClearCoat.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Diffusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Diffusion.mat
index 56cfcf7f6f8..b28d88e445a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Diffusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Diffusion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Iridescence.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Iridescence.mat
index 2eefacf9d60..8530d2b32c7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Iridescence.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Iridescence.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_SSS.mat
index f00f9d6643c..f086413c30f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_SSS.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Standard.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Standard.mat
index fca3816194c..2c1e84ca74d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Standard.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1800_Classification/Classification_Standard.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Shader Graphs_MaterialQualityTestShader.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Shader Graphs_MaterialQualityTestShader.mat
index e6fd196192a..7748e739a34 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Shader Graphs_MaterialQualityTestShader.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Shader Graphs_MaterialQualityTestShader.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -46,6 +58,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -89,4 +102,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/ShowCapture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/ShowCapture.mat
index aa154c6dbba..f80108537a6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/ShowCapture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/ShowCapture.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Post.mat
index bd9efc39b0a..58edd60b77d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre-Post.mat
index 3fcafd2db06..b789fcd546a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -192,6 +204,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre.mat
index 613df5e9a32..29ffe447a00 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Ref.mat
index 5e89bc36c0c..899adbef822 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit Tesselation/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Opaque.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Opaque.mat
index 0bceabd85ef..3b681ff28b9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Opaque.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Opaque.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Post.mat
index ed1e5cf33ac..0b004f609bb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre-Post.mat
index e8345e5a81a..e3a997e2e50 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre.mat
index f34ca62333d..364bec754c1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Ref.mat
index 091e2292626..e949ff8af82 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Transparent.mat
index b99d1e97183..c54f8edd39f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Lit/Transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Depth Write.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Depth Write.mat
index abfd4af8b15..ef67cb044de 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Depth Write.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Depth Write.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Opaque.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Opaque.mat
index 2ad9b57bb3f..bf21f5de057 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Opaque.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Opaque.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Ref.mat
index 2edd147521b..026998b7a54 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Transparent.mat
index fb46c2e8dcb..8aafbbc8630 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/HD Unlit/Transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat
index 97647a47fb8..709105e09f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat
index da440039210..8dd512e583a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat
index f427c3ffba3..b21eab5c56a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat
index 14a5f61cb8e..1d9a0f30454 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Post.mat
index 73ef102f06a..aede71b3929 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre-Post.mat
index a490a1b955d..38a331b6477 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre.mat
index c470412c0ab..cdda6d1e1f6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Ref.mat
index e0ce62e0088..77b80a5df51 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Fabric/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Post.mat
index b028f398f39..74ea99ba9d9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre-Post.mat
index 832ddd55055..17c1636bd46 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre.mat
index 718322f42a1..f3b0fc100ea 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Ref.mat
index 3da5332004b..6e49cc853a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Hair/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Post.mat
index df4fd1d8af0..6e6ed002dfb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,12 +23,12 @@ Material:
   m_Name: Post
   m_Shader: {fileID: -6465566751694194690, guid: eda3ce6a47bc9d74c80dfca81b9f9cb9,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -133,6 +133,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_8aef2607bf1d42e6b04f9839b49283de: 0
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre-Post.mat
index 1b6d31b1037..b8950d7be7b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,12 +23,12 @@ Material:
   m_Name: Pre-Post
   m_Shader: {fileID: -6465566751694194690, guid: eda3ce6a47bc9d74c80dfca81b9f9cb9,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -136,6 +136,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_8aef2607bf1d42e6b04f9839b49283de: 1
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre.mat
index d8c93aef3ce..e122b5b52c9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,12 +23,12 @@ Material:
   m_Name: Pre
   m_Shader: {fileID: -6465566751694194690, guid: eda3ce6a47bc9d74c80dfca81b9f9cb9,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -133,6 +133,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_8aef2607bf1d42e6b04f9839b49283de: 0
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Ref.mat
index 1e088a1cfa1..1b17bba8838 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Lit/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,12 +23,12 @@ Material:
   m_Name: Ref
   m_Shader: {fileID: -6465566751694194690, guid: eda3ce6a47bc9d74c80dfca81b9f9cb9,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_8aef2607bf1d42e6b04f9839b49283de: 0
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Post.mat
index b0eb543f06a..cf817b9a77d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre-Post.mat
index 8b1be5426d5..840343f44df 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre.mat
index acc34b02a2a..a0bd6e85ee6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Ref.mat
index 4f83c7457f6..ab217f15279 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG StackLit/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Post.mat
index bee549eccf1..b29dea93a15 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre-Post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre-Post.mat
index 6f2fc43ce63..14ffec97969 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre-Post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre-Post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre.mat
index d66a9230a0b..8e4d71b73d6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Ref.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Ref.mat
index 19e7383ac16..9d0cee09185 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Ref.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Unlit/Ref.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
index 7a05889795c..22275145277 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/1900_AlphaTestSG_Viewer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Background.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Background.mat
index 40fe564ef95..3b70ea80786 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Background.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Background.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Foreground.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Foreground.mat
index 0d83fc75a0f..f87c2e7033d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Foreground.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Foreground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat
index ff2be15a45f..edc295297b2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG.mat	
@@ -94,4 +94,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat
index 6667c9af988..90c42d56982 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent.mat	
@@ -95,4 +95,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat
index 32c54c4c88b..a0cfce962e2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_post.mat	
@@ -94,4 +94,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat
index 7a611bf9a70..66f1d33963a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_EyeSG_transparent_pre.mat	
@@ -95,4 +95,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat
index 6c857d9d822..fd4387532f4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat
index e1247d409ae..92d2c83515b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat
index 3c10015bccb..9be35b98180 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat
index 5b33e5d0e21..2ff9c02e6e3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_FabricSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat
index 19889353f95..ff0929ddb1e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat
index 5fa388b7e2a..2756c8a5030 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat
index 01f9a8699ec..122bd1c8e24 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat
index 729c4f1c9b8..8478d8e83b2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_HairSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat
index f0188616052..7b1a1585451 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG.mat	
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat
index 9aa6e1141fc..17f9f9350fd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent
   m_Shader: {fileID: -6465566751694194690, guid: 2ced2c0022d5e8947899635406a98151,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat
index 22cd8d85c07..fabf21d66e7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent_post
   m_Shader: {fileID: -6465566751694194690, guid: 924090ed89ad3b944b9cc4f7e7384344,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -66,6 +66,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -109,4 +110,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat
index 64ded01d7b3..14932aed84c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre.mat	
@@ -10,8 +10,8 @@ Material:
   m_Name: Shader Graphs_AlphaTest_HDRP_LitSG_transparent_pre
   m_Shader: {fileID: -6465566751694194690, guid: 2ced2c0022d5e8947899635406a98151,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -35,6 +35,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -98,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat
index 79848b8b0c7..7bc6a0703f0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat
index cba59c336aa..740c19cc143 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat
index f9b20f052df..9fd8890f854 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat
index cb58441358b..ec25ae6b9fa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_StackLitSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat
index d76b9559636..11bdc8cbef5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat
index c0bf2d40af7..34f49204529 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat
index aa14096d259..643b3f30a02 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_post.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat
index 616cfacee65..b54df81a9e4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/Materials/Shader Graphs_AlphaTest_HDRP_UnlitSG_transparent_pre.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Eye_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Eye_DepthOffset_SG.mat
index 87bb5d76752..8345e08c55c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Eye_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Eye_DepthOffset_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Fabric_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Fabric_DepthOffset_SG.mat
index 3aaefb58563..2502f1743bb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Fabric_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Fabric_DepthOffset_SG.mat
@@ -91,4 +91,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Hair_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Hair_DepthOffset_SG.mat
index 44636f2030c..f1c0605350b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Hair_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Hair_DepthOffset_SG.mat
@@ -91,4 +91,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset.mat
index 48ce247642f..f4b883f4ee0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_POM_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_POM_SG.mat
index e13e2216799..db8c91f8235 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_POM_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_POM_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: a21ed7427273e2341aeca814ccead81a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_302a676843e8477092326d61f24d1bd5: 0
     - Vector1_6ef03e2c251d48e3a3222303870cc7c2: 50
@@ -67,6 +79,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_SG.mat
index 3b327895004..e6f6fb17840 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Lit_DepthOffset_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: a21ed7427273e2341aeca814ccead81a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -63,6 +75,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/StackLit_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/StackLit_DepthOffset_SG.mat
index 20fe144880c..775c35c310d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/StackLit_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/StackLit_DepthOffset_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset.mat
index 20cd0195ce4..c9ac85ccec2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset.mat
@@ -270,4 +270,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset_SG.mat
index 33867c0ee55..a710738fe3b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1910_DepthOffset/Unlit_DepthOffset_SG.mat
@@ -86,4 +86,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/Reflective.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/Reflective.mat
index c6569c147b7..38ac1102bab 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/Reflective.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/Reflective.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/Materials/New Render Texture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/Materials/New Render Texture.mat
index f7aab65120d..a64abeb173e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/Materials/New Render Texture.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/Materials/New Render Texture.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/NYAN.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/NYAN.mat
index 440fff059ee..2fcdef0795b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/NYAN.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2004_AnimatedCookie/NYAN.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/ShowCapture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/ShowCapture.mat
index a1fa57eb704..2469d623af7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/ShowCapture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/ShowCapture.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2010_IES_Cookies/Materials/Walls4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2010_IES_Cookies/Materials/Walls4.mat
index 062e9d9b5ce..65f0967101f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2010_IES_Cookies/Materials/Walls4.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2010_IES_Cookies/Materials/Walls4.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue.mat
index 5c7543dcab9..365bd7eea8e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue_Transparent.mat
index ef06b82832e..007483d19cb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedGreenBlue_Transparent.mat
@@ -283,6 +283,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -434,6 +446,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -600,4 +620,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedMultiplier.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedMultiplier.mat
index 108cc7a00e6..7124934c11d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedMultiplier.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedMultiplier.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedTexture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedTexture.mat
index dc6a0625042..2f9363f0f95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedTexture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_TextureMask_RedTexture.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedGreenBlue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedGreenBlue.mat
index fbbed5ef392..70a286fce72 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedGreenBlue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedGreenBlue.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedMultiplier.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedMultiplier.mat
index 409f05c939c..99868879dbc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedMultiplier.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedMultiplier.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedTexture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedTexture.mat
index e8d303f5636..4c3921ce841 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedTexture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Layered_VertexColorMask_RedTexture.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
index 304bd8a629f..b08e77750b6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
index bc7fa2f5e9a..92e2b1d6bca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
@@ -116,6 +116,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -290,4 +304,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
index b001a592ae8..db89dc3af12 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
@@ -115,6 +115,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -289,4 +303,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_Transparent.mat
index 0f51ed6e6db..1ebc027cc86 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Green_Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Metallic.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Metallic.mat
index 8a03f4018bc..2f296ffdf5e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Metallic.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Metallic.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Specular.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Specular.mat
index aad5400195e..4b4cdd7301c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Specular.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_Mirror_Specular.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedMultiplier.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedMultiplier.mat
index f7ad763b5cb..7734796892a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedMultiplier.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedMultiplier.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedTexture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedTexture.mat
index 07554fcb91e..309bf0456be 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedTexture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_RedTexture.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_White.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_White.mat
index 0dfd6b31759..c97484cb61c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_White.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2101_GI_Metapass/Lit_White.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Floor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Floor.mat
index 497e4a04f13..ae60497f531 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Floor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Floor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_BakedEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_BakedEmission.mat
index 512789b41d7..b347c81f16c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_BakedEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_BakedEmission.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -294,6 +294,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -445,6 +457,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_RealtimeEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_RealtimeEmission.mat
index 1e3dc9311c1..e244d07969b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_RealtimeEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/LayeredLit_RealtimeEmission.mat
@@ -281,6 +281,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -432,6 +444,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -598,4 +618,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_BakedEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_BakedEmission.mat
index 07066d88283..55ee2d63452 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_BakedEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_BakedEmission.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_RealtimeEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_RealtimeEmission.mat
index 141a3f5d281..3847254983c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_RealtimeEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_RealtimeEmission.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_White.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_White.mat
index 2157fb2e02d..8defa1aef40 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_White.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Lit_White.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_BakedEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_BakedEmission.mat
index 9756d81b78e..f7337914015 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_BakedEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_BakedEmission.mat
@@ -232,4 +232,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_RealtimeEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_RealtimeEmission.mat
index b29ec788c92..aa5a7574709 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_RealtimeEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2102_GI_Emission/Unlit_RealtimeEmission.mat
@@ -232,4 +232,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Cyan.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Cyan.mat
index 30b85d047bb..dc9638930cc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Cyan.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Cyan.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Orange.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Orange.mat
index 5d5b9ae8847..09854b40025 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Orange.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2103_GI_BakeMixed/Emissive_Orange.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Ground static material.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Ground static material.mat
index f6ddcbbc24a..73d0d1a9ce4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Ground static material.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Ground static material.mat	
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Sphere instance material.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Sphere instance material.mat
index 825d786a3e1..89290ac1224 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Sphere instance material.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2104_GI_Instancing/Sphere instance material.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Dark.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Dark.mat
index f883674a535..cfd9b2fcdbe 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Dark.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Dark.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Layered.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Layered.mat
index a3070087f93..6fd5685f92d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Layered.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Layered.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Lit.mat
index f93dcf08953..0d3bda041e8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Lit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveFabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveFabric.mat
index 95ed927eaba..060c5d0d666 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveFabric.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveFabric.mat	
@@ -88,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveLit.mat
index 7461c69f1bb..eb499e1ab91 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveLit.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveLit.mat	
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -47,6 +59,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -90,4 +103,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissivePBR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissivePBR.mat
index d6b3100af4a..b4a0d223f95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissivePBR.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissivePBR.mat	
@@ -26,7 +26,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -47,6 +59,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -90,4 +103,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveStackLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveStackLit.mat
index 68b0439f261..061d64faf58 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveStackLit.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveStackLit.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveUnlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveUnlit.mat
index ed195049b9c..a6117ba5bdd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveUnlit.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2106_GI_EmissionSG/Shader Graphs_EmissiveUnlit.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Lit_UV.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Lit_UV.mat
index db10e7c46cc..cf86bda06ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Lit_UV.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Lit_UV.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/CUBE_T.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/CUBE_T.mat
index fde5fc4277b..b3f0d32ca3d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/CUBE_T.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/CUBE_T.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Cube.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Cube.mat
index e2f270d8599..06887d34601 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Cube.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Cube.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Metallic.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Metallic.mat
index f55cdfd2928..abfb7817b9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Metallic.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Metallic.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_MetallicAndSmooth.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_MetallicAndSmooth.mat
index bd67fbd0a03..c540033b333 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_MetallicAndSmooth.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_MetallicAndSmooth.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Smooth.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Smooth.mat
index 57c6e6be884..80d88c4e56e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Smooth.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Dark_Smooth.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Floor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Floor.mat
index 70ee2ec8eeb..00fc3f6cee6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Floor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Floor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Wall.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Wall.mat
index 49f7eb98ef2..366cab84269 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Wall.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2205_LightLoopCullWOblique/Wall.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedFlipMode.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedFlipMode.mat
index 48add1fde3b..9460c76558a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedFlipMode.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedFlipMode.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedMirrorMode.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedMirrorMode.mat
index 10343425b5f..87ff32dd04b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedMirrorMode.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedMirrorMode.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedNoneMode.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedNoneMode.mat
index 060b39cc6e4..75355c6ebb1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedNoneMode.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/DoubleSidedNoneMode.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/Mirror.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/Mirror.mat
index 107da630d73..894d2bc7834 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/Mirror.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/Mirror.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/White.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/White.mat
index acc4a42df97..f2745992821 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/White.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_ReflectionCulling/Material/White.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeIn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeIn.mat
index f4cf0f20af3..de108b26004 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeIn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeIn.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeOut.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeOut.mat
index 636d3e936d0..6198271543c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeOut.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/CubeOut.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarIn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarIn.mat
index d182afb8f5a..af390caf967 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarIn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarIn.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarOut.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarOut.mat
index 135c9d5abd8..011e67a3980 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarOut.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/PlanarOut.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalBlue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalBlue.mat
index 59f2c3087a6..fde68babe80 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalBlue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalBlue.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.982
+    - _MetallicRemapMax: 0.982
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalGreen.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalGreen.mat
index edd35d57719..48042bd5f33 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalGreen.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalGreen.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.982
+    - _MetallicRemapMax: 0.982
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalRed.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalRed.mat
index b41d831c295..d05fbbd36ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalRed.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2211_Probes_Specular/MetalRed.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.982
+    - _MetallicRemapMax: 0.982
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/M_MetallicRough.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/M_MetallicRough.mat
index 00d7577d3fa..f2aa8a15168 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/M_MetallicRough.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/M_MetallicRough.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -205,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2301_Shadow_Mask/TestCircle.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2301_Shadow_Mask/TestCircle.mat
index cbd6904f1cf..ec8da6f53a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2301_Shadow_Mask/TestCircle.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2301_Shadow_Mask/TestCircle.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2302_Shadow_Contact/Transmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2302_Shadow_Contact/Transmission.mat
index 84d5aba2cfd..81df1c91ca6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2302_Shadow_Contact/Transmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2302_Shadow_Contact/Transmission.mat
@@ -113,6 +113,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -190,6 +202,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -280,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2303_Shadow_Mask_Directional_OcclusionProbes/Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2303_Shadow_Mask_Directional_OcclusionProbes/Unlit.mat
index 2c7c3d264fe..2496803f2e6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2303_Shadow_Mask_Directional_OcclusionProbes/Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2303_Shadow_Mask_Directional_OcclusionProbes/Unlit.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2307_Shadow_VeryHigh/ShadowTestMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2307_Shadow_VeryHigh/ShadowTestMaterial.mat
index cd42e98ff31..be5806b37d0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2307_Shadow_VeryHigh/ShadowTestMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2307_Shadow_VeryHigh/ShadowTestMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2308_Microshadows/MicroShadowMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2308_Microshadows/MicroShadowMaterial.mat
index d75fe8faed5..7e3f4461cbd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2308_Microshadows/MicroShadowMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2308_Microshadows/MicroShadowMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2316_ShadowTint/M_DiffuseMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2316_ShadowTint/M_DiffuseMaterial.mat
index 2093655c926..9b89abfdfb9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2316_ShadowTint/M_DiffuseMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2316_ShadowTint/M_DiffuseMaterial.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_0.mat
index 8502a8a5322..f1cd76286f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_0.mat
@@ -276,4 +276,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_1.mat
index 7f9023b989a..d3d70829d1b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_1.mat
@@ -276,4 +276,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_2.mat
index ff0f2777dc3..f1d3d0f3c6f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_SLSmoothness_2.mat
@@ -276,4 +276,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_0.mat
index f73d7c293c5..1f260f648bc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_1.mat
index d14a439c401..4cf28fca546 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_2.mat
index de8cdb54d74..47907213408 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_2.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_3.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_3.mat
index fa25c600592..71709067cbc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_3.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_3.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_4.mat
index 862198851bd..dd12d41875f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_4.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2403_Area_TexturedRectLights/M_Smoothness_4.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/2505_LightLayers_Viewer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/2505_LightLayers_Viewer.mat
index 39b4a140a2d..0e5d7dbbd11 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/2505_LightLayers_Viewer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/2505_LightLayers_Viewer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingDisabled.mat
index 5f1c2e89953..a3603f946e0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingDisabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingDisabled.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -167,6 +167,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -259,6 +271,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingEnabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingEnabled.mat
index 6e0f317b364..a0a55432a72 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingEnabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2501_LightLayers/Default_GPUInstancingEnabled.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -167,6 +167,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -259,6 +271,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2502_LightLayers Bitmask/CastShadowTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2502_LightLayers Bitmask/CastShadowTransparent.mat
index 2ddef11e703..ee01bf6b2fe 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2502_LightLayers Bitmask/CastShadowTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2502_LightLayers Bitmask/CastShadowTransparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Mirror.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Mirror.mat
index 1d62722506c..fcf93c132e2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Mirror.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Mirror.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG.mat
index 4149bbda1da..d116788536f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_FEAE91CE: 0.5
     - _AORemapMax: 1
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG_NoSSR.mat
index 87d005dd242..225142b5313 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.5_SG_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_8C135DA1: 0.5
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG.mat
index 5d5bb93257f..a22dadebfff 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_FEAE91CE: 0.8
     - _AORemapMax: 1
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG_NoSSR.mat
index 6b6516f02bb..5b53bf6529a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.8_SG_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_8C135DA1: 0.5
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.mat
index 073dc302985..4c2290a638e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC.mat
index 629d9681fe3..4655497b635 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC_NoSSR.mat
index 0db9e73d5a5..9001bf437cd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0CC_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0_NoSSR.mat
index 4d029bda54f..869b0f9754b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough0_NoSSR.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC.mat
index 803556616ee..5afa9120b14 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC_NoSSR.mat
index c8ce78ebcad..a48661bde75 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1CC_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG.mat
index d779ef08a4a..be6e9d467ea 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_FEAE91CE: 1
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG_NoSSR.mat
index 2b74501f1a0..d1c3d73aa8d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough1_SG_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_8C135DA1: 1
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2.mat
index e23d7676ea0..0f05c78c298 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC.mat
index c2e1f810449..4fb269c5419 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC_NoSSR.mat
index f6008c929d2..9f5afd62d41 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough2CC_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5.mat
index 75ae107a23c..25d3a33065c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5_NoSSR.mat
index c2b6e435e3a..e9225c7d780 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.5_NoSSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8.mat
index 58deeaa9914..d30d99a5ef2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8_NoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8_NoSSR.mat
index 76fab42e93d..139d26bbff2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8_NoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2551_SSR/M_Rough_0.8_NoSSR.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorNoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorNoSSR.mat
index 66826d0643b..7685e929cf1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorNoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorNoSSR.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorSSR.mat
index 3e471c725da..8ce60a2f4a1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_OpaqueMirrorSSR.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorNoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorNoSSR.mat
index 274e8b107ec..6e753681922 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorNoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorNoSSR.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorSSR.mat
index 41da62ced1b..132e74bda3e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGOpaqueMirrorSSR.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -270,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorNoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorNoSSR.mat
index d5b915ced36..36083e41a83 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorNoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorNoSSR.mat
@@ -10,7 +10,7 @@ Material:
   m_Name: M_SGTransparentMirrorNoSSR
   m_Shader: {fileID: -6465566751694194690, guid: b990f945c5129f84bb8340a43e69b487,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_86DF1385: 0.5
     - _AORemapMax: 1
@@ -272,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorSSR.mat
index 9ba76e65518..38b32c586ba 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_SGTransparentMirrorSSR.mat
@@ -10,7 +10,7 @@ Material:
   m_Name: M_SGTransparentMirrorSSR
   m_Shader: {fileID: -6465566751694194690, guid: 1baa6ed8a8aeef24bb3a5abb93fcb2d5,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_28411918: 0.5
     - _AORemapMax: 1
@@ -272,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorNoSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorNoSSR.mat
index 2896ae12654..d7883dd53b5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorNoSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorNoSSR.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -268,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorSSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorSSR.mat
index 96a69a135bb..0bd710fbaa4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorSSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/LitMaterials/M_TransparentMirrorSSR.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -268,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseBlue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseBlue.mat
index 0a95b10cca8..027655d9c95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseBlue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseBlue.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGray.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGray.mat
index 5b71967bb4b..61b201ea9af 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGray.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGray.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGreen.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGreen.mat
index 0100dbf1335..675e2b511f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGreen.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseGreen.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseOrange.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseOrange.mat
index ba5b674a8de..a975b7ec9c3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseOrange.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseOrange.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseRed.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseRed.mat
index 93dd263c4ca..1daff230baa 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseRed.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/M_DiffuseRed.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3001_DebugView/SG_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3001_DebugView/SG_Lit.mat
index aef162b7a80..e22a389b9eb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3001_DebugView/SG_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3001_DebugView/SG_Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -38,7 +38,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -59,6 +71,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 1
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Diffuse.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Diffuse.mat
index b0e39e9547b..2b0b0d950cc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Diffuse.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Diffuse.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectDiffuse.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectDiffuse.mat
index 5ac21a3e593..cf7623ff049 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectDiffuse.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectDiffuse.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectSpecular.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectSpecular.mat
index 0408c92b8ad..ca11a23bbdf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectSpecular.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_DirectSpecular.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Emissive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Emissive.mat
index 3e218b9c1d0..d47939542f9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Emissive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Emissive.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_IndirectDiffuse.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_IndirectDiffuse.mat
index f11215832de..2fcc7f6b3d8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_IndirectDiffuse.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_IndirectDiffuse.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Input.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Input.mat
index dda5ecc88ed..ac1b634e6ed 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Input.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Input.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Reflection.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Reflection.mat
index 29c4c74c3b6..921784c6b83 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Reflection.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Reflection.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Refraction.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Refraction.mat
index 758fb039ad5..20679669c39 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Refraction.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Refraction.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Specular.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Specular.mat
index f19d288b5fc..ddd0d3d7c76 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Specular.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/LightingModeUnlit_Specular.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Chrome.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Chrome.mat
index e55f6b88042..639f073ee9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Chrome.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Chrome.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive 1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive 1.mat
index 18e23424f20..27b49a52c33 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive 1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive 1.mat	
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.524
+    - _MetallicRemapMax: 0.524
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive.mat
index 08fad31d832..f148c70b813 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Emissive.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Fabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Fabric.mat
index dd6e376152d..6f788168e1d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Fabric.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Fabric.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Ground.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Ground.mat
index 6ce0ce61bc6..53df71a126b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Ground.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Ground.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert 1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert 1.mat
index 757e1348aea..4ee048e6c93 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert 1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert 1.mat	
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert.mat
index 007f5ec577c..b3eea43ca8a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Lambert.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/LitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/LitSG.mat
index fd32ab8ed90..d81b1f76031 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/LitSG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/LitSG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Refraction.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Refraction.mat
index 4a0eafb99a1..6b8e08457d4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Refraction.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/Refraction.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/SSS.mat
index 50d8853af96..d3a9bb617d2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/SSS.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 4.19
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent Add.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent Add.mat
index cfcd136babd..60cc7a2732d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent Add.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent Add.mat	
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent.mat
index 42644ad253d..34cc872fe50 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/3x_DebugView/3003_LightingMode/Material/transparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -266,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmission.mat
index d4e53682ca3..fb0b3dc05cd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmission.mat
@@ -194,7 +194,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -279,4 +280,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmissionGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmissionGraph.mat
index f7db0fcae1c..37a28aaa48b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmissionGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalEmissionGraph.mat
@@ -322,4 +322,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalExposureNodeGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalExposureNodeGraph.mat
index cb53bb29f55..56023bc9df1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalExposureNodeGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalExposureNodeGraph.mat
@@ -81,4 +81,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalReceiver.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalReceiver.mat
index 22f13b3e2a9..ba2b8caea48 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalReceiver.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/DecalReceiver.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/FabricEmissionGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/FabricEmissionGraph.mat
index 7ac80a98687..edd14ea66ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/FabricEmissionGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/FabricEmissionGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmission.mat
index 393ca36092e..695ae05c8f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmission.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -287,6 +287,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -451,6 +463,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmissionWeight.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmissionWeight.mat
index a7d16b5f52a..79962c491dc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmissionWeight.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LayeredLitEmissionWeight.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -287,6 +287,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -451,6 +463,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmission.mat
index 1244946a02c..6ce9511fb06 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmission.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_CurrentGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_CurrentGraph.mat
index 3565f76f99a..dab89e0b592 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_CurrentGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_CurrentGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InverseCurrentGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InverseCurrentGraph.mat
index 29959d5de43..e2e9fb313ab 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InverseCurrentGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InverseCurrentGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InversePreviousGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InversePreviousGraph.mat
index 20734688792..0aee8c44de1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InversePreviousGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_InversePreviousGraph.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_PreviousGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_PreviousGraph.mat
index f2e1b4ae89d..831873fb55e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_PreviousGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionExposureNode_PreviousGraph.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionGraph.mat
index 392aa239f9c..d362af4145c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_633D9349: 15
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionLess.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionLess.mat
index ce9c09a0d7a..71db169582b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionLess.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionLess.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionWeight.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionWeight.mat
index 2d05b7db731..98151b7b4c0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionWeight.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/LitEmissionWeight.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/PBREmissionGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/PBREmissionGraph.mat
index f1d3a869d43..b97f2538a0d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/PBREmissionGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/PBREmissionGraph.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_C363333C: 5
     - _AORemapMax: 1
@@ -279,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/StackLitEmissionGraph.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/StackLitEmissionGraph.mat
index 9e427013882..c76bd278707 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/StackLitEmissionGraph.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/StackLitEmissionGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmission.mat
index 02ab76cba91..1410eddde24 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmission.mat
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmissionWeight.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmissionWeight.mat
index 3382d3d8d93..004db86745d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmissionWeight.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4001_Exposure/UnLitEmissionWeight.mat
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Blue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Blue.mat
index ec13c16d790..cc20f0831fe 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Blue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Blue.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Green.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Green.mat
index d1534bce0c0..0c4295e6ad1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Green.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Green.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Red.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Red.mat
index 1c367118f61..899ee7d09a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Red.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/M_Red.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/HDRP_Lit_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/HDRP_Lit_TransparentWithMotionVector.mat
index 891bc101d0b..775d3a52fd7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/HDRP_Lit_TransparentWithMotionVector.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/HDRP_Lit_TransparentWithMotionVector.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Eye_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Eye_TransparentWithMotionVector.mat
index 7e7cca23c50..b96e1c6d499 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Eye_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Eye_TransparentWithMotionVector.mat	
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Fabric_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Fabric_TransparentWithMotionVector.mat
index 037c5073a29..c7a1007a8e5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Fabric_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Fabric_TransparentWithMotionVector.mat	
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Hair_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Hair_TransparentWithMotionVector.mat
index b375696169a..bb1141f6744 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Hair_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Hair_TransparentWithMotionVector.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Lit_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Lit_TransparentWithMotionVector.mat
index ea346044db9..3ab2265d545 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Lit_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Lit_TransparentWithMotionVector.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_SG_Lit_TransparentWithMotionVector
   m_Shader: {fileID: -6465566751694194690, guid: c4f7858a973b8b64caa14c19c4ac2777,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT _TRANSPARENT_WRITES_MOTION_VEC
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -61,6 +73,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_StackLit_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_StackLit_TransparentWithMotionVector.mat
index 05ec26f71bb..5eaaf6c2c59 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_StackLit_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_StackLit_TransparentWithMotionVector.mat	
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Unlit_TransparentWithMotionVector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Unlit_TransparentWithMotionVector.mat
index f9cedb81f61..60b395c1ab8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Unlit_TransparentWithMotionVector.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4013_TransparentMotionVector/Shader Graphs_SG_Unlit_TransparentWithMotionVector.mat	
@@ -91,4 +91,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/AxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/AxF.mat
index 22caf0dbf04..bb7482371ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/AxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/AxF.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Lit.mat
index 196294aca07..9a1fc541b84 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -196,6 +208,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/LitTessellation.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/LitTessellation.mat
index 0216f9eaf5f..f3c1306920f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/LitTessellation.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/LitTessellation.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: e5cebb481c87de042bd3b76f435ba0c6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -279,4 +293,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_EyeSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_EyeSG.mat
index adc56fb761e..68a5b6c40a1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_EyeSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_EyeSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_FabricSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_FabricSG.mat
index 021debbfb5f..56a5a3400e8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_FabricSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_FabricSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_HairSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_HairSG.mat
index 6d260e3d22c..e7d4a33d451 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_HairSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_HairSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_LitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_LitSG.mat
index 5109d09664c..149eb9da98b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_LitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_LitSG.mat	
@@ -33,6 +33,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: c61c1ad5c118ebd42be91209e264eed0, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 1
     - _AlphaCutoffEnable: 0
@@ -53,6 +65,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -96,4 +109,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_StackLitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_StackLitSG.mat
index 8c4674ffdfe..4a1736de856 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_StackLitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_StackLitSG.mat	
@@ -96,4 +96,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_UnlitSG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_UnlitSG.mat
index 486a49710ef..3dda01af7b9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_UnlitSG.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Shader Graphs_UnlitSG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Unlit.mat
index 1baf82844e7..804e8b98e4b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/Unlit.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/UnlitBuiltin.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/UnlitBuiltin.mat
index 24e8320e468..1a51bb3a8a2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/UnlitBuiltin.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/UnlitBuiltin.mat
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection/TilingGrid.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection/TilingGrid.mat
index 4c8b205b5d4..b944f618cc6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection/TilingGrid.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4022_PaniniProjection/TilingGrid.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4023_VignetteClassic/TilingGrid.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4023_VignetteClassic/TilingGrid.mat
index edb5f21d6e3..dbb93bbc80e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4023_VignetteClassic/TilingGrid.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4023_VignetteClassic/TilingGrid.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA/DisplayRTT_8bit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA/DisplayRTT_8bit.mat
index e529045e6a2..4e0c8621e8b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA/DisplayRTT_8bit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4052_TAA/DisplayRTT_8bit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha/DisplayRTT.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha/DisplayRTT.mat
index 12a4a2994d9..77c811421b8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha/DisplayRTT.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4053_TAA-FP16Alpha/DisplayRTT.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess/Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess/Transparent.mat
index bb2adab6b5c..0231dc7fce7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess/Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4060_CustomPostProcess/Transparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Gradient.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Gradient.mat
index 1ce3b7e9eb0..1f857890c9e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Gradient.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Gradient.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Viewer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Viewer.mat
index 88f40888d00..60b8a3d176d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Viewer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4070_PhysicalCamera-iso-aperture-shutter/4070_Viewer.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Gradient.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Gradient.mat
index dd2d04d231d..cb2829f1987 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Gradient.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Gradient.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Viewer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Viewer.mat
index 2e9423adc75..09b6881cdd9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Viewer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4071_PhysicalCamera-ApertureShape/4071_Viewer.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField/SphereMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField/SphereMaterial.mat
index 571695ee7bf..16cc313df84 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField/SphereMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4080_DepthOfField/SphereMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha/DisplayRTTForDoF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha/DisplayRTTForDoF.mat
index 390e4cf9a6b..241654e0bcf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha/DisplayRTTForDoF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4081_DepthOfField-FP16Alpha/DisplayRTTForDoF.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/MultiCamDisplay.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/MultiCamDisplay.mat
index 0a44c62df91..6b004e24e5e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/MultiCamDisplay.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/MultiCamDisplay.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes/Floor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes/Floor.mat
index 41abc102334..11326f9d9ef 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes/Floor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5002_Fog_DensityVolumes/Floor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog1.mat
index 630c54de3e0..ec2d4502ed8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog1.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog2.mat
index e59dbf1c26f..b9ba7f571ef 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog3.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog3.mat
index 4aeed6dc8f6..f67a7018adc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog3.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog3.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog4.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog4.mat
index b2b42cffbc0..e923576714f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog4.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog4.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog5.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog5.mat
index 5b02a10d95d..0ac95ff148e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog5.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog5.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog6.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog6.mat
index 339babaf1bf..be054b2aa01 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog6.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5007_ExponentialFog/5007_NoFog6.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AlphaCutoff.mat
index 4cf2601a12b..503144b2d53 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AlphaCutoff.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -279,4 +293,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AmbientOcclusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AmbientOcclusion.mat
index 5e3ae41080b..da8931c0156 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AmbientOcclusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AmbientOcclusion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.35
+    - _MetallicRemapMax: 0.35
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AnisoTangent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AnisoTangent.mat
index 6bd30e286c1..b94621994b1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AnisoTangent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_AnisoTangent.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Enabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Enabled.mat
index c0bda281c2f..09294e1e5b7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Enabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Enabled.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Flipped.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Flipped.mat
index b370f264f18..b423b774b79 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Flipped.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_Flipped.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_MirroredSpec.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_MirroredSpec.mat
index 120f75f4a2d..240e678b626 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_MirroredSpec.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_MirroredSpec.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_None.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_None.mat
index 489e63167ec..0e6f1ab6c3b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_None.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_DS_None.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.9
+    - _MetallicRemapMax: 0.9
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_GSAA.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_GSAA.mat
index 3abd58d3162..f68f43536af 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_GSAA.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_GSAA.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.75
+    - _MetallicRemapMax: 0.75
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.25
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideBentNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideBentNormal.mat
index 1f4abc470da..20bfcbf1e44 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideBentNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideBentNormal.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0.35
+    - _MetallicRemapMax: 0.35
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -278,4 +292,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideMask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideMask.mat
index f25958c2407..756858ceafe 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideMask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideMask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideSpecOcclusionBentNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideSpecOcclusionBentNormal.mat
index a59c488ca74..c571064800f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideSpecOcclusionBentNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_IrideSpecOcclusionBentNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 0.35
+    - _MetallicRemapMax: 0.35
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_ShinyStone.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_ShinyStone.mat
index c1f95f2a300..c4514a8cab8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_ShinyStone.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_ShinyStone.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0.291
+    - _MetallicRemapMax: 0.291
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -278,4 +292,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_Standard.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_Standard.mat
index 12e0fc6af6e..dcfc25dae95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_Standard.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_Standard.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.1
+    - _MetallicRemapMax: 0.1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_SubSurface.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_SubSurface.mat
index e41e7ce0a2c..b8230760c4d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_SubSurface.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_SubSurface.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_TransNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_TransNormal.mat
index dc95241f135..07e3f498dee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_TransNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/BI_TransNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/FrontCulling.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/FrontCulling.mat
index bc2cd864b83..a6269dcf42a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/FrontCulling.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/FrontCulling.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -269,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/OP_BentNormalFrontCull.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/OP_BentNormalFrontCull.mat
index 6e16fbe5f67..2e697272e27 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/OP_BentNormalFrontCull.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/OP_BentNormalFrontCull.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2475
   stringTagMap:
     MotionVector: User
     RenderType: TransparentCutout
@@ -47,6 +47,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 11f3a6ad0f4d5f241b56e0f647f9d275, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_5DAD63CC: 0.95
     - Vector1_9F784B29: 0.35
@@ -70,6 +82,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AO.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AO.mat
index c6469191a48..5378a3e7a4c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AO.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AO.mat
@@ -37,6 +37,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: f4cdd55f297172544a3762c656528dd0, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -60,6 +72,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -103,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AlphaCutoff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AlphaCutoff.mat
index a9b8060a395..04000ca75c1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AlphaCutoff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AlphaCutoff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -51,6 +51,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 1e2066dc70dcdee45a412223aef3e444, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_3C23F346: 0.5
     - _AddPrecomputedVelocity: 0
@@ -75,6 +87,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AnisoTangent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AnisoTangent.mat
index 97e6d1e7705..b73f63f3ad3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AnisoTangent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_AnisoTangent.mat
@@ -37,6 +37,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -59,6 +71,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 0.5
@@ -103,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_Enabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_Enabled.mat
index 1aa591f1c59..a49ca66a492 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_Enabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_Enabled.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_52486F46: 0.9
     - Vector1_62A190C8: 0.9
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_MirroredSpec.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_MirroredSpec.mat
index e38b82d7841..f51a0e1d545 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_MirroredSpec.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_MirroredSpec.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_52486F46: 0.5
     - Vector1_BEAFB0DB: 0.6
@@ -275,4 +287,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_None.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_None.mat
index 65131039cd4..c070dca1565 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_None.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_DS_None.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_52486F46: 0.9
     - Vector1_BEAFB0DB: 0.1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_GSAA.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_GSAA.mat
index 1ca26340bc0..f76716a813e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_GSAA.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_GSAA.mat
@@ -29,6 +29,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: f4cdd55f297172544a3762c656528dd0, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_94EF1A0C: 0.95
     - Vector1_A20A5B58: 0.95
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 1
@@ -101,4 +114,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormal.mat
index 321d37674f2..ea3c51374c3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -46,6 +46,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 11f3a6ad0f4d5f241b56e0f647f9d275, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_5DAD63CC: 0.95
     - Vector1_9F784B29: 0.35
@@ -70,6 +82,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormalSpecularOcclusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormalSpecularOcclusion.mat
index 8756b7cc8fd..31f7abd5542 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormalSpecularOcclusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideBentNormalSpecularOcclusion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -46,6 +46,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 11f3a6ad0f4d5f241b56e0f647f9d275, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_5DAD63CC: 0.95
     - Vector1_9F784B29: 0.35
@@ -70,6 +82,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideMask.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideMask.mat
index 8f1e64d1c37..20ef0a5ae70 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideMask.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_IrideMask.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -58,6 +58,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: b282de7a2385d804b83dcf8d63ecc34a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_8776B5DB: 1
     - _AddPrecomputedVelocity: 0
@@ -83,6 +95,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 0.1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_OpaqueFrontCullModeSSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_OpaqueFrontCullModeSSS.mat
index 53f0d691c49..6b08e8b2cd7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_OpaqueFrontCullModeSSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_OpaqueFrontCullModeSSS.mat
@@ -41,7 +41,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
@@ -63,6 +75,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 1
     - _SrcBlend: 1
@@ -108,4 +121,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_ShinyStone.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_ShinyStone.mat
index 450515b6241..118b823c94e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_ShinyStone.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_ShinyStone.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -139,6 +139,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_Standard.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_Standard.mat
index 23a3220246f..cdd7b5bc1eb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_Standard.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_Standard.mat
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6FBBC830: 0.5
     - Vector1_7BCB95F2: 0.5
@@ -305,4 +317,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_SubSurface.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_SubSurface.mat
index fa03a99e36b..ed8a2bffe73 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_SubSurface.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_SubSurface.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_3DA9F0F1: 1
     - Vector1_6FBBC830: 0.5
@@ -282,4 +294,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_TransNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_TransNormal.mat
index 31c31d62525..14733f7a503 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_TransNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8101_Opaque/SG_TransNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -46,6 +46,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -71,6 +83,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 0.1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BG.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BG.mat
index dd3b7a93eda..66054f419b0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BG.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BG.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3dd789714c4d7ef4ba0dd0d92fb66905, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Additive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Additive.mat
index ae86a26a86e..0f3dbaa5d61 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Additive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Additive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Alpha.mat
index eb5fc1b32ee..a1949aa5797 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Alpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BackThenFront.mat
index 02cae4e8e2b..69e3a176d66 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BackThenFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BackThenFront.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOff.mat
index 8346177a132..89d8f9bced6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOff.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOn.mat
index a2cfc7f76a0..37b6a188593 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_BlendPerserveSpecularOn.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -203,6 +215,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 4
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionMultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionMultiply.mat
index da2058e7d04..f90e0f7664d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionMultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionMultiply.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionSimpleAdd.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionSimpleAdd.mat
index 821d08a652e..ba9b9a6480c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionSimpleAdd.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionSimpleAdd.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMap.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMap.mat
index a1a08a42be2..0a0f2825ce6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMap.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMap.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapDepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapDepthTest.mat
index f8559b40c81..c25031a743d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapDepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapDepthTest.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapNoDepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapNoDepthTest.mat
index 59e2eb38488..3c43121bad7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapNoDepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_DistortionVectorMapNoDepthTest.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_FogOn0.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_FogOn0.mat
index ed50ad2aa58..812bdf1d5bd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_FogOn0.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_FogOn0.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.2
+    - _MetallicRemapMax: 0.2
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PostPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PostPass.mat
index 94aef33e134..f82248aad12 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PostPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PostPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PrePass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PrePass.mat
index b3f746e5117..82840114fbb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PrePass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_PrePass.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -278,4 +292,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Premultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Premultiply.mat
index f8aac4a0b3e..cc1676a11ac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Premultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_Premultiply.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0.5
+    - _MetallicRemapMax: 0.5
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneHiZNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneHiZNormal.mat
index c84fcf8dd59..615921a4292 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneHiZNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneHiZNormal.mat
@@ -121,6 +121,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -202,6 +214,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -299,4 +313,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneProxy.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneProxy.mat
index 0fdfbe00c06..18a61be8b48 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneProxy.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionPlaneProxy.mat
@@ -120,6 +120,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -298,4 +312,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereHiZ.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereHiZ.mat
index 05310cfb239..bd4bbf3ffff 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereHiZ.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereHiZ.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -215,6 +227,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereProxy.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereProxy.mat
index c0510bf6ed1..4cdb5485179 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereProxy.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/BI_RefractionSphereProxy.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -134,6 +134,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -215,6 +227,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Additive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Additive.mat
index 287837fefcf..570537ce130 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Additive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Additive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_Additive
   m_Shader: {fileID: 4800000, guid: fc2c98b073232f94eaf96a78e756e847, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ADD _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -132,6 +132,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1EC2602A: 0.5
     - Vector1_A6D4BDE2: 0.5
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Alpha.mat
index d4d980cd62f..cb457b0d849 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Alpha.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_Alpha
   m_Shader: {fileID: 4800000, guid: 2ed62fccf800a864bbaa23bf28a93893, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -115,6 +115,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1EC2602A: 0.5
     - Vector1_A6D4BDE2: 0.5
@@ -275,4 +287,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BackThenFront.mat
index 9edd1625dca..b3c5273512c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BackThenFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BackThenFront.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,12 +22,11 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_BackThenFront
   m_Shader: {fileID: 4800000, guid: 738260c0c8503b74db5e12d6fa56160d, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -43,13 +42,25 @@ Material:
         m_Texture: {fileID: 2800000, guid: d3812d3d9a8e6234fb84cc84098d3a5f, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_52486F46: 0.5
     - Vector1_BEAFB0DB: 0.5
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
     - _AlphaDstBlend: 10
-    - _AlphaSrcBlend: 0
+    - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
     - _AlphaToMaskInspectorValue: 0
     - _BlendMode: 0
@@ -65,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOff.mat
index 412009cff50..4c15fc412b7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOff.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_BlendPerserveSpecularOff
   m_Shader: {fileID: 4800000, guid: 7d7e3e3d8a432f34e9c352247a46239d, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -38,6 +38,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 0769e183a8a7eb848820da25b0df052b, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_41C5C4B1: 0.3
     - _AddPrecomputedVelocity: 0
@@ -60,6 +72,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -104,4 +117,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOn.mat
index f87d6ce1931..70dae542ee9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_BlendPerserveSpecularOn.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,8 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_BlendPerserveSpecularOn
   m_Shader: {fileID: 4800000, guid: d2f7622176f18ca48adc675f04b91787, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS
-    _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -84,6 +84,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -115,6 +127,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SmoothnessTextureChannel: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionMultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionMultiply.mat
index 0525c1a5789..03e99d7a933 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionMultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionMultiply.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_DistortionMultiply
   m_Shader: {fileID: 4800000, guid: 3f024a525123c15418bd06468180775e, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -38,7 +38,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2448F057: 0.5
     - Vector1_30CF8A67: 100
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionSimpleAdd.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionSimpleAdd.mat
index 6e4c02ba634..a340c545822 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionSimpleAdd.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionSimpleAdd.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_DistortionSimpleAdd
   m_Shader: {fileID: 4800000, guid: b13e693e4ab7ce04cbe9575ba2d8cdf1, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -25,7 +25,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2038AEEA: 0.36
     - _AddPrecomputedVelocity: 0
@@ -48,6 +60,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -92,4 +105,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMap.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMap.mat
index 6c095de5979..6a3291d92fc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMap.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMap.mat
@@ -9,8 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_DistortionVectorMap
   m_Shader: {fileID: 4800000, guid: 91c8b35cf25ced04da970874cfa4977f, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS
-    _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -31,6 +31,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 8a524d2e50a5e414fb8faffbfd1000bb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2D036B32: 1
     - Vector1_6B0C14DF: 1
@@ -54,6 +66,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -97,4 +110,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapDepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapDepthTest.mat
index e452ce1cff0..73c62776a0d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapDepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapDepthTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_DistortionVectorMapDepthTest
   m_Shader: {fileID: 4800000, guid: 9c8c243d7a3586b4f9b05a702dddfedc, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ADD _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 8a524d2e50a5e414fb8faffbfd1000bb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2D036B32: 0.5
     - Vector1_6B0C14DF: 200
@@ -66,6 +78,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapNoDepthTest.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapNoDepthTest.mat
index 310b75036bd..954dc43d96c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapNoDepthTest.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_DistortionVectorMapNoDepthTest.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,8 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_DistortionVectorMapNoDepthTest
   m_Shader: {fileID: 4800000, guid: 91c8b35cf25ced04da970874cfa4977f, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS
-    _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -44,6 +44,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 8a524d2e50a5e414fb8faffbfd1000bb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2D036B32: 0.5
     - Vector1_6B0C14DF: 200
@@ -67,6 +79,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_FogOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_FogOn.mat
index 0b519e65bc1..715b68834dc 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_FogOn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_FogOn.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_FogOn
   m_Shader: {fileID: 4800000, guid: 38047697ebc6ac14c9eedde488783065, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
     _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -39,7 +39,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -61,6 +73,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PostRefraction.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PostRefraction.mat
index 5f7ba325181..ebfd27b7e0f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PostRefraction.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PostRefraction.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_PostRefraction
   m_Shader: {fileID: 4800000, guid: 99259a56c1ccc144e9c032a9e9de8b51, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -38,7 +38,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -60,6 +72,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PreRefraction.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PreRefraction.mat
index 2c9bfcf930e..f84a6f00794 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PreRefraction.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_PreRefraction.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_PreRefraction
   m_Shader: {fileID: 4800000, guid: ac72badfaa3749f45bb32973961ad823, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -38,7 +38,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -60,6 +72,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 3
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Premultiply.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Premultiply.mat
index 19701d6ce6c..b910d24c5a7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Premultiply.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_Premultiply.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,8 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_Premultiply
   m_Shader: {fileID: 4800000, guid: 1558b8fce4a360c40928e686b19d4017, type: 3}
-  m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
-    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
+    _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -132,6 +132,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1EC2602A: 0.5
     - Vector1_A6D4BDE2: 0.5
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneHiZNormal.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneHiZNormal.mat
index 7a7d11ea044..a8d30baeb00 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneHiZNormal.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneHiZNormal.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_RefractionPlaneHiZNormal
   m_Shader: {fileID: 4800000, guid: 06c613a2a7b19444a99d697c69336cc8, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 15406398b0743054eac639fbfeb2cc32, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_C1D4B96B: 1
     - _AddPrecomputedVelocity: 0
@@ -65,6 +77,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 1
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneProxy.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneProxy.mat
index cebce58676b..70e4cab5b98 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneProxy.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionPlaneProxy.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_RefractionPlaneProxy
   m_Shader: {fileID: 4800000, guid: 934c5655a74dd054f8e53f86de97f5fe, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _REFRACTION_PLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -64,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 1
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereHiZ.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereHiZ.mat
index bbde7cac0ff..719e58570ce 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereHiZ.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereHiZ.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_RefractionSphereHiZ
   m_Shader: {fileID: 4800000, guid: b2476b8b8ee0f7646b6474132116322b, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -51,6 +51,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -72,6 +84,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereProxy.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereProxy.mat
index ded0e7350a0..b9bd78ebf2d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereProxy.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8102_Transparent/SG_RefractionSphereProxy.mat
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_RefractionSphereProxy
   m_Shader: {fileID: 4800000, guid: 0a1015fc86eab484fbd0e2ca894005c5, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _REFRACTION_SPHERE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -34,6 +34,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -55,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 2
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -99,4 +112,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/Materials/PrePassRT.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/Materials/PrePassRT.mat
index ce0096c25ed..5cfd2985c11 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/Materials/PrePassRT.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/Materials/PrePassRT.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPass.mat
index 9128efd532b..e0867289186 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPass.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -189,6 +201,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassColor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassColor.mat
index 7d8ebae487e..194dac1db13 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassColor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassColor.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassRed.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassRed.mat
index 8c48bd36fdc..563325dc4fd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassRed.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PostPassRed.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass.mat
index 77c96b91f61..0997f8c9bf9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -276,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass2.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass2.mat
index a0b2497791c..118d25e5d7f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass2.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePass2.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -130,6 +130,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_D4C3882B: 0.3
     - Vector1_FE430A52: 0.7
@@ -209,6 +221,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassGreen.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassGreen.mat
index 871bd5e05e8..1ba584ef61b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassGreen.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassGreen.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -278,4 +290,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassRT.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassRT.mat
index fd66e6f2d3c..2d1592b6012 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassRT.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/PrePassRT.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PostPass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PostPass.mat
index f8283e5a834..3bdd1968b95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PostPass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PostPass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,8 +23,8 @@ Material:
   m_Name: SG_PostPass
   m_Shader: {fileID: -6465566751694194690, guid: ff2fd7a424eacdd46a11b107e96ee671,
     type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-    _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+    _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_BF269F70: 0.25
     - _AORemapMax: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass 1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass 1.mat
index 4e5a8cb242d..f111f481846 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass 1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,12 +22,11 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_PrePass 1
   m_Shader: {fileID: 4800000, guid: e162a55de287e2343878fe6397ddc837, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
     MotionVector: User
     RenderType: Transparent
@@ -43,6 +42,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 5cdcdac90602a5d409b9f4beadfb0369, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_11C8AC02: 0.5
     - Vector1_75F0A2CE: 0.375
@@ -51,7 +62,7 @@ Material:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 1
     - _AlphaDstBlend: 10
-    - _AlphaSrcBlend: 0
+    - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
     - _AlphaToMaskInspectorValue: 0
     - _BlendMode: 0
@@ -67,6 +78,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass.mat
index ff13056795e..3c914c63f7f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePass.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -22,8 +22,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_PrePass
   m_Shader: {fileID: 4800000, guid: e162a55de287e2343878fe6397ddc837, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -43,6 +42,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 2e21bb4961425e543a4cdc09cdc94d2e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_11C8AC02: 0.5
     - Vector1_75F0A2CE: 0.375
@@ -68,6 +79,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePassDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePassDisabled.mat
index a6e4e3b36a9..a76fbdfeff1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePassDisabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8103_PrePostPass/SG_PrePassDisabled.mat
@@ -9,8 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: SG_PrePassDisabled
   m_Shader: {fileID: 4800000, guid: 64a2356af187b7a43b07329a2f5c4e1b, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _ALPHATEST_ON _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -31,6 +30,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 2e21bb4961425e543a4cdc09cdc94d2e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_11C8AC02: 0.5
     - Vector1_75F0A2CE: 0.375
@@ -56,6 +67,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -100,4 +112,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClip.mat
index 839d48ee72f..81631775f88 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClip.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClip.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSided.mat
index 57b21a2f0d4..18f11bf2b79 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSided.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSided.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSidedTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSidedTransparent.mat
index 9083e538734..33dcdfb90e9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSidedTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitAlphaClipDoubleSidedTransparent.mat
@@ -149,4 +149,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAdditive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAdditive.mat
index 03ea2cfd3da..47fbf1bae1a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAdditive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAdditive.mat
@@ -149,4 +149,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAlpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAlpha.mat
index 189897f980b..4350731bf2f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAlpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendAlpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendPremult.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendPremult.mat
index ea88a880516..e9988f8cc45 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendPremult.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitBlendPremult.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitYellow.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitYellow.mat
index e59acf9b0d5..ae8a320e505 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitYellow.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BI_UnlitYellow.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BackgroundHoleQuad.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BackgroundHoleQuad.mat
index a577b0762c8..b4508102a7a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BackgroundHoleQuad.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/BackgroundHoleQuad.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAdditive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAdditive.mat
index b97e40ef02b..c9e84192e6f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAdditive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAdditive.mat
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlpha.mat
index 6d6f7b2b11d..c41a7bf2717 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphablendAlphaclipDoublesided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphablendAlphaclipDoublesided.mat
index 933f27514bc..c19e375015a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphablendAlphaclipDoublesided.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphablendAlphaclipDoublesided.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclip.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclip.mat
index 6c2bd7b1a7d..042c91ebd2a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclip.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclip.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclipDoublesided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclipDoublesided.mat
index 4068b7ea2c9..57e339a2c85 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclipDoublesided.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitAlphaclipDoublesided.mat
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitPremult.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitPremult.mat
index 07afeb018b8..c532cd22908 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitPremult.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitPremult.mat
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitYellow.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitYellow.mat
index 3f1b85a1941..5e20f4f598b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitYellow.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8104_Unlit/SG_UnlitYellow.mat
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/BlendStateRenderTexture.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/BlendStateRenderTexture.mat
index e9d85fcead1..b703a4ed506 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/BlendStateRenderTexture.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/BlendStateRenderTexture.mat
@@ -111,4 +111,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBack.mat
index 1aa25f431d7..e386b034ade 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBack.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBack.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBackZTestGreater.mat
index c0e37c5ea60..8d381d3cb2c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBackZTestGreater.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullBackZTestGreater.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFront.mat
index 3c06ea759a0..b5694900767 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFront.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFrontEqual.mat
index d2b3b535492..265bd9fcc6b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFrontEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphCullFrontEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphDoubleSided.mat
index 321a10784d5..5afbf099d77 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphDoubleSided.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphDoubleSided.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestAlways.mat
index 5078b8e3845..ea41dae9336 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestAlways.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestAlways.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestDisabled.mat
index 7b537a86788..bc2ca3b97ac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestDisabled.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestDisabled.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestLessEqual.mat
index 741d967ad2a..6f82e1ce053 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestLessEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestNeverBackThenFront.mat
index 4dd88c08ac5..8cab0690aca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestNeverBackThenFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZTestNeverBackThenFront.mat	
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteGreaterEqual.mat
index 650a4983349..dc5428f7210 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteGreaterEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteGreaterEqual.mat	
@@ -94,4 +94,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteLessEqual.mat
index 53819822ea9..01382cde07a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteLessEqual.mat	
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOff.mat
index c1f34d1540e..6da220d795a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOff.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOn.mat
index 8d4a91ee4a6..d2780aabf28 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOn.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOn.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnAlpha1.mat
index 6193171ecef..e06a14dd7fb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnAlpha1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnAlpha1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnTransparent.mat
index c0025e8d915..1e8f09147c4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/FabricGraph/Shader Graphs_FabricGraphZWriteOnTransparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBack.mat
index ac6ec634741..b20302655da 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBack.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBack.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBackZTestGreater.mat
index aa409927a0f..a814acbce0a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBackZTestGreater.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullBackZTestGreater.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFront.mat
index 2be795891ab..b7561bfcad8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFront.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFrontEqual.mat
index d91bc9873f3..887d050698b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFrontEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphCullFrontEqual.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphDoubleSided.mat
index fb51c5f92f9..ad138406036 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphDoubleSided.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphDoubleSided.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestAlways.mat
index 3fc29cf7ba1..fd300946f00 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestAlways.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestAlways.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestDisabled.mat
index 2cdb023f7dc..b3243ae9400 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestDisabled.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestDisabled.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestLessEqual.mat
index 77bda79ffcf..9dae92f477a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestLessEqual.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestNeverBackThenFront.mat
index 0578f561483..f607ba62c13 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestNeverBackThenFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZTestNeverBackThenFront.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteGreaterEqual.mat
index 86496acd67e..353f7c2ddca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteGreaterEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteGreaterEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteLessEqual.mat
index 18ddf62de32..6f491577ab8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteLessEqual.mat	
@@ -89,4 +89,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOff.mat
index 602234a4af4..0c1dff4fbc4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOff.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOn.mat
index b8d1a85a6e7..9269c561545 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOn.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOn.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnAlpha1.mat
index a28e050aa4b..4bdfb7e6360 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnAlpha1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnAlpha1.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnTransparent.mat
index 5f9674e13d8..107f5c48f80 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HDUnlitGraph/Shader Graphs_UnLitGraphZWriteOnTransparent.mat	
@@ -90,4 +90,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBack.mat
index 78893fd6a1f..99996fb26bb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBack.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBack.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBackZTestGreater.mat
index 09b8494a693..03a44c46791 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBackZTestGreater.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullBackZTestGreater.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFront.mat
index 67774e5f55f..15a94c4ef6a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFront.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFrontEqual.mat
index 201d11ea285..7491a81d01e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFrontEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphCullFrontEqual.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphDoubleSided.mat
index 071d59e925a..abdbb59d575 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphDoubleSided.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphDoubleSided.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestAlways.mat
index aecabba1511..ffa80cc5bf5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestAlways.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestAlways.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestDisabled.mat
index 8ba9edc3b2d..7179be2194e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestDisabled.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestDisabled.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestLessEqual.mat
index fae77768081..44599ad78c9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestLessEqual.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestNeverBackThenFront.mat
index 824e17b4c2e..8f340807b95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestNeverBackThenFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZTestNeverBackThenFront.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteGreaterEqual.mat
index 979cdc3de11..446e49e920f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteGreaterEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteGreaterEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteLessEqual.mat
index 762929294a9..66b5d2dbb4a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteLessEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOff.mat
index f3d419a9a88..d46b40fcbac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOff.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOn.mat
index c7d2ee5449a..2e2bdfc2e82 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOn.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOn.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnAlpha1.mat
index 85e9c838596..52ed9c90410 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnAlpha1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnAlpha1.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnTransparent.mat
index 0ecb6610021..ff76fd20d1f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/HairGraph/Shader Graphs_HairGraphZWriteOnTransparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBack.mat
index 76130dedae4..f7936dde5a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBack.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBack.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBackZTestGreater.mat
index 7203dda6cc5..d866b55230b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBackZTestGreater.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullBackZTestGreater.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFront.mat
index 8db3d575e6f..72899b40bd5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFront.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFrontEqual.mat
index bab3f4a9d31..4665392212b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFrontEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitCullFrontEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitDoubleSided.mat
index 28d43a0aa91..5abf89852e7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitDoubleSided.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitDoubleSided.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestAlways.mat
index 77c4c396ae7..ccef861a9d5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestAlways.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestAlways.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -185,6 +197,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestDisabled.mat
index 9e239471451..b84e86a9201 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestDisabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestDisabled.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestLessEqual.mat
index 85c53f2c858..a3a57dea5f7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestLessEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestLessEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestNeverBackThenFront.mat
index 51cb8f1e9a8..0292b22c907 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestNeverBackThenFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZTestNeverBackThenFront.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteGreaterEqual.mat
index 4943cfdf03c..bb6c6b0f2ef 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteGreaterEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteGreaterEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteLessEqual.mat
index c0318cac2c1..551d5641f84 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteLessEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteLessEqual.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -272,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOff.mat
index 23a6acea4b2..7e440af1978 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOff.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -272,4 +286,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOn.mat
index e8403e621a0..0b1915f9433 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOn.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -185,6 +197,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnAlpha1.mat
index 08c749e9042..b4eebd56885 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnAlpha1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnAlpha1.mat
@@ -112,6 +112,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -185,6 +197,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnTransparent.mat
index a052280e659..17b4c6eb1b9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Lit/LitZWriteOnTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -198,6 +210,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBack.mat
index 166762fdfc1..8e77133d387 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBack.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBack.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphCullBack
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBackZTestGreater.mat
index 63b92eef7a6..929f8536dd4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBackZTestGreater.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullBackZTestGreater.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphCullBackZTestGreater
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFront.mat
index 5724332c22e..a7c4caba752 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFront.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphCullFront
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFrontEqual.mat
index 86c8a1738fc..acf38998d22 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFrontEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphCullFrontEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphCullFrontEqual
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphDoubleSided.mat
index 149837b3d79..ea4f4dc3762 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphDoubleSided.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphDoubleSided.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphDoubleSided
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _DOUBLESIDED_ON _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestAlways.mat
index e4d5fe54677..c3e28689392 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestAlways.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestAlways.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZTestAlways
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestDisabled.mat
index 2b3dd445812..d3573a2b8ee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestDisabled.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestDisabled.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZTestDisabled
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestLessEqual.mat
index 3b8eadbab01..94a6df930e0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestLessEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZTestLessEqual
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestNeverBackThenFront.mat
index 6ed5c3363e3..e2fe5dc5fc7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestNeverBackThenFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZTestNeverBackThenFront.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZTestNeverBackThenFront
   m_Shader: {fileID: -6465566751694194690, guid: 78a116865d6930d4f8f8cfce7aafb5c4,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -39,7 +39,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -61,6 +73,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteGreaterEqual.mat
index e2525e1365c..0dbff45e243 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteGreaterEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteGreaterEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteGreaterEqual
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteLessEqual.mat
index a937f4a0cc9..c957dc2055b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteLessEqual.mat	
@@ -10,7 +10,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteLessEqual
   m_Shader: {fileID: -6465566751694194690, guid: 78a116865d6930d4f8f8cfce7aafb5c4,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -26,7 +26,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -48,6 +60,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -92,4 +105,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOff.mat
index 6ddb2fa401e..8bf6d1fc048 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOff.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOff.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteOff
   m_Shader: {fileID: -6465566751694194690, guid: 78a116865d6930d4f8f8cfce7aafb5c4,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -39,7 +39,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -61,6 +73,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOn.mat
index 001665427e1..ecd2535b86f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOn.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOn.mat	
@@ -10,7 +10,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteOn
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -27,7 +27,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -49,6 +61,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnAlpha1.mat
index a14de502a31..315010327e7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnAlpha1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnAlpha1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteOnAlpha1
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnTransparent.mat
index 1cb4f65e292..80eda9678ad 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/LitGraph/Shader Graphs_LitGraphZWriteOnTransparent.mat	
@@ -10,7 +10,7 @@ Material:
   m_Name: Shader Graphs_LitGraphZWriteOnTransparent
   m_Shader: {fileID: -6465566751694194690, guid: cf0ca455f8234d24cab4a6184cec6116,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -27,7 +27,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoff: 0.5
@@ -49,6 +61,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBack.mat
index 9d356fb691d..6e6c3d1b973 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBack.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBack.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBackZTestGreater.mat
index 451ecf8a85a..f308bf4ac75 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBackZTestGreater.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullBackZTestGreater.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFront.mat
index 61847110016..a81744b9fa0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFront.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFrontEqual.mat
index f33d7520993..6c6c7b11501 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFrontEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphCullFrontEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphDoubleSided.mat
index 090e9d817b6..0de7969dd8e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphDoubleSided.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphDoubleSided.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestAlways.mat
index da7d6635c5e..6880a8a49e9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestAlways.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestAlways.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestDisabled.mat
index c714bbf2ac8..8abbb7a1cfd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestDisabled.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestDisabled.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestLessEqual.mat
index 9c5bf7e87fb..df74b568460 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestLessEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestNeverBackThenFront.mat
index 37483bdd0ba..c49455c5be5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestNeverBackThenFront.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZTestNeverBackThenFront.mat	
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteGreaterEqual.mat
index 4d43f162260..963d7b8db67 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteGreaterEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteGreaterEqual.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteLessEqual.mat
index 30de5b8a0be..7f0700f0293 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteLessEqual.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteLessEqual.mat	
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOff.mat
index 64b9bd55206..22637e1ca58 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOff.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOff.mat	
@@ -92,4 +92,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOn.mat
index 038c27087f3..56703341e9f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOn.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOn.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnAlpha1.mat
index 2f0978b435f..ac5ef4b5170 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnAlpha1.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnAlpha1.mat	
@@ -93,4 +93,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnTransparent.mat
index 629498fd586..5e2807950df 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnTransparent.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/StackLitGraph/Shader Graphs_StackLitGraphZWriteOnTransparent.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBack.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBack.mat
index 99410c90eb6..9cb3ff51d0e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBack.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBack.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBackZTestGreater.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBackZTestGreater.mat
index 5a19a8f51ab..b45badb9108 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBackZTestGreater.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullBackZTestGreater.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFront.mat
index 3fd640f8089..dc3a17dbcf8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFront.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFrontEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFrontEqual.mat
index c4cad73b707..827c9864573 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFrontEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitCullFrontEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitDoubleSided.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitDoubleSided.mat
index 0aa24c42736..56fc1f06f9c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitDoubleSided.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitDoubleSided.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestAlways.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestAlways.mat
index bebabbdcd11..f5ea5c1eb0c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestAlways.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestAlways.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestDisabled.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestDisabled.mat
index d4bfce90494..d15ad0b49b1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestDisabled.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestDisabled.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestLessEqual.mat
index e75e3d00a6b..fa1a966ceb1 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestLessEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestLessEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestNeverBackThenFront.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestNeverBackThenFront.mat
index 82d683821bb..e908d23c823 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestNeverBackThenFront.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZTestNeverBackThenFront.mat
@@ -272,4 +272,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteGreaterEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteGreaterEqual.mat
index f3fc29dba1c..72fb0a8c480 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteGreaterEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteGreaterEqual.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteLessEqual.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteLessEqual.mat
index 316b52af563..85d8003bb8e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteLessEqual.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteLessEqual.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOff.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOff.mat
index 71e6c489911..fed5ec21037 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOff.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOff.mat
@@ -272,4 +272,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOn.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOn.mat
index f8dacbc88b8..3d48c9e9543 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOn.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOn.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnAlpha1.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnAlpha1.mat
index f229cec7c91..6040b9da159 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnAlpha1.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnAlpha1.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnTransparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnTransparent.mat
index 2e5c810db06..5a1a6eee9c5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnTransparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8105_BlendStates/Unlit/UnlitZWriteOnTransparent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/00.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/00.mat
index 90aef14f8ff..a4afd73e490 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/00.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/00.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/01.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/01.mat
index bace1c66407..b6cb508c745 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/01.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/01.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/02.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/02.mat
index d8eb0d7448e..e833b6b4886 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/02.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/02.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/03.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/03.mat
index d43142a3db5..a9eb8c11c9e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/03.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/03.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/10.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/10.mat
index e9b2029ae0c..8687586f000 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/10.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/10.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/11.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/11.mat
index 81d967b31bb..da60ff75b16 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/11.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/11.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/12.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/12.mat
index 2202ad22a18..b4faa06fa1b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/12.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/12.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/13.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/13.mat
index fbe547dc7f7..3624022e0b6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/13.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/13.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/20.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/20.mat
index 94b766c14a5..2d176ab628e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/20.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/20.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/21.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/21.mat
index edbd7dbf5ee..35c7540e835 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/21.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/21.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/22.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/22.mat
index 2ba067872b4..cf6f409bcee 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/22.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/22.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/23.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/23.mat
index ea5d12afa6e..8a2a86bd7f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/23.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/23.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/Cube.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/Cube.mat
index 0d3601bf498..0a03eb1e175 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/Cube.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8106_UnlitShadowMatte/Cube.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_LitCubeMat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_LitCubeMat.mat
index f4e0a1a3d0d..76c4d8556c4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_LitCubeMat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_LitCubeMat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_NoShadowMatte.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_NoShadowMatte.mat
index 3036a54f193..298fc93fc5d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_NoShadowMatte.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_NoShadowMatte.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_ShadowMatte.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_ShadowMatte.mat
index 7f60cd4f305..45625954206 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_ShadowMatte.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/M_ShadowMatte.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/HD.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/HD.mat
index 75262ba2d99..8bdf324a43d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/HD.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/HD.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -37,7 +37,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -58,6 +70,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/PBRboi.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/PBRboi.mat
index 4955129820c..5e2f305b50d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/PBRboi.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/PBRboi.mat
@@ -22,7 +22,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -43,6 +55,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -86,4 +99,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationHDLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationHDLit.mat
index df31bf0a1e8..e6c3cc059d5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationHDLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationHDLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -42,6 +42,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 63ca992c464c234489312adaa6c517fb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_9728B000: 7
     - Vector1_CAC83531: 1
@@ -64,6 +76,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationPBR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationPBR.mat
index 595caee2161..599e5ed2c9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationPBR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexRotationPBR.mat
@@ -29,6 +29,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 63ca992c464c234489312adaa6c517fb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_9728B000: 7
     - Vector1_CAC83531: 1
@@ -51,6 +63,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -94,4 +107,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveHDLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveHDLit.mat
index 303adb5a1de..a447f3526f4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveHDLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveHDLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -37,7 +37,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_2914A566: 45
     - Vector1_59861A97: 6
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveUnlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveUnlit.mat
index 2b448633b32..3bb7cd3c1a3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveUnlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8201_VertexAnimation/SGVertexWaveUnlit.mat
@@ -88,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8202_BentNormals/SG_Bent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8202_BentNormals/SG_Bent.mat
index 3a911ad9ea8..4cfac90c9f4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8202_BentNormals/SG_Bent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8202_BentNormals/SG_Bent.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -46,6 +46,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 5a3d39bf2def0a74baa5e6f358e224a1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -66,6 +78,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_BakedEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_BakedEmission.mat
index ec8d6288d27..83ab39c376c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_BakedEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_BakedEmission.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -207,6 +219,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_RealtimeEmission.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_RealtimeEmission.mat
index 915bb805ca7..baa24b2ca15 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_RealtimeEmission.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/Lit_RealtimeEmission.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -288,4 +302,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffects.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffects.mat
index 6d01b7373eb..ed786feded0 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffects.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffects.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -29,6 +29,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: d5b7db2e02c79564997239e235ac4b93, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -49,6 +61,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -93,4 +106,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffectsBaked.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffectsBaked.mat
index 9509a7f82d2..eb6f0e5194b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffectsBaked.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionAlbedoNoAffectsBaked.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -42,6 +42,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: d5b7db2e02c79564997239e235ac4b93, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -62,6 +74,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionBaked.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionBaked.mat
index a31749b6ee8..eaad107f522 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionBaked.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionBaked.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -37,7 +37,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -58,6 +70,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionRealT.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionRealT.mat
index 7939f54d637..3336af0c30b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionRealT.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8203_Emission/SG_EmissionRealT.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -24,7 +24,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -45,6 +57,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
@@ -88,4 +101,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8204_CustomSpecOcclusion/CustomSpecOcclusion.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8204_CustomSpecOcclusion/CustomSpecOcclusion.mat
index af8bb738e28..9e31be70395 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8204_CustomSpecOcclusion/CustomSpecOcclusion.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8204_CustomSpecOcclusion/CustomSpecOcclusion.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -26,7 +26,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -54,6 +54,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 63ca992c464c234489312adaa6c517fb, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -76,6 +88,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 0.95
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialLit.mat
index c8eb9f83e9e..b53dc0fcd09 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: HDSceneColorMaterialLit
   m_Shader: {fileID: -6465566751694194690, guid: 784bd5308e576e24387ec115c5e2d66f,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_4B3F931F: 1
     - Vector1_F7787275: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialUnlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialUnlit.mat
index 177dc980328..ed1cfdaccdd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialUnlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/HDSceneColorMaterialUnlit.mat
@@ -269,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialLit.mat
index a79d3b9f01f..b8b3ba2a496 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: SceneColorMaterialLit
   m_Shader: {fileID: -6465566751694194690, guid: 7195fac95cd22264980f0a67951bb2d4,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialUnlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialUnlit.mat
index ae82acdbc85..28153992426 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialUnlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneColorMaterialUnlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialLit.mat
index 39ae5310262..e6e1b1f423d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -23,7 +23,7 @@ Material:
   m_Name: SceneDepthMaterialLit
   m_Shader: {fileID: -6465566751694194690, guid: f0920199eae002a4ea89225464a38e44,
     type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DISABLE_SSR_TRANSPARENT
     _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -125,6 +125,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialUnlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialUnlit.mat
index 640a662b364..477d5d4d603 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialUnlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8205_SceneDepthColorNodes/SceneDepthMaterialUnlit.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8206_VertexNormalTangent/Shader Graphs_SG_vertexNormalTangent_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8206_VertexNormalTangent/Shader Graphs_SG_vertexNormalTangent_Lit.mat
index 2fa0fa412f9..02481953c4c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8206_VertexNormalTangent/Shader Graphs_SG_vertexNormalTangent_Lit.mat	
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8206_VertexNormalTangent/Shader Graphs_SG_vertexNormalTangent_Lit.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -43,6 +43,18 @@ Material:
         m_Texture: {fileID: 2800000, guid: 5a3d39bf2def0a74baa5e6f358e224a1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_3d5f4a898a21409794bdc6e2b7fa6d6b: 0
     - Vector1_573d9e618521464da296cbf51a3bf762: 10
@@ -66,6 +78,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9001_LODTransition/9001_LOD-Transition_Display.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9001_LODTransition/9001_LOD-Transition_Display.mat
index 95f6bad1267..8a8ef2a89ed 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9001_LODTransition/9001_LOD-Transition_Display.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9001_LODTransition/9001_LOD-Transition_Display.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Blue.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Blue.mat
index de484af8d63..3ee345a1076 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Blue.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Blue.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Green.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Green.mat
index 65f95a1df74..6c638b24736 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Green.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Green.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Red.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Red.mat
index 6e7ff83b8e7..19d16ebddad 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Red.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Lit_Red.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Viewer.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Viewer.mat
index 21afdcf4ffc..99d7982f334 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Viewer.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/9801_Viewer.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/checker.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/checker.mat
index 49b3be354ef..5d20a43aa03 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/checker.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9002_FrameSettings_LOD/checker.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/Floor.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/Floor.mat
index 0901d7f8c3e..e1687bab511 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/Floor.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/Floor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/pointlighht.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/pointlighht.mat
index b5b832a1935..1be24d6890e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/pointlighht.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/pointlighht.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/triplanar.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/triplanar.mat
index f574a1c1a75..8fd6b5ddca4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/triplanar.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9003_CameraRelativeRendering/triplanar.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9004_MultiViewport/MultiViewport_Material.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9004_MultiViewport/MultiViewport_Material.mat
index 3d607e3cb57..efb6543bf01 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9004_MultiViewport/MultiViewport_Material.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9004_MultiViewport/MultiViewport_Material.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit.mat
index c33df21d1c4..1a514151bfb 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add.mat
index 3c08607f208..73f36729a95 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add_AfterPost.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add_AfterPost.mat
index 1e21a02e1fd..3c01150f49d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add_AfterPost.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Add_AfterPost.mat
@@ -269,4 +269,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_AfterPost.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_AfterPost.mat
index 3b3103ab216..0155feb136a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_AfterPost.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_AfterPost.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha.mat
index 610868354cd..3d6224b5548 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha_AfterPost.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha_AfterPost.mat
index 3d9cdb8c096..577f6057dcd 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha_AfterPost.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9005_AfterPostProcess/TestAfterPostProcess_Unlit_Alpha_AfterPost.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit.mat
index a420e609641..377b3bd6a83 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals.mat
index f362aec553e..24c5b743c97 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals_SSS.mat
index 481c9b58e86..aa6ff60b6b4 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_Decals_SSS.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR.mat
index cdaf8526ace..c1720dff1da 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals.mat
index 1d687727c30..7808f9d14bf 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -274,4 +288,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals_SSS.mat
index 981ccd3040f..c0642ca5053 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_Decals_SSS.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_SSS.mat
index 28981e72e94..c8ad87ec73a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSR_SSS.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSS.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSS.mat
index 7e0bde0ad5a..49d6fb0b4c8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSS.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Lit_SSS.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Projector.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Projector.mat
index 1769f12c779..fc49c7aba50 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Projector.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Projector.mat
@@ -195,7 +195,8 @@ Material:
     - _MaskBlendSrc: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -276,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_Mat.mat
index 2a53b659a87..701f5604de2 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_Mat.mat
@@ -273,4 +273,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_SSS_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_SSS_Mat.mat
index 931b02571a8..608b255cd57 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_SSS_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Decal_SSS_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Mat.mat
index 98e4337efc8..01df2697511 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_Mat.mat
index f7519567208..0752aa82c3c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_SSS_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_SSS_Mat.mat
index 9e4888ccd43..107dc72dc4e 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_SSS_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Decal_SSS_Mat.mat
@@ -275,4 +275,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Mat.mat
index cc26124a7e2..76c3453c8ff 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_SSS_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_SSS_Mat.mat
index 64e9bd877b5..3587376d53b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_SSS_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSR_SSS_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSS_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSS_Mat.mat
index f947d255ff9..2446f054b00 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSS_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_StackLit_SSS_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit.mat
index eccbdf99f8e..928a025a334 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit.mat
@@ -271,4 +271,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit_SG_Mat.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit_SG_Mat.mat
index f8ff7641871..2665bdbaf9a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit_SG_Mat.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9006_StencilUsage/Stencil_Unlit_SG_Mat.mat
@@ -271,4 +271,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/AlphaCompositingMaterial_Alpha.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/AlphaCompositingMaterial_Alpha.mat
index 0ef20c60104..59db8fbe681 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/AlphaCompositingMaterial_Alpha.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/AlphaCompositingMaterial_Alpha.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -197,6 +209,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/GenerateComposite.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/GenerateComposite.mat
index 6ad01871adc..01fb91efece 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/GenerateComposite.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/GenerateComposite.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/UseComposite.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/UseComposite.mat
index f255313181f..b79ba4ddc44 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/UseComposite.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9007_CameraAlphaComposition/UseComposite.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_AxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_AxF.mat
index 0c31afeaa8f..bf19a1e3671 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_AxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_AxF.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Fabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Fabric.mat
index be404bb91d2..da5810fdb15 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Fabric.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Fabric.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LayeredLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LayeredLit.mat
index 0db1f471cc0..fc6dfcb4a65 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LayeredLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LayeredLit.mat
@@ -278,6 +278,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -441,6 +453,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
@@ -596,4 +616,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LineMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LineMaterial.mat
index 2448b4794a7..5c1080e59ad 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LineMaterial.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_LineMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Lit.mat
index 421384984a5..5200b2cd5d3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -200,6 +212,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_StackLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_StackLit.mat
index 83e4606cdf6..1fb77ca80ca 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_StackLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_StackLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Unlit.mat
index 85136c17f32..69f7c7ceac8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9301_MotionVectors/M_Unlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_GreenLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_GreenLit.mat
index 71756672038..527a527bcc5 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_GreenLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_GreenLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_RedLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_RedLit.mat
index 15e016998f9..0031cb4f5df 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_RedLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_RedLit.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentBlueLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentBlueLit.mat
index 584ccdfb688..d4211eaf784 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentBlueLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentBlueLit.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -188,6 +200,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentRefractive.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentRefractive.mat
index 945ddc44c91..6197a92abde 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentRefractive.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9401_MSAA/M_TransparentRefractive.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -201,6 +213,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_AxF.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_AxF.mat
index 03ab19627b9..3190ef5b0b8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_AxF.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_AxF.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLit.mat
index d6fb3a503f2..8b3f2860f01 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -353,6 +353,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -531,6 +543,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLitTessellation.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLitTessellation.mat
index c5e83b20fc4..a49f0fac7c8 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLitTessellation.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LayeredLitTessellation.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -296,6 +296,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMax0: 1
@@ -461,6 +473,14 @@ Material:
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MetallicRemapMax0: 1
+    - _MetallicRemapMax1: 1
+    - _MetallicRemapMax2: 1
+    - _MetallicRemapMax3: 1
+    - _MetallicRemapMin0: 0
+    - _MetallicRemapMin1: 0
+    - _MetallicRemapMin2: 0
+    - _MetallicRemapMin3: 0
     - _NormalMapSpace: 0
     - _NormalMapSpace0: 0
     - _NormalMapSpace1: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Lit.mat
index 0aae8bd8647..50fcb50fc8b 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -206,6 +218,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LitTessellation.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LitTessellation.mat
index 9f2fff6c0d1..5b4fc743ad6 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LitTessellation.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_LitTessellation.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -205,6 +217,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Unlit.mat
index d9654dde47e..c80b10a2a63 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_HDRP_Unlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Eye.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Eye.mat
index bb4a3734d0e..3a525c98081 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Eye.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Eye.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Fabric.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Fabric.mat
index 5c0caecb03c..6a766b5b29a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Fabric.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Fabric.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Hair.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Hair.mat
index fa1f5c7c58b..d3ada5b4d8a 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Hair.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Hair.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Lit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Lit.mat
index 6f36e565cff..e620d473af7 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Lit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Lit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -105,6 +105,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 3f9313f68c2869648b020663f29c8420, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_1de6991fa35ba58bb0d1ad79f17d1ec4_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 3f9313f68c2869648b020663f29c8420, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_30B74B6C_Texture_1:
         m_Texture: {fileID: 2800000, guid: 3f9313f68c2869648b020663f29c8420, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -153,6 +157,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_StackLit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_StackLit.mat
index e49a480612c..0666e10a5f3 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_StackLit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_StackLit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Unlit.mat
index 37e49c472fb..d8c3532a90c 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9402_AlphaToMask/M_SG_Unlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/trasnparnetShadowCasting.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/trasnparnetShadowCasting.mat
index c17f0b008a5..7a6f1d97590 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/trasnparnetShadowCasting.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9500_LightScripting/trasnparnetShadowCasting.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -195,6 +207,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/9601_LOD-Transition_Display.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/9601_LOD-Transition_Display.mat
index eae3853d0e6..00cec9dfc22 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/9601_LOD-Transition_Display.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/9601_LOD-Transition_Display.mat
@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/HeadInstanced.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/HeadInstanced.mat
index 00cac176d3c..589e7db41de 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/HeadInstanced.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9601_SkinnedMeshBatching/HeadInstanced.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -203,6 +215,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 0
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Opaque.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Opaque.mat
index 8765e764247..b85e09c5ce9 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Opaque.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Opaque.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -181,6 +193,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -265,4 +279,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Transparent.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Transparent.mat
index 4ca43cfccda..ce95b03673f 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Transparent.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Transparent.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Unlit.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Unlit.mat
index 226ed608520..fa4ca750150 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Unlit.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Unlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/9701_UnlitRT.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/9701_UnlitRT.mat
index ef427a48849..6048db78cac 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/9701_UnlitRT.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/9701_UnlitRT.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/BackgroundCube.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/BackgroundCube.mat
index 9cab5c51989..8f7c48bd65d 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/BackgroundCube.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/BackgroundCube.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -194,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_LitUV.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_LitUV.mat
index 73b757c4c6d..51be26b5d30 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_LitUV.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_LitUV.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_UnlitUVChecker.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_UnlitUVChecker.mat
index 2dca6d34250..b09e0de0724 100644
--- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_UnlitUVChecker.mat
+++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/9702_UnlitUVChecker.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

From ef8a4a8b968fe0429ffea22e6f050f812d282ff7 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 17:40:21 +0200
Subject: [PATCH 11/13] VisualEffectGraph_HDRP

---
 .../VFXTests/GraphicsTests/101_Lit_Ref.mat      | 17 +++++++++++++++--
 .../VFXTests/GraphicsTests/101_Unlit_Ref.mat    |  2 +-
 .../GraphicsTests/Materials/BlackMaterial.mat   |  2 +-
 .../GraphicsTests/Materials/Unlit_Black.mat     |  2 +-
 .../GraphicsTests/Materials/Unlit_White.mat     |  2 +-
 .../GraphicsTests/Materials/WhiteMaterial.mat   | 16 +++++++++++++++-
 .../PositionDepthOperator/Blue.mat              | 16 +++++++++++++++-
 .../PositionDepthOperator/Green.mat             | 16 +++++++++++++++-
 .../GraphicsTests/PositionDepthOperator/Red.mat | 16 +++++++++++++++-
 .../Shadergraph/SampleScene/EmissiveRed.mat     | 16 +++++++++++++++-
 .../SampleScene/ReferenceSampleColor.mat        |  2 +-
 .../SampleScene/ReferenceSampleDepth.mat        |  2 +-
 .../SampleScene/ReferenceSampleGI.mat           |  2 +-
 .../Tests/TransparencyOverdraw/OpaqueUnlit.mat  |  2 +-
 .../TransparencyOverdraw/TransparentLit.mat     | 16 +++++++++++++++-
 .../TransparencyOverdraw/TransparentLowRes.mat  |  2 +-
 .../TransparencyOverdraw/TransparentUnlit.mat   |  2 +-
 .../Scenes/007_SimpleMaterial.mat               |  2 +-
 .../Scenes/009_MultiCamera.mat                  |  2 +-
 .../Scenes/009_OutputEvent.mat                  | 15 ++++++++++++++-
 20 files changed, 131 insertions(+), 21 deletions(-)

diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Lit_Ref.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Lit_Ref.mat
index 1a14b420586..1ea98ec14d5 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Lit_Ref.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Lit_Ref.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -38,7 +38,19 @@ Material:
   - RayTracingPrepass
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
@@ -59,6 +71,7 @@ Material:
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Unlit_Ref.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Unlit_Ref.mat
index ce8091c4fd6..d99cb60ff5e 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Unlit_Ref.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/101_Unlit_Ref.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/BlackMaterial.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/BlackMaterial.mat
index ddb8bbed2a0..1f5f9aa868c 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/BlackMaterial.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/BlackMaterial.mat
@@ -320,4 +320,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_Black.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_Black.mat
index 730b30ebf7f..6f1ca494ace 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_Black.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_Black.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_White.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_White.mat
index f984c086dc4..c67a085b69b 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_White.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/Unlit_White.mat
@@ -266,4 +266,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/WhiteMaterial.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/WhiteMaterial.mat
index c24de3320f0..520985221d8 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/WhiteMaterial.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Materials/WhiteMaterial.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -186,6 +198,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1.088
     - _OpaqueCullMode: 2
@@ -275,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Blue.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Blue.mat
index 42b0cfe1021..0d048840906 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Blue.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Blue.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1164DFE7: 0
     - Vector1_95B182ED: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -282,4 +296,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Green.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Green.mat
index 3dcd8e9dc39..ee462b19785 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Green.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Green.mat
@@ -114,6 +114,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1164DFE7: 0
     - Vector1_95B182ED: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -282,4 +296,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Red.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Red.mat
index e30a55095a4..0e8cb3b7af6 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Red.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/PositionDepthOperator/Red.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -127,6 +127,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_1164DFE7: 0
     - Vector1_95B182ED: 0
@@ -206,6 +218,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat
index e8e7b6b4bfa..ac5c7427e33 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/EmissiveRed.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -183,6 +195,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -268,4 +282,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleColor.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleColor.mat
index 7a5c6562414..3ed324b7c6d 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleColor.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleColor.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleDepth.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleDepth.mat
index 87f7f113b42..4fc866d7977 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleDepth.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleDepth.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleGI.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleGI.mat
index 153efc3c1e0..cff36076e18 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleGI.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ReferenceSampleGI.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/OpaqueUnlit.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/OpaqueUnlit.mat
index d509e155ad0..3d202a9f196 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/OpaqueUnlit.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/OpaqueUnlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLit.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLit.mat
index a9da48b2caa..210fe507b69 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLit.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLit.mat
@@ -111,6 +111,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -184,6 +196,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -269,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLowRes.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLowRes.mat
index c71e1f8295a..22658d26a8b 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLowRes.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentLowRes.mat
@@ -268,4 +268,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentUnlit.mat b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentUnlit.mat
index d4cde6b48ef..ee74a51e23b 100644
--- a/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentUnlit.mat
+++ b/TestProjects/VisualEffectGraph_HDRP/Assets/Tests/TransparencyOverdraw/TransparentUnlit.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.visualeffectgraph/Scenes/007_SimpleMaterial.mat b/com.unity.testing.visualeffectgraph/Scenes/007_SimpleMaterial.mat
index a62112b81b1..6af11d220e3 100644
--- a/com.unity.testing.visualeffectgraph/Scenes/007_SimpleMaterial.mat
+++ b/com.unity.testing.visualeffectgraph/Scenes/007_SimpleMaterial.mat
@@ -84,4 +84,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.testing.visualeffectgraph/Scenes/009_MultiCamera.mat b/com.unity.testing.visualeffectgraph/Scenes/009_MultiCamera.mat
index 21bf49b776c..6e88c8c1441 100644
--- a/com.unity.testing.visualeffectgraph/Scenes/009_MultiCamera.mat
+++ b/com.unity.testing.visualeffectgraph/Scenes/009_MultiCamera.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.testing.visualeffectgraph/Scenes/009_OutputEvent.mat b/com.unity.testing.visualeffectgraph/Scenes/009_OutputEvent.mat
index 20ccd173a3f..d41ee65b870 100644
--- a/com.unity.testing.visualeffectgraph/Scenes/009_OutputEvent.mat
+++ b/com.unity.testing.visualeffectgraph/Scenes/009_OutputEvent.mat
@@ -53,6 +53,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
@@ -86,6 +98,7 @@ Material:
     - _ReceiveShadows: 1
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
     - _RenderQueueType: 1
     - _RequireSplitLighting: 0
     - _Smoothness: 0.5
@@ -151,4 +164,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11

From 55855ed4a06c08b93f5e58426bd1a774b51db5c3 Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 17:45:17 +0200
Subject: [PATCH 12/13] HDRP_PerformanceTests

---
 ...RaytracingQualityKeyword_Indirect.png.meta | 96 +++++++++++++++++++
 .../Common/Materials/UnlitCanvasMat.mat       | 17 +++-
 .../StaticAnalysis/Lit_ShaderGraph.mat        | 17 +++-
 .../Assets/Scenes/0000_LitCube/0000_Cube.mat  | 17 +++-
 .../0003_TesselationShadow/Tesselation.mat    | 19 +++-
 .../Tesselation_Floor.mat                     | 19 +++-
 6 files changed, 176 insertions(+), 9 deletions(-)
 create mode 100644 TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1000_RaytracingQualityKeyword_Indirect.png.meta

diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1000_RaytracingQualityKeyword_Indirect.png.meta b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1000_RaytracingQualityKeyword_Indirect.png.meta
new file mode 100644
index 00000000000..db1a4457192
--- /dev/null
+++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1000_RaytracingQualityKeyword_Indirect.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b31bbc707abf5b144b4016ded3b80203
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat b/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat
index 46192d29496..8a672c08359 100644
--- a/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat
+++ b/TestProjects/HDRP_PerformanceTests/Assets/Common/Materials/UnlitCanvasMat.mat
@@ -14,7 +14,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -29,12 +29,25 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _BlendMode: 0
     - _CullMode: 2
     - _CullModeForward: 2
@@ -88,4 +101,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 11
diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat b/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat
index e81cb11eaff..517bd344eb5 100644
--- a/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat
+++ b/TestProjects/HDRP_PerformanceTests/Assets/Resources/StaticAnalysis/Lit_ShaderGraph.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2225
   stringTagMap:
     MotionVector: User
   disabledShaderPasses:
@@ -124,6 +124,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -138,6 +150,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat
index 853f0902c2c..068fef8bc11 100644
--- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat
+++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0000_LitCube/0000_Cube.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -123,6 +123,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -137,6 +149,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -193,6 +206,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 2
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat
index c91cbf12b1e..3e47bc98b4b 100644
--- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat
+++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -136,6 +148,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -192,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat
index a1dde6963d2..82670077aa9 100644
--- a/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat
+++ b/TestProjects/HDRP_PerformanceTests/Assets/Scenes/0003_TesselationShadow/Tesselation_Floor.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: 2225
   stringTagMap: {}
   disabledShaderPasses:
   - DistortionVectors
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -136,6 +148,7 @@ Material:
     - _AlphaDstBlend: 0
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
+    - _AlphaToMaskInspectorValue: 0
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
@@ -192,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2

From 46fb5e077c0c0011b8c3eb39629ed0e2e57557ba Mon Sep 17 00:00:00 2001
From: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Date: Fri, 23 Oct 2020 18:22:32 +0200
Subject: [PATCH 13/13] template

---
 .../Art/Materials/General/Aluminium_Mat.mat      | 16 +++++++++++++++-
 .../Assets/Art/Materials/General/Bamboo_A.mat    |  2 +-
 .../Art/Materials/General/Bamboo_Leaf_A.mat      |  2 +-
 .../Assets/Art/Materials/General/Brass_Mat.mat   |  2 +-
 .../Assets/Art/Materials/General/Bush_01_Mat.mat | 16 +++++++++++++++-
 .../Art/Materials/General/Collision_Mat.mat      | 16 +++++++++++++++-
 .../Art/Materials/General/ConcreteCyan_Mat.mat   | 16 +++++++++++++++-
 .../Art/Materials/General/ConcreteHoles_Mat.mat  | 16 +++++++++++++++-
 .../Materials/General/ConcreteMatteGrey_Mat.mat  | 16 +++++++++++++++-
 .../Materials/General/ConcretePolished_Mat.mat   | 16 +++++++++++++++-
 .../Art/Materials/General/ConcreteRough_Mat.mat  | 16 +++++++++++++++-
 .../Art/Materials/General/ConcreteSmooth_Mat.mat | 16 +++++++++++++++-
 .../Art/Materials/General/ConcreteTaupe_Mat.mat  | 16 +++++++++++++++-
 .../Art/Materials/General/DecalPuddle_Mat.mat    |  5 +++--
 .../Assets/Art/Materials/General/Decal_Mat.mat   |  5 +++--
 .../Assets/Art/Materials/General/Drain_Mat.mat   |  5 +++--
 .../Art/Materials/General/EmissiveBulb_Mat.mat   |  4 +++-
 .../Materials/General/EmissiveStripLight_Mat.mat |  4 +++-
 .../Assets/Art/Materials/General/Fabric_Mat.mat  | 16 +++++++++++++++-
 .../Assets/Art/Materials/General/Fern_01_Mat.mat | 16 +++++++++++++++-
 .../Art/Materials/General/GlassDark_Mat.mat      | 16 +++++++++++++++-
 .../Art/Materials/General/GlassDirt_Mat.mat      | 16 +++++++++++++++-
 .../Assets/Art/Materials/General/Ground_Mat.mat  | 16 +++++++++++++++-
 .../Art/Materials/General/MarbleFlooring_Mat.mat | 16 +++++++++++++++-
 .../Art/Materials/General/MetalBlack_Mat.mat     |  2 +-
 .../Assets/Art/Materials/General/Plant_C.mat     |  2 +-
 .../Assets/Art/Materials/General/Rock_A.mat      | 16 +++++++++++++++-
 .../Assets/Art/Materials/General/Rubber_Mat.mat  | 16 +++++++++++++++-
 .../Art/Materials/General/SandblastMetal_Mat.mat |  2 +-
 .../Art/Materials/General/ShadowProxy_Mat.mat    |  2 +-
 .../Art/Materials/General/WoodCounter_Mat.mat    | 16 +++++++++++++++-
 .../Art/Materials/General/WoodLight_Mat.mat      |  2 +-
 .../ProjectSettings/HDRPProjectSettings.asset    |  2 +-
 33 files changed, 309 insertions(+), 36 deletions(-)

diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat
index 4e48f196910..6f28a98d3ae 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -187,6 +199,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 3
     - _Metallic: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -277,4 +291,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat
index f78c05a2638..b3f6179bbea 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat
@@ -281,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat
index 70235b11051..433ff5085ce 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat
index 58687fa4a8d..1871b5cac4b 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat
@@ -278,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat
index c114dc55d7f..102767e610e 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat
@@ -300,6 +300,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -402,6 +414,8 @@ Material:
     - _MaskMapEncoding: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 3
     - _MotionVectorScale: 1
     - _MotionVectorsWorldspaceScaled: 0
@@ -548,4 +562,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat
index 8cf57a750d7..4849fbeeec8 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -180,6 +192,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -264,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat
index 312f30a3e50..2b4cd644e89 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 0
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat
index 1762bcfa8f1..4f17639456c 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 2
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat
index 4c0ba60d8ec..f1532d3c4c0 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.5
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat
index 86b6ebf06b0..675f6b1fb18 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0.99999994
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat
index 603f32d1f6c..ba04baebb7f 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat
index 3a45989225e..01563cf5abc 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.5
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat
index 132b69bc11f..14231e8c7f3 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat
index bc23908195c..5c803b7a5c8 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat
@@ -199,7 +199,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -284,4 +285,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat
index f0551a383f1..b341157edab 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat
@@ -198,7 +198,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -283,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat
index 68279637932..14e9b5a114c 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat
@@ -199,7 +199,8 @@ Material:
     - _MaskBlendSrc: 0
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicScale: 1
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
     - _NormalBlendSrc: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
@@ -284,4 +285,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat
index c313d216125..bfbfb5a3334 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -211,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat
index cdc0f4c8454..511ba0315a6 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -211,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat
index 4315c78acd7..c87a20f51e9 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat
index 10908d06b06..a89509005db 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -313,6 +313,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -416,6 +428,8 @@ Material:
     - _MaskMapEncoding: 1
     - _MaterialID: 5
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _Mode: 1
     - _MotionVectorScale: 1
     - _MotionVectorsWorldspaceScaled: 0
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat
index f1ac6c1996d..4971c468b47 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -129,6 +129,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_2C24E89C: 0
     - Boolean_3C080546: 0
@@ -216,6 +228,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat
index a4a639a5ea0..4c999ca665c 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -128,6 +128,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_2C24E89C: 0
     - Boolean_3C080546: 0
@@ -215,6 +227,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat
index 4823846b8a1..5a1d0169b6b 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat
@@ -109,6 +109,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -182,6 +194,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
@@ -267,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat
index 78b90498935..e59a0380a90 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1.0000001
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 0.5
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat
index 385fed2074e..b894b225335 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat b/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat
index 40209478462..3777ad64ce7 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat
@@ -604,4 +604,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat
index 6eab8c86b07..1530b1b8c55 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -199,6 +211,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1.62
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat
index 01b96d90f74..ae34a0623eb 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -135,6 +135,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Boolean_77E75FAA: 0
     - Boolean_F2394607: 0
@@ -218,6 +230,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat
index 8d3d3a574b6..cecc3c46f94 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat
index 62b062d06d2..e0f11a50ae1 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat
index b8f08065017..3d755617d9d 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -193,6 +205,8 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
+    - _MetallicRemapMax: 0
+    - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1
     - _OpaqueCullMode: 2
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat
index 99b33fe926c..2da400d6429 100644
--- a/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat
+++ b/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 11
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/ProjectSettings/HDRPProjectSettings.asset b/com.unity.template-hd/ProjectSettings/HDRPProjectSettings.asset
index ac213ba68ad..078c26f8925 100644
--- a/com.unity.template-hd/ProjectSettings/HDRPProjectSettings.asset
+++ b/com.unity.template-hd/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 10
+  m_LastMaterialVersion: 11