diff --git a/Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs b/Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs
index d2a8bef4d18..c0af592b1ee 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs
@@ -48,7 +48,7 @@ VisualElement panelRoot
     {
         get
         {
-            _panelRoot ??= injectingElement.panel.visualTree;
+            _panelRoot ??= injectingElement?.panel?.visualTree;
             return _panelRoot;
         }
     }
@@ -82,11 +82,11 @@ VisualElement IPackageManagerExtension.CreateExtensionUI()
 
     void RefreshSampleButtons()
     {
-        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null)
+        if (injectingElement == null || m_PackageInfo == null || m_SampleList == null || panelRoot == null)
             return;
 
         // Call refresh of samples and button injection when switching to the "Samples" tab.
-        if (samplesButton == null )
+        if (samplesButton == null)
         {
             samplesButton = panelRoot.Q<Button>(name: samplesButtonName);
             if (samplesButton != null)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
index ba1c864a7c2..2dbc44e203a 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
@@ -32,10 +32,6 @@ private void Reset()
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
-#if UNITY_EDITOR
-            if (UnityEditor.BuildPipeline.isBuildingPlayer)
-                return;
-#endif
             DebugManager debugManager = DebugManager.instance;
             List<IDebugDisplaySettingsPanelDisposable> panels = new List<IDebugDisplaySettingsPanelDisposable>();
 
diff --git a/Packages/com.unity.render-pipelines.core/Samples~/Common/Scripts/InstallPackage.cs b/Packages/com.unity.render-pipelines.core/Samples~/Common/Scripts/InstallPackage.cs
index 2fb5d10b9e5..6c7184c55f2 100644
--- a/Packages/com.unity.render-pipelines.core/Samples~/Common/Scripts/InstallPackage.cs
+++ b/Packages/com.unity.render-pipelines.core/Samples~/Common/Scripts/InstallPackage.cs
@@ -1,6 +1,3 @@
-using UnityEditor;
-using UnityEditor.PackageManager;
-using UnityEditor.PackageManager.Requests;
 using UnityEngine;
 
 public class InstallPackage : MonoBehaviour
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/water-vfx-interaction.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/water-vfx-interaction.md
index 0c9c34a2146..1f3374da6b1 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/water-vfx-interaction.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/water-vfx-interaction.md
@@ -6,11 +6,17 @@ However there are several simulations that are important to be aware of.
 As the water surface gameobject is saved inside a scene, and the VFX graph is an asset on disk, it is not possible to directly reference the surface from within the graph. This means data of the water surface need to be set globally by the user before the VFX can sample the water.
 As a result, only a single surface can be sampled from any VFX Graph at any given time.
 
-Additionally, the settings on the Sample node in the VFX Graph needs to be set according to what water surfaces will be bound globally at runtime. This inclues setting the proper **Surface Type** and enabling **Include Current** if a current map is assigned on the water surface.
+Additionally, the settings on the Sample node in the VFX Graph needs to be set according to what water surfaces will be bound globally at runtime. This includes setting the proper **Surface Type** and enabling **Include Current** if a current map is assigned on the water surface.
 The **Evaluate Ripples** needs to be disabled if the surface doesn't have ripples, but can be disabled on purpose for performance reasons even if the surface has ripplies, at the cost of slighly lower precision in the results. The same applies to the **Include Deformation** option.
+Finally, to ensure proper masking is applied, the option **Use Mask and Current Water Decals Workflow** must be set to match the **Enable Mask And Current Water Decals** setting in the Graphics settings.
+
 
 The following script can be used to bind the relevant textures in the global scope, so that the VFX Graph can access them.
+Alternatively, can also use the more complete script WaterSurfaceBindVFXEditor.cs, located in the HDRP Package Manager Water samples.
 ```
+using UnityEngine; 
+using UnityEngine.Rendering.HighDefinition; 
+
 public class WaterSurfaceBinder : MonoBehaviour 
 {
     public WaterSurface waterSurface;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Water/WaterSurface/VFX/SampleWaterSurface.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Water/WaterSurface/VFX/SampleWaterSurface.cs
index 8f36e0ff95a..6e37f34fd56 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/Water/WaterSurface/VFX/SampleWaterSurface.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Water/WaterSurface/VFX/SampleWaterSurface.cs
@@ -46,6 +46,9 @@ class SampleWaterSurface : VFXOperator
         [VFXSetting(VFXSettingAttribute.VisibleFlags.Default)]
         [Tooltip("Specifies if the search should sample the current map.")]
         protected bool includeCurrent = false;
+        [VFXSetting(VFXSettingAttribute.VisibleFlags.Default)]
+        [Tooltip("Specifies if the system use mask and current water decal workflow. This has to be set in accordance with the same checkbox in the Graphics Settings.")]
+        protected bool useMaskAndCurrentWaterDecalsWorkflow = false;
 
         public class InputProperties
         {
@@ -107,6 +110,9 @@ protected override sealed VFXExpression[] BuildExpression(VFXExpression[] inputE
             if (!includeDeformation) baseCode += "#define IGNORE_WATER_DEFORMATION\n";
             if (includeCurrent) baseCode += "#define WATER_LOCAL_CURRENT\n";
 
+            // We need this because water decals can attenuate frequency bands using a water mask when Mask and Current Water Decals workflow is enabled.
+            if (useMaskAndCurrentWaterDecalsWorkflow)   baseCode += "#define WATER_DECAL_COMPLETE\n";
+
             baseCode += $"#include \"{m_SampleWaterSurface}\"\n";
 
             string FindVerticalDisplacements = $"float error; int steps; float3 normal; float2 current; float height = FindVerticalDisplacement(positionWS, {maxIterations}, {error.ToString("0.00", System.Globalization.CultureInfo.InvariantCulture)}, steps, error, normal, current);";
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
index 7ded743ff74..b891cd00db2 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
@@ -2125,11 +2125,6 @@ void UnregisterRenderingDebug()
 
         internal void RegisterDebug()
         {
-#if UNITY_EDITOR
-            if (UnityEditor.BuildPipeline.isBuildingPlayer)
-                return;
-#endif
-            
             RegisterMaterialDebug();
             RegisterLightingDebug();
             RegisterRenderingDebug();
@@ -2149,7 +2144,7 @@ void UnregisterDebugItems(string panelName, DebugUI.Widget[] items)
         {
             if (items == null || items.Length == 0)
                 return;
-            
+
             var panel = DebugManager.instance.GetPanel(panelName);
             if (panel != null)
                 panel.children.Remove(items);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs
index 8075163f7c5..d93d952264c 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs
@@ -343,7 +343,7 @@ static WaterSimulationTapData EvaluateDisplacementData(WaterSimSearchData wsd, f
             EvaluateSimulationDisplacement(wsd, currentLocation, includeSimulation, out data.horizontalDisplacement, out data.direction, out data.verticalDisplacements);
 
             // Evaluate the distance to the reference point
-            data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+            data.offset = currentLocation.xz - referencePosition.xz;
             data.distance = length(data.offset);
 
             return data;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl
index fb09f49872e..aad4bb68dc2 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl
@@ -579,7 +579,7 @@ TapData EvaluateDisplacementData(float3 currentLocation, float3 referencePositio
     EvaluateSimulationDisplacement(currentLocation, data.horizontalDisplacement, data.verticalDisplacements);
 
     // Evaluate the distance to the reference point
-    data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+    data.offset = currentLocation.xz - referencePosition.xz;
     data.distance = length(data.offset);
 
     return data;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/Scripts/CurrentWithSplines/SplineToTexture.cs b/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/Scripts/CurrentWithSplines/SplineToTexture.cs
index 03108aa8971..480ee028768 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/Scripts/CurrentWithSplines/SplineToTexture.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/Scripts/CurrentWithSplines/SplineToTexture.cs
@@ -3,11 +3,11 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering.HighDefinition;
-using UnityEditor.PackageManager.Requests;
-using UnityEditor.PackageManager;
 #if SPLINE_PACKAGE_INSTALLED
-    using UnityEditor.Splines;
-    using UnityEngine.Splines;
+    #if UNITY_EDITOR
+        using UnityEditor.Splines;
+    #endif
+using UnityEngine.Splines;
 #endif
 
 [ExecuteInEditMode]
@@ -51,7 +51,7 @@ void OnEnable()
 
     void HookCallbacks()
     {
-#if SPLINE_PACKAGE_INSTALLED
+#if SPLINE_PACKAGE_INSTALLED && UNITY_EDITOR
         if (splineContainer != null)
             foreach (Spline spline in splineContainer.Splines)
                 EditorSplineUtility.AfterSplineWasModified += OnAfterSplineWasModified;
@@ -60,7 +60,7 @@ void HookCallbacks()
 
     void UnhookCallbacks()
     {
-#if SPLINE_PACKAGE_INSTALLED
+#if SPLINE_PACKAGE_INSTALLED && UNITY_EDITOR
         if (splineContainer != null)
             foreach (Spline spline in splineContainer.Splines)
                 EditorSplineUtility.AfterSplineWasModified -= OnAfterSplineWasModified;
@@ -308,6 +308,8 @@ public void RunCompute()
 #endif
         }
     }
+
+#if UNITY_EDITOR
     public void OpenDialogAndSaveCurrentMap()
     {
         var path = EditorUtility.SaveFilePanel("Save current map", "","currentMap","png");
@@ -329,6 +331,7 @@ public static void SaveTextureOnDisk(RenderTexture renderTexture, string path)
         File.WriteAllBytes(path, bytesHeight);
         AssetDatabase.Refresh();
     }
+#endif
 
     public static Texture2D ToTexture2D(RenderTexture rTex)
     {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/VFX/VFX Graphs/VFX_Bubbles.vfx b/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/VFX/VFX Graphs/VFX_Bubbles.vfx
index ba6d105a9b2..817ebdf452a 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/VFX/VFX Graphs/VFX_Bubbles.vfx	
+++ b/Packages/com.unity.render-pipelines.high-definition/Samples~/WaterSamples/VFX/VFX Graphs/VFX_Bubbles.vfx	
@@ -40,7 +40,7 @@ MonoBehaviour:
     x: -756
     y: -1433
     width: 2083
-    height: 2555
+    height: 2552
 --- !u!114 &114350483966674976
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -79,7 +79,7 @@ MonoBehaviour:
   m_CustomAttributes: []
   m_ParameterInfo: []
   m_ImportDependencies: []
-  m_GraphVersion: 18
+  m_GraphVersion: 19
   m_ResourceVersion: 1
   m_SubgraphDependencies: []
   m_CategoryPath: 
@@ -95,10 +95,6 @@ VisualEffectResource:
     m_RendererSettings:
       motionVectorGenerationMode: 0
       shadowCastingMode: 0
-      rayTracingMode: 0
-      receiveShadows: 0
-      reflectionProbeUsage: 0
-      lightProbeUsage: 0
     m_CullingFlags: 3
     m_UpdateMode: 0
     m_PreWarmDeltaTime: 0.05
@@ -531,6 +527,7 @@ MonoBehaviour:
   m_SubOutputs:
   - {fileID: 8926484042661614687}
   - {fileID: 8926484042661614833}
+  useBaseColorMap: 3
   colorMapping: 0
   uvMode: 0
   flipbookLayout: 0
@@ -549,7 +546,7 @@ MonoBehaviour:
   enableRayTracing: 0
   decimationFactor: 1
   raytracedScaleMode: 0
-  needsOwnSort: 0
+  needsOwnSort: 1
   needsOwnAabbBuffer: 0
   shaderGraph: {fileID: 0}
   materialSettings:
@@ -2401,7 +2398,7 @@ MonoBehaviour:
   m_UIIgnoredErrors: []
   m_Parent: {fileID: 114350483966674976}
   m_Children: []
-  m_UIPosition: {x: 107, y: 509}
+  m_UIPosition: {x: 249, y: 506}
   m_UICollapsed: 0
   m_UISuperCollapsed: 0
   m_InputSlots:
@@ -3522,7 +3519,7 @@ MonoBehaviour:
   - {fileID: 8926484042661615048}
   - {fileID: 8926484042661615053}
   - {fileID: 8926484042661615054}
-  - {fileID: 8926484042661615058}
+  - {fileID: 8926484042661615098}
   error: 0.01
   maxIterations: 8
   surfaceType: 2
@@ -4038,142 +4035,6 @@ MonoBehaviour:
         PublicKeyToken=b77a5c561934e089
   m_Direction: 1
   m_LinkedSlots: []
---- !u!114 &8926484042661615058
-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: ac39bd03fca81b849929b9c966f1836a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 0}
-  m_Children:
-  - {fileID: 8926484042661615059}
-  - {fileID: 8926484042661615060}
-  - {fileID: 8926484042661615061}
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661615058}
-  m_MasterData:
-    m_Owner: {fileID: 8926484042661615042}
-    m_Value:
-      m_Type:
-        m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
-          Culture=neutral, PublicKeyToken=null
-      m_SerializableObject: '{"x":0.0,"y":0.0,"z":0.0}'
-    m_Space: -1
-  m_Property:
-    name: currentDirectionWS
-    m_serializedType:
-      m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
-        Culture=neutral, PublicKeyToken=null
-  m_Direction: 1
-  m_LinkedSlots: []
---- !u!114 &8926484042661615059
-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: f780aa281814f9842a7c076d436932e7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 8926484042661615058}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661615058}
-  m_MasterData:
-    m_Owner: {fileID: 0}
-    m_Value:
-      m_Type:
-        m_SerializableType: 
-      m_SerializableObject: 
-    m_Space: -1
-  m_Property:
-    name: x
-    m_serializedType:
-      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
-        PublicKeyToken=b77a5c561934e089
-  m_Direction: 1
-  m_LinkedSlots: []
---- !u!114 &8926484042661615060
-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: f780aa281814f9842a7c076d436932e7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 8926484042661615058}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661615058}
-  m_MasterData:
-    m_Owner: {fileID: 0}
-    m_Value:
-      m_Type:
-        m_SerializableType: 
-      m_SerializableObject: 
-    m_Space: -1
-  m_Property:
-    name: y
-    m_serializedType:
-      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
-        PublicKeyToken=b77a5c561934e089
-  m_Direction: 1
-  m_LinkedSlots: []
---- !u!114 &8926484042661615061
-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: f780aa281814f9842a7c076d436932e7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 8926484042661615058}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661615058}
-  m_MasterData:
-    m_Owner: {fileID: 0}
-    m_Value:
-      m_Type:
-        m_SerializableType: 
-      m_SerializableObject: 
-    m_Space: -1
-  m_Property:
-    name: z
-    m_serializedType:
-      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
-        PublicKeyToken=b77a5c561934e089
-  m_Direction: 1
-  m_LinkedSlots: []
 --- !u!114 &8926484042661615062
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5339,3 +5200,105 @@ MonoBehaviour:
   m_Direction: 0
   m_LinkedSlots:
   - {fileID: 8926484042661615038}
+--- !u!114 &8926484042661615098
+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: 1b2b751071c7fc14f9fa503163991826, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.VisualEffectGraph.Editor::UnityEditor.VFX.VFXSlotFloat2
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 0}
+  m_Children:
+  - {fileID: 8926484042661615099}
+  - {fileID: 8926484042661615100}
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661615098}
+  m_MasterData:
+    m_Owner: {fileID: 8926484042661615042}
+    m_Value:
+      m_Type:
+        m_SerializableType: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+      m_SerializableObject: '{"x":0.0,"y":0.0}'
+    m_Space: -1
+  m_Property:
+    name: currentDirectionWS
+    m_serializedType:
+      m_SerializableType: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+  m_Direction: 1
+  m_LinkedSlots: []
+--- !u!114 &8926484042661615099
+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: f780aa281814f9842a7c076d436932e7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.VisualEffectGraph.Editor::UnityEditor.VFX.VFXSlotFloat
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 8926484042661615098}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661615098}
+  m_MasterData:
+    m_Owner: {fileID: 0}
+    m_Value:
+      m_Type:
+        m_SerializableType: 
+      m_SerializableObject: 
+    m_Space: -1
+  m_Property:
+    name: x
+    m_serializedType:
+      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+  m_Direction: 1
+  m_LinkedSlots: []
+--- !u!114 &8926484042661615100
+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: f780aa281814f9842a7c076d436932e7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.VisualEffectGraph.Editor::UnityEditor.VFX.VFXSlotFloat
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 8926484042661615098}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661615098}
+  m_MasterData:
+    m_Owner: {fileID: 0}
+    m_Value:
+      m_Type:
+        m_SerializableType: 
+      m_SerializableObject: 
+    m_Space: -1
+  m_Property:
+    name: y
+    m_serializedType:
+      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+  m_Direction: 1
+  m_LinkedSlots: []
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.DefaultResources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.DefaultResources.cs
index 45a151e866b..7d31e3024fd 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.DefaultResources.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.DefaultResources.cs
@@ -144,7 +144,7 @@ public override Shader terrainDetailLitShader
         {
             get
             {
-                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeShaders>(
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
                         out var shadersResources))
                 {
                     return shadersResources.terrainDetailLitShader;
@@ -161,7 +161,7 @@ public override Shader terrainDetailGrassShader
         {
             get
             {
-                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeShaders>(
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
                         out var shadersResources))
                 {
                     return shadersResources.terrainDetailGrassShader;
@@ -178,7 +178,7 @@ public override Shader terrainDetailGrassBillboardShader
         {
             get
             {
-                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeShaders>(
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
                         out var shadersResources))
                 {
                     return shadersResources.terrainDetailGrassBillboardShader;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs
index fcb93d919e5..adf6056d87d 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs
@@ -300,8 +300,34 @@ public void Render(RenderGraph renderGraph, TextureHandle destination, TextureHa
                     // binding a dummy color target as a workaround to an OSX issue in Editor scene view (UUM-47698).
                     // Also required for preview camera rendering for grid drawn with builtin RP (UUM-55171).
                     // Also required for render gizmos (UUM-91335).
+                    // When MSAA is enabled with Dbuffer can cause sample count mismatches between active color and depth target; create a dummy color target to resolve. (UUM-131330)
                     if (cameraData.isSceneViewCamera || cameraData.isPreviewCamera || UnityEditor.Handles.ShouldRenderGizmos())
-                        builder.SetRenderAttachment(resourceData.activeColorTexture, 0);
+                    {
+                        // get info for the active color
+                        var activeColorInfo = renderGraph.GetRenderTargetInfo(resourceData.activeColorTexture);
+
+                        // destination depth info (the texture we created earlier)
+                        var destInfo = renderGraph.GetRenderTargetInfo(destination);
+
+                        // if samples mismatch, create a dummy color RT with dest's samples
+                        if (activeColorInfo.msaaSamples != destInfo.msaaSamples)
+                        {
+                            TextureHandle dummyColor = renderGraph.CreateTexture(new TextureDesc(activeColorInfo.width, activeColorInfo.height, false, true)
+                            {
+                                name = "Copy Depth Editor Dummy Color",
+                                slices = activeColorInfo.volumeDepth,
+                                format = activeColorInfo.format,
+                                msaaSamples = (MSAASamples)destInfo.msaaSamples, // match the depth target
+                                clearBuffer = false,
+                                bindTextureMS = activeColorInfo.bindMS
+                            });
+                            builder.SetRenderAttachment(dummyColor, 0);
+                        }
+                        else
+                        {
+                            builder.SetRenderAttachment(resourceData.activeColorTexture, 0);
+                        }
+                    }
 #endif
                 }
                 else if (CopyToDepthXR)
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeShaders.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeShaders.cs
index 54a40494d54..c92e881440d 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeShaders.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeShaders.cs
@@ -109,43 +109,99 @@ public Shader samplingPS
 
         #region Terrain
         [Header("Terrain")]
-        [SerializeField]
-        [ResourcePath("Shaders/Terrain/TerrainDetailLit.shader")]
-        private Shader m_TerrainDetailLit;
 
+        // Original serialized fields preserved for migration purposes.
+        // These fields maintain the original serialized data that was moved to UniversalRenderPipelineRuntimeTerrainShaders;
+        // when the asset is migrated from version 9 to 10, these fields are copied to their equivalents in
+        // UniversalRenderPipelineRuntimeTerrainShaders, and these are then set to null.
+        [SerializeField, HideInInspector] private Shader m_TerrainDetailLit;
+        [SerializeField, HideInInspector] private Shader m_TerrainDetailGrassBillboard;
+        [SerializeField, HideInInspector] private Shader m_TerrainDetailGrass;
+        
+        // Internal methods to access original serialized fields for migration
+        internal Shader GetOriginalTerrainDetailLitShader() => m_TerrainDetailLit;
+        internal Shader GetOriginalTerrainDetailGrassBillboardShader() => m_TerrainDetailGrassBillboard;
+        internal Shader GetOriginalTerrainDetailGrassShader() => m_TerrainDetailGrass;
+        internal void ClearOriginalTerrainDetailShaders()
+        {
+            m_TerrainDetailLit = null;
+            m_TerrainDetailGrassBillboard = null;
+            m_TerrainDetailGrass = null;
+        }
+        
         /// <summary>
         /// Returns the terrain detail lit shader that this asset uses.
         /// </summary>
+        [Obsolete("terrainDetailLitShader is obsolete. Use UniversalRenderPipelineRuntimeTerrainShaders.terrainDetailLitShader instead.", false)]
         public Shader terrainDetailLitShader
         {
-            get => m_TerrainDetailLit;
-            set => this.SetValueAndNotify(ref m_TerrainDetailLit, value);
+            get
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    return shadersResources.terrainDetailLitShader;
+                }
+                return null;
+            }
+            set
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    shadersResources.terrainDetailLitShader = value;
+                }
+            }
         }
 
-        [SerializeField]
-        [ResourcePath("Shaders/Terrain/WavingGrassBillboard.shader")]
-        private Shader m_TerrainDetailGrassBillboard;
-
         /// <summary>
         /// Returns the terrain detail grass billboard shader that this asset uses.
         /// </summary>
+        [Obsolete("terrainDetailGrassBillboardShader is obsolete. Use UniversalRenderPipelineRuntimeTerrainShaders.terrainDetailGrassBillboardShader instead.", false)]
         public Shader terrainDetailGrassBillboardShader
         {
-            get => m_TerrainDetailGrassBillboard;
-            set => this.SetValueAndNotify(ref m_TerrainDetailGrassBillboard, value);
+            get
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    return shadersResources.terrainDetailGrassBillboardShader;
+                }
+                return null;
+            }
+            set
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    shadersResources.terrainDetailGrassBillboardShader = value;
+                }
+            }
         }
 
-        [SerializeField]
-        [ResourcePath("Shaders/Terrain/WavingGrass.shader")]
-        private Shader m_TerrainDetailGrass;
-
         /// <summary>
         /// Returns the terrain detail grass shader that this asset uses.
         /// </summary>
+        [Obsolete("terrainDetailGrassShader is obsolete; Use UniversalRenderPipelineRuntimeTerrainShaders.terrainDetailGrassShader instead.)", false)]
         public Shader terrainDetailGrassShader
         {
-            get => m_TerrainDetailGrass;
-            set => this.SetValueAndNotify(ref m_TerrainDetailGrass, value);
+            get
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    return shadersResources.terrainDetailGrassShader;
+                }
+                return null;
+            }
+            set
+            {
+                if (GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeTerrainShaders>(
+                    out var shadersResources))
+                {
+                    shadersResources.terrainDetailGrassShader = value;
+                }
+            }
         }
         #endregion
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs
new file mode 100644
index 00000000000..e220f393f53
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs
@@ -0,0 +1,98 @@
+using System;
+
+namespace UnityEngine.Rendering.Universal
+{
+    /// <summary>
+    /// A resource container for shaders used for terrains in <see cref="UniversalRenderPipeline"/>.
+    /// </summary>
+    /// <remarks>
+    /// You cannot edit these resources through the editor's UI; use the API for advanced changes.
+    /// Changing this through the API is only allowed in the Editor. In the Player, this raises an error.
+    /// </remarks>
+    /// <seealso cref="IRenderPipelineResources"/>
+    /// <example>
+    /// <para> Here is an example of how to get the terrain detail lit shader used by URP. </para>
+    /// <code>
+    /// using UnityEngine.Rendering;
+    /// using UnityEngine.Rendering.Universal;
+    ///
+    /// public static class URPUniversalRendererRuntimeShadersHelper
+    /// {
+    ///     public static Shader terrainDetailLit
+    ///     {
+    ///         get
+    ///         {
+    ///             if (GraphicsSettings.TryGetRenderPipelineSettings&lt;UniversalRenderPipelineRuntimeTerrainShaders&gt;(
+    ///                 out var shadersResources))
+    ///             {
+    ///                 return shadersResources.terrainDetailLitShader;
+    ///             }
+    ///             return null;
+    ///         }
+    ///     }
+    /// }
+    /// </code>
+    /// </example>
+    [Serializable]
+    [SupportedOnRenderPipeline(typeof(UniversalRenderPipelineAsset))]
+    [Categorization.CategoryInfo(Name = "R: Runtime Shaders", Order = 1000), HideInInspector]
+    public class UniversalRenderPipelineRuntimeTerrainShaders : IRenderPipelineResources
+    {
+        [SerializeField][HideInInspector] private int m_Version = 0;
+
+        /// <summary>The current version of the resource container. Used only for upgrading a project.</summary>
+        public int version => m_Version;
+
+        bool IRenderPipelineGraphicsSettings.isAvailableInPlayerBuild
+        {
+            get
+            {
+                // Check if the setting exists and is enabled
+                if (GraphicsSettings.TryGetRenderPipelineSettings<URPTerrainShaderSetting>(out var settings))
+                {
+                    return settings.includeTerrainShaders;
+                }
+                return false; // Default to not including if settings don't exist
+            }
+        }
+
+        [SerializeField]
+        [ResourcePath("Shaders/Terrain/TerrainDetailLit.shader")]
+        private Shader m_TerrainDetailLit;
+
+        /// <summary>
+        /// Returns the terrain detail lit shader that this asset uses.
+        /// </summary>
+        public Shader terrainDetailLitShader
+        {
+            get => m_TerrainDetailLit;
+            set => this.SetValueAndNotify(ref m_TerrainDetailLit, value);
+        }
+
+        [SerializeField]
+        [ResourcePath("Shaders/Terrain/WavingGrassBillboard.shader")]
+        private Shader m_TerrainDetailGrassBillboard;
+
+        /// <summary>
+        /// Returns the terrain detail grass billboard shader that this asset uses.
+        /// </summary>
+        public Shader terrainDetailGrassBillboardShader
+        {
+            get => m_TerrainDetailGrassBillboard;
+            set => this.SetValueAndNotify(ref m_TerrainDetailGrassBillboard, value);
+        }
+
+        [SerializeField]
+        [ResourcePath("Shaders/Terrain/WavingGrass.shader")]
+        private Shader m_TerrainDetailGrass;
+
+        /// <summary>
+        /// Returns the terrain detail grass shader that this asset uses.
+        /// </summary>
+        public Shader terrainDetailGrassShader
+        {
+            get => m_TerrainDetailGrass;
+            set => this.SetValueAndNotify(ref m_TerrainDetailGrass, value);
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs.meta
new file mode 100644
index 00000000000..e482715b00c
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RenderPipelineResources/UniversalRenderPipelineRuntimeTerrainShaders.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 958d2de92110a4540b290e308f8b5ac1
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/PatchUtil.hlsl b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/PatchUtil.hlsl
index 44536da2645..ae4e8b9c02a 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/PatchUtil.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/PatchUtil.hlsl
@@ -99,7 +99,7 @@ namespace PatchUtil
     float2 SphereToSquare(float3 n)
     {
         n /= (abs(n.x) + abs(n.y) + abs(n.z));
-        n.xy = n.z >= 0.0 ? n.xy : OctWrap(n.xy);
+        n.xy = VECTOR_LOGIC_SELECT(n.z >= 0.0, n.xy, OctWrap(n.xy));
         n.xy = n.xy * 0.5 + 0.5;
         return n.xy;
     }
@@ -151,7 +151,7 @@ namespace PatchUtil
     uint3 SignedIntegerModulo(int3 x, uint modulus)
     {
         const uint3 remainder = uint3(abs(x)) % modulus;
-        return VECTOR_LOGIC_SELECT(x < 0 && remainder != 0, modulus - remainder, remainder);
+        return VECTOR_LOGIC_SELECT(VECTOR_LOGIC_AND(x < 0, remainder != 0), modulus - remainder, remainder);
     }
 
     uint3 ConvertGridSpaceToStorageSpace(uint3 posGridSpace, uint gridSize, int3 cascadeOffset)
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/VectorLogic.hlsl b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/VectorLogic.hlsl
index 9c95cd462d3..4186a810511 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/VectorLogic.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGI/SurfaceCacheCore/VectorLogic.hlsl
@@ -1,7 +1,7 @@
 #ifndef VECTOR_LOGIC
 #define VECTOR_LOGIC
 
-#if defined(XBOX)
+#if defined(SHADER_API_GAMECORE)
 #define USE_HLSL2021_VECTOR_LOGIC_INTRINSICS
 #endif
 
@@ -9,7 +9,7 @@
 
 #define VECTOR_LOGIC_AND(x, y) and(x, y)
 #define VECTOR_LOGIC_OR(x, y) or(x, y)
-#define VECTOR_LOGIC_SELECT(condition, trueValue, falseValue) select(condition, trueValue, falseValue)
+#define VECTOR_LOGIC_SELECT(condition, trueValue, falseValue) select((condition), (trueValue), (falseValue))
 
 #else
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs
new file mode 100644
index 00000000000..465e7788301
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace UnityEngine.Rendering.Universal
+{
+    /// <summary>
+    /// A Graphics Settings container for settings related to terrain shaders in <see cref="UniversalRenderPipeline"/>.
+    /// </summary>
+    /// <remarks>
+    /// To change those settings, go to Editor > Project Settings in the Graphics tab (URP).
+    /// Changing those settings through the API is only allowed in the Editor. In the Player, this raises an error.
+    /// 
+    /// Unity removes this container from Players at build time.
+    /// </remarks>
+    /// <seealso cref="IRenderPipelineGraphicsSettings"/>
+    /// <example>
+    /// <para> Here is an example of how to determine if your project has included terrain shaders when building a Player with URP. </para>
+    /// <code>
+    /// using UnityEngine.Rendering;
+    /// using UnityEngine.Rendering.Universal;
+    /// 
+    /// public static class URPTerrainShaderHelper
+    /// {
+    ///     public static bool enabled
+    ///     {
+    ///         get
+    ///         {
+    ///             var gs = GraphicsSettings.GetRenderPipelineSettings&lt;URPTerrainShaderSetting&gt;();
+    ///             if (gs == null) //not in URP or in a Player
+    ///                 return false;
+    ///             return gs.includeTerrainShaders;
+    ///         }
+    ///     }
+    /// }
+    /// </code>
+    /// </example>
+    [Serializable]
+    [SupportedOnRenderPipeline(typeof(UniversalRenderPipelineAsset))]
+    [Categorization.CategoryInfo(Name = "Terrain Shader Inclusion Settings", Order = 50)]
+    [Categorization.ElementInfo(Order = 10)]
+    public class URPTerrainShaderSetting : IRenderPipelineGraphicsSettings
+    {
+        #region Version
+        internal enum Version : int
+        {
+            Initial = 0,
+        }
+
+        [SerializeField][HideInInspector]
+        private Version m_Version;
+
+        /// <summary>Indicates the current version of this settings container. Used exclusively for project upgrades.</summary>
+        public int version => (int)m_Version;
+        #endregion
+
+        #region Settings
+        [SerializeField]
+        [Tooltip("Include terrain shaders in build even if not referenced.")]
+        bool m_IncludeTerrainShaders = true;
+
+        /// <summary>
+        /// Controls whether terrain shaders are included in the build.
+        /// </summary>
+        public bool includeTerrainShaders
+        {
+            get => m_IncludeTerrainShaders;
+            set => this.SetValueAndNotify(ref m_IncludeTerrainShaders, value);
+        }
+        #endregion
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs.meta
new file mode 100644
index 00000000000..c085f307cb6
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPTerrainShaderSetting.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2f5d344954b35bc4faad3771ebd6ccd8
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs
index 125790db6f7..31d2e797eb8 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs
@@ -28,7 +28,7 @@ partial class UniversalRenderPipelineGlobalSettings : RenderPipelineGlobalSettin
 
         internal bool IsAtLastVersion() => k_LastVersion == m_AssetVersion;
 
-        internal const int k_LastVersion = 9;
+        internal const int k_LastVersion = 10;
 
 #pragma warning disable CS0414
         [SerializeField][FormerlySerializedAs("k_AssetVersion")]
@@ -168,6 +168,13 @@ public static void UpgradeAsset(EntityId assetInstanceID)
                 asset.m_AssetVersion = 9;
             }
 
+            // Migrate terrain shader settings from UniversalRenderPipelineRuntimeShaders to UniversalRenderPipelineRuntimeTerrainShaders
+            if (asset.m_AssetVersion < 10)
+            {
+                MigrateTerrainShaderSettings(asset);
+                asset.m_AssetVersion = 10;
+            }
+
             // If the asset version has changed, means that a migration step has been executed
             if (assetVersionBeforeUpgrade != asset.m_AssetVersion)
                 EditorUtility.SetDirty(asset);
@@ -239,6 +246,31 @@ static void MigrateDefaultVolumeProfile(UniversalRenderPipelineGlobalSettings da
 #pragma warning restore 618 // Type or member is obsolete
         }
 
+        static void MigrateTerrainShaderSettings(UniversalRenderPipelineGlobalSettings data)
+        {
+            try
+            {
+                // Get existing UniversalRenderPipelineRuntimeShaders settings
+                if (!GraphicsSettings.TryGetRenderPipelineSettings<UniversalRenderPipelineRuntimeShaders>(out var runtimeShaders))
+                {
+                    return;
+                }
+
+                // Create/get UniversalRenderPipelineRuntimeTerrainShaders container
+                var runtimeTerrainShaders = GetOrCreateGraphicsSettings<UniversalRenderPipelineRuntimeTerrainShaders>(data);
+
+                // Migrate terrain shaders from runtimeShaders to terrainShaders
+                runtimeTerrainShaders.terrainDetailLitShader = runtimeShaders.GetOriginalTerrainDetailLitShader();
+                runtimeTerrainShaders.terrainDetailGrassBillboardShader = runtimeShaders.GetOriginalTerrainDetailGrassBillboardShader();
+                runtimeTerrainShaders.terrainDetailGrassShader = runtimeShaders.GetOriginalTerrainDetailGrassShader();
+                runtimeShaders.ClearOriginalTerrainDetailShaders();
+            }
+            catch (System.Exception ex)
+            {
+                Debug.LogWarning($"URP: Failed to migrate terrain detail shader settings: {ex.Message}. Terrain detail shaders will use default values.");
+            }
+        }
+
 #endif // #if UNITY_EDITOR
 
         #endregion
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs
new file mode 100644
index 00000000000..4a820c4412b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs
@@ -0,0 +1,62 @@
+using NUnit.Framework;
+using System;
+
+namespace UnityEngine.Rendering.Universal.Tests
+{
+    /// <summary>
+    /// Tests for terrain shaders in the Universal Render Pipeline.
+    /// Verifies that terrain detail shaders are available through both Shader.Find() and UniversalRenderPipelineAsset properties.
+    /// </summary>
+    class TerrainShaderTests
+    {
+        UniversalRenderPipelineAsset m_UrpAsset;
+
+        [SetUp]
+        public void Setup()
+        {
+            // Only run this with URP in smoke tests.
+            if (GraphicsSettings.currentRenderPipeline is not UniversalRenderPipelineAsset)
+                Assert.Ignore("URP Only test");
+
+            m_UrpAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset;
+        }
+
+        /// <summary>
+        /// Tests that the URP terrain detail shaders can be found using Shader.Find().
+        /// </summary>
+        [TestCaseSource(nameof(ShaderNames))]
+        public void TerrainShaders_ShaderFind_ReturnsValidShader(string shaderName)
+        {
+            var shader = Shader.Find(shaderName);
+            Assert.IsNotNull(shader, $"{shaderName} should be found via Shader.Find()");
+            Assert.IsTrue(shader.isSupported, $"{shaderName} should be supported on current platform");
+        }
+
+        private static readonly string[] ShaderNames =
+        {
+            "Hidden/TerrainEngine/Details/UniversalPipeline/Vertexlit",
+            "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass",
+            "Hidden/TerrainEngine/Details/UniversalPipeline/BillboardWavingDoublePass"
+        };
+
+        /// <summary>
+        /// Tests that the UniversalRenderPipelineAsset terrain detail shader properties returns valid shaders.
+        /// </summary>
+        [TestCaseSource(nameof(URPShaderAccessors))]
+        public void UniversalRenderPipelineAsset_TerrainShaders_ReturnsValidShaders(Func<UniversalRenderPipelineAsset, Shader> getShader, string description)
+        {
+            Assert.IsNotNull(m_UrpAsset, "UniversalRenderPipelineAsset should be available");
+            var shader = getShader(m_UrpAsset);
+            Assert.IsNotNull(shader, $"{description} should not be null");
+            Assert.IsTrue(shader.isSupported, $"{description} should be supported on current platform");
+        }
+
+        private static readonly object[] URPShaderAccessors =
+        {
+            new object[] { new Func<UniversalRenderPipelineAsset, Shader>(a => a.terrainDetailLitShader), "URP terrainDetailLitShader" },
+            new object[] { new Func<UniversalRenderPipelineAsset, Shader>(a => a.terrainDetailGrassShader), "URP terrainDetailGrassShader" },
+            new object[] { new Func<UniversalRenderPipelineAsset, Shader>(a => a.terrainDetailGrassBillboardShader), "URP terrainDetailGrassBillboardShader" }
+        };
+
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs.meta b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs.meta
new file mode 100644
index 00000000000..5b129269efd
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/TerrainShaderTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4a5118ba2fa293c4b8a60da869ccea72
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Documentation~/Normal-Strength-Node.md b/Packages/com.unity.shadergraph/Documentation~/Normal-Strength-Node.md
index d4da65714bd..bf4b84ea74c 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Normal-Strength-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Normal-Strength-Node.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-Adjusts the strength of the normal map defined by input **In** by the amount of input **Strength**. A **Strength** value of 1 will return the input unaltered. A **Strength** value of 0 will return a blank normal map.
+Adjusts the strength of the normal map defined by input **In** by the amount of input **Strength**. A **Strength** value of 1 will return the input unaltered. A **Strength** value of 0 will return a blank (flat) tangent-space normal: vector (0, 0, 1). When encoded as a texture color in the 0–1 range, this corresponds to (0.5, 0.5, 1.0) or 128, 128, 255 in 8-bit.
 
 ## Ports
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-Node.md b/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-Node.md
index 74287e70811..f07eee8dea4 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-Node.md
@@ -27,23 +27,19 @@ The Sample Texture 2D [!include[nodes-inputs](./snippets/nodes-inputs.md)]
 | **Texture** | Texture 2D | None | The Texture 2D asset to sample.| 
 | **UV** | Vector 2 | UV | The UV coordinates to use to sample the texture. |
 | **Sampler** | Sampler State | Default Sampler State | The Sampler State and settings to use to sample the texture.|
-| **LOD** | Float | LOD | The specific mip to use when sampling the Texture. **NOTE** The **LOD** Input port only displays if **Mip Sampling Mode** is **LOD**. For more information, refer to [Additional node settings](#additional-node-settings). |
-| **Bias** | Float | Bias | **NOTE**: The **Bias** Input port only displays if **Mip Sampling Mode** is **Bias**. For more information, refer to [Additional node settings](#additional-node-settings). If **Use Global Mip Bias** is enabled, Unity adds this Bias amount to the Global Mip Bias for a texture's mip calculation. If **Global Mip Bias** is disabled, Unity uses this Bias amount instead of the Global Mip Bias. |
-| **DDX** | Float | DDY | **NOTE**: The DDX Input port only displays if **Mip Sampling Mode** is **Gradient**. For more information, refer to [Additional node settings](#additional-node-settings). The specific DDX value to use to calculate the texture's mip when sampling. For more information on DDX values for mipmaps, refer to [Mipmaps introduction](https://docs.unity3d.com/Documentation/Manual/texture-mipmaps-introduction.html) in the Unity User Manual. |
-| **DDY** | Float | DDY | **NOTE** The **DDY** Input port only displays if **Mip Sampling Mode** is **Gradient**. For more information, refer to [Additional node settings](#additional-node-settings). The specific DDY value to use to calculate the texture's mip when sampling. For more information on DDY values for mipmaps, refer to [Mipmaps introduction](https://docs.unity3d.com/Documentation/Manual/texture-mipmaps-introduction.html)> in the Unity User Manual. |
+| **LOD** | Float | LOD | The specific mip to use when sampling the Texture.<br/>**Note**: The **LOD** Input port only displays if **Mip Sampling Mode** is **LOD**. For more information, refer to [Additional node settings](#additional-node-settings). |
+| **Bias** | Float | Bias | When you enable **Use Global Mip Bias**, Unity adds this Bias amount to the Global Mip Bias for a texture's mip calculation. When you disable **Global Mip Bias**, Unity uses this Bias amount instead of the Global Mip Bias. <br/>**Note**: The **Bias** Input port only displays if **Mip Sampling Mode** is **Bias**. For more information, refer to [Additional node settings](#additional-node-settings). |
+| **DDX** | Float | DDY | The specific DDX value to use to calculate the texture's mip when sampling. For more information on DDX values for mipmaps, refer to [Mipmaps introduction](https://docs.unity3d.com/Documentation/Manual/texture-mipmaps-introduction.html) in the Unity User Manual.<br/>**Note**: The DDX Input port only displays if **Mip Sampling Mode** is **Gradient**. For more information, refer to [Additional node settings](#additional-node-settings). |
+| **DDY** | Float | DDY | The specific DDY value to use to calculate the texture's mip when sampling. For more information on DDY values for mipmaps, refer to [Mipmaps introduction](https://docs.unity3d.com/Documentation/Manual/texture-mipmaps-introduction.html)> in the Unity User Manual.<br/>**Note**: The **DDY** Input port only displays if **Mip Sampling Mode** is **Gradient**. For more information, refer to [Additional node settings](#additional-node-settings). |
 
 ## Controls
 
 The Sample Texture 2D [!include[nodes-controls](./snippets/nodes-controls.md)]
 
-| **Name** | **Type**     | **Subtype** | **Description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|----------|--------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Type** | **Dropdown** | N/A         | Select whether the texture is a Texture asset or a normal map.                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| N/A      | N/A          | **Default** | The texture is a Texture asset.                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| N/A      | N/A          | **Normal**  | The texture is a normal map.                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Space    | Dropdown     | N/A         | Select whether the texture is a Texture asset or a normal map.                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| N/A      | N/A          | **Tangent** | Use a Tangent normal map whenever the mesh for a geometry needs to deform or change, such as when animating a character. With Tangent Space, the normal map's normals are relative to the existing vertex normals of any geometry rendered with your Shader Graph. Your Shader Graph only adjusts the vertex normals and not override them.                                                                                                                                    |
-| N/A      | N/A          | **Object**  | Use an Object normal map whenever the mesh for a geometry is static and doesn't deform. With Object Space, the normal map's normals are explicit and override the normals of any geometry rendered with your Shader Graph. Because a static mesh's normals never change, an Object normal map also maintains consistent lighting across different levels of detail (LODs). <br> For more information about normal maps, refer to Normal map (Bump mapping) in the User manual. |
+| **Name** | **Description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Type** | Select whether the texture is a Texture asset or a normal map. The options are:<ul><li>**Default**: Outputs the raw texture data according to the imported texture format or the format specified when the texture/render texture was created. For more information, refer to [GraphicsFormat](https://docs.unity3d.com/Documentation/ScriptReference/Experimental.Rendering.GraphicsFormat.html).</li><li>**Normal**: Interprets the texture as a normal map and outputs RGB in the range [&minus;1, 1].                                                                                                                                        |
+| Space    | Select the space used when Type is Normal. Behavior varies based on whether the blue channel is used. The options are:<ul><li>**Tangent**: Assumes an imported Normal Map format where only X and Y are stored. The blue channel is ignored. Use Tangent space for deforming meshes (for example, animated characters). Normals are relative to the mesh’s vertex normals. Shader Graph adjusts but does not override them.</li><li>**Object**: Uses the blue channel and expects the texture to be UNorm in Linear color space. Use Object space for static meshes. Normals override mesh normals and maintain consistent lighting across LODs. |
 
 ## Additional node settings
 
@@ -65,7 +61,7 @@ If the Sample Texture 2D node uses the **Standard** Mip Sampling Mode, the Textu
 
 ![An image of the Graph window, that displays a UV Lat Long Subgraph node connected to the UV input port on a Sample Texture 2D node. The Sample Texture 2D provides its RGBA output to the Base Color Block node in the Master Stack. The Main Preview of the sampled Texture has a noticeable seam along the middle of the sphere.](images/sg-sample-texture-2d-node-example.png)
 
-When the Mip Sampling Mode is set to **Gradient**, the Sample Texture 2D node can use the standard set of UVs for the model in the mip level calculation, instead of the latitude and longitude UVs needed for sampling the texture. The new UV coordinates passed into the **DDX** and **DDY** input ports result in a continuous mip level, and remove the seam.
+When you set the Mip Sampling Mode to **Gradient**, the Sample Texture 2D node can use the standard set of UVs for the model in the mip level calculation, instead of the latitude and longitude UVs needed for sampling the texture. The new UV coordinates passed into the **DDX** and **DDY** input ports result in a continuous mip level, and remove the seam.
 
 ![An image of the Graph window, that displays the same Sample Texture 2D node as the previous image. This time, the Mip Sampling Mode in the Graph Inspector has been set to Gradient. The new DDX and DDY input ports on the Sample Texture 2D node receive input from a DDX and DDY node, with input from a UV node. The seam on the Main Preview of the Texture has disappeared.](images/sg-sample-texture-2d-node-example-2.png)
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Sample-UGUI-Shaders.md b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Sample-UGUI-Shaders.md
index da576e96f05..e77ef30e74f 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Sample-UGUI-Shaders.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Sample-UGUI-Shaders.md
@@ -24,7 +24,7 @@ We have two main objectives with this sample set:
  Documentation for this set of samples is broken into the following pages:
 
 * [Getting started](Shader-Graph-Sample-UGUI-Shaders-Getting-Started.md)
-* [Custom UI componenents](Shader-Graph-Sample-UGUI-Shaders-Custom-UI-components.md)
+* [Custom UI components](Shader-Graph-Sample-UGUI-Shaders-Custom-UI-components.md)
 * [Custom nodes](Shader-Graph-Sample-UGUI-Shaders-Custom-nodes.md)
 * [Subgraph nodes](Shader-Graph-Sample-UGUI-Shaders-Subgraph-nodes.md)
 * [Examples](Shader-Graph-Sample-UGUI-Shaders-Examples.md)
diff --git a/Packages/com.unity.shadergraph/Documentation~/snippets/sample-nodes/nodes-sample-mip-bias-sample-mode-table.md b/Packages/com.unity.shadergraph/Documentation~/snippets/sample-nodes/nodes-sample-mip-bias-sample-mode-table.md
index 1eb6b4a365e..cabcdf3996e 100644
--- a/Packages/com.unity.shadergraph/Documentation~/snippets/sample-nodes/nodes-sample-mip-bias-sample-mode-table.md
+++ b/Packages/com.unity.shadergraph/Documentation~/snippets/sample-nodes/nodes-sample-mip-bias-sample-mode-table.md
@@ -2,13 +2,10 @@
 title: nodes-sample-mip-bias-sample-mode-table.md
 ---
 
-| **Name**                | **Type** | **Option**   | **Description**                                                                                                                                                                                                                                                                                                                                                                                                           |
-|-------------------------|----------|--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Use Global Mip Bias** | Toggle   | N/A          | Enable Use Global Mip Bias to use the render pipeline's Global Mip Bias. This bias adjusts the percentage of texture information taken from a specific mip when sampling. For more information on mip bias, refer to Mipmaps introduction in the Unity User Manual.                                                                                                                                                       |
-| N/A                     | N/A      | **Enabled**  | Shader Graph uses the render pipeline's Global Mip Bias to adjust the texture information taken when sampling.                                                                                                                                                                                                                                                                                                            |
-| N/A                     | N/A      | **Disabled** | Shader Graph doesn't use the render pipeline's Global Mip Bias to adjust texture information when sampling.                                                                                                                                                                                                                                                                                                               |
-| **Mip Sampling Mode**   | Dropdown | N/A          | Choose the sampling mode to use to calculate the mip level of the texture.                                                                                                                                                                                                                                                                                                                                                |
-| N/A                     | N/A      | **Standard** | The render pipeline calculates and automatically selects the mip for the texture.                                                                                                                                                                                                                                                                                                                                         |
-| N/A                     | N/A      | **LOD**      | The render pipeline lets you set an explicit mip for the texture on the node. The texture will always use this mip, regardless of the DDX or DDY calculations between pixels. Set the Mip Sampling Mode to LOD to connect the node to a Block node in the Vertex Context. For more information on Block nodes and Contexts, refer to Master Stack.                                                                        |
-| N/A                     | N/A      | **Gradient** | The render pipeline lets you set the DDX and DDY values to use for its mip calculation, instead of using the values calculated from the texture's UV coordinates. For more information on DDX and DDY values, refer to Mipmaps introduction in the User Manual.                                                                                                                                                           |
-| N/A                     | N/A      | **Bias**     | The render pipeline lets you set a bias to adjust the calculated mip for a texture up or down. Negative values bias the mip to a higher resolution. Positive values bias the mip to a lower resolution. The render pipeline can add this value to the value of the Global Mip Bias, or use this value instead of its Global Mip Bias. For more information on mip bias, refer to Mipmaps introduction in the User Manual. |
+| **Option**              | **Description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|-------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Use Global Mip Bias** | Enable Use Global Mip Bias to use the render pipeline's Global Mip Bias. This bias adjusts the percentage of texture information taken from a specific mip when sampling. For more information on mip bias, refer to Mipmaps introduction in the Unity User Manual. The options are:<ul><li>**Enabled**: Shader Graph uses the render pipeline's Global Mip Bias to adjust the texture information taken when sampling.</li><li>**Disabled**: Shader Graph doesn't use the render pipeline's Global Mip Bias to adjust texture information when sampling.</li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| **Mip Sampling Mode**   | Choose the sampling mode to use to calculate the mip level of the texture. The options are:<ul><li>**Standard**: The render pipeline calculates and automatically selects the mip for the texture.</li><li>**LOD**: The render pipeline lets you set an explicit mip for the texture on the node. The texture will always use this mip, regardless of the DDX or DDY calculations between pixels. Set the Mip Sampling Mode to LOD to connect the node to a Block node in the Vertex Context. For more information on Block nodes and Contexts, refer to Master Stack.</li><li>**Gradient**: The render pipeline lets you set the DDX and DDY values to use for its mip calculation, instead of using the values calculated from the texture's UV coordinates. For more information on DDX and DDY values, refer to Mipmaps introduction in the User Manual.</li><li>**Bias**: The render pipeline lets you set a bias to adjust the calculated mip for a texture up or down. Negative values bias the mip to a higher resolution. Positive values bias the mip to a lower resolution. The render pipeline can add this value to the value of the Global Mip Bias, or use this value instead of its Global Mip Bias. For more information on mip bias, refer to Mipmaps introduction in the User Manual.</li></ul> |
+
+
+
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
index 3465b482fbd..210b7c7604a 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
@@ -102,7 +102,7 @@ public sealed override void UpdateNodeAfterDeserialization()
 
             int outputLength = _maskInput.Length;
             int inputLength = 1;
-            foreach(var c in _maskInput)
+            foreach(var c in _maskInput.ToLowerInvariant())
             {
                 switch (c)
                 {
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
index ba4199930cc..e2c038f8950 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
@@ -1957,7 +1957,7 @@ void KeywordAddCallbacks()
                     else if (int.TryParse(displayName, out int intVal) || float.TryParse(displayName, out float floatVal))
                         Debug.LogWarning("Invalid display name. Display names cannot be valid integer or floating point numbers.");
                     else
-                        keyword.entries[index] = new KeywordEntry(GetFirstUnusedKeywordID(), displayName, referenceName);
+                        keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);
 
                     this._postChangeValueCallback(true);
                 }
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShim.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShim.hlsl
index f731d18999f..42a8a36a2f0 100644
--- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShim.hlsl
+++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShim.hlsl
@@ -9,4 +9,13 @@
 #undef SAMPLE_DEPTH_TEXTURE
 #undef SAMPLE_DEPTH_TEXTURE_LOD
 
+#ifdef SHADER_API_VULKAN
+#undef UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION
+#undef UNITY_DISPLAY_ORIENTATION_PRETRANSFORM_0
+#undef UNITY_DISPLAY_ORIENTATION_PRETRANSFORM_90
+#undef UNITY_DISPLAY_ORIENTATION_PRETRANSFORM_180
+#undef UNITY_DISPLAY_ORIENTATION_PRETRANSFORM_270
+#undef UNITY_DISPLAY_ORIENTATION_PRETRANSFORM
+#endif
+
 #include "Internal/UnityUIE.cginc"
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs b/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs
index 5b589dc8d63..321ad95f8be 100644
--- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs
+++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs
@@ -110,6 +110,7 @@ public virtual SubShaderDescriptor GenerateDefaultSubshader(bool isSRP = true )
                     shaderFallback = "",
                     CanUseSpriteAtlas = "True",
                     generatesPreview = true,
+                    customTags = "\"isCustomUITKShader\"=\"true\"",
                     passes = new PassCollection(),
 
                 };
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
index 6db5b0fefcb..26dce472e2d 100644
--- a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
+++ b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
@@ -14,7 +14,7 @@ ChannelEnumControlView > Label {
     max-width: 100px;
     width: 50px;
     margin-left: 8px;
-    margin-right: 8px;
+    margin-right: 12px;
     -unity-text-align : middle-left;
     flex-grow: 1;
 }
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs
index 27c09387b49..662f67d812b 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs
@@ -17,7 +17,7 @@ namespace Unity.UI.Shaders.Sample
     /// <see cref="Selectable.DoStateTransition(Selectable.SelectionState, bool)"/> is called.
     /// <para>Implemented as a <see cref="Selectable"/>.</para>
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Button")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Button")]
     public class CustomButton : Selectable, IPointerClickHandler, ISubmitHandler /*Button*/, IMaterialModifier
     {
         public UnityEvent onClick;
@@ -105,7 +105,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         }
 
 #if UNITY_EDITOR
-        [MenuItem("GameObject/UI/ShaderGraph Samples/Button", false, 30)]
+        [MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Button", false, 30)]
         static void CreateButtonGameObject(MenuCommand command)
         {
             GameObject go = ObjectFactory.CreateGameObject("SG Button", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(CustomButton) });
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs
index d6ba085023c..7cbd04c1531 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs
@@ -15,7 +15,7 @@ namespace Unity.UI.Shaders.Sample
     /// A custom Slider.
     /// <para>Unlike a <see cref="Slider"/>, this uses only a single RectTransform.</para>
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Slider")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Slider")]
     [RequireComponent(typeof(Graphic))]
     [DisallowMultipleComponent]
     public class CustomSlider : Selectable, IDragHandler, IInitializePotentialDragHandler, IMaterialModifier
@@ -288,7 +288,7 @@ public virtual void OnInitializePotentialDrag(PointerEventData eventData)
         }
 
 #if UNITY_EDITOR
-        [MenuItem("GameObject/UI/ShaderGraph Samples/Slider", false, 30)]
+        [MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Slider", false, 30)]
         static void CreateToggleGameObject(MenuCommand command)
         {
             GameObject go = ObjectFactory.CreateGameObject("Slider", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(CustomSlider) });
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs
index c952b694feb..d5d33e380a5 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs
@@ -17,7 +17,7 @@ namespace Unity.UI.Shaders.Sample
     /// <see cref="Toggle.isOn"/> changes.
     /// <para>Implemented as a variant of <see cref="Toggle"/> to make it work nicely with <see cref="ToggleGroup"/>.</para>
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Toggle")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Toggle")]
     [RequireComponent(typeof(Graphic))]
     public class CustomToggle : Toggle, IMaterialModifier
     {
@@ -129,7 +129,7 @@ public override void OnSubmit(BaseEventData eventData)
         }
 
 #if UNITY_EDITOR
-        [MenuItem("GameObject/UI/ShaderGraph Samples/Toggle", false, 30)]
+        [MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Toggle", false, 30)]
         static void CreateToggleGameObject(MenuCommand command)
         {
             GameObject go = ObjectFactory.CreateGameObject("SG Toggle", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(CustomToggle) });
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/GraphicColor.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/GraphicColor.cs
index 6e9a443ee1c..74b59cec70f 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/GraphicColor.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/GraphicColor.cs
@@ -7,7 +7,7 @@ namespace Unity.UI.Shaders.Sample
     /// <summary>
     /// 
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Graphic Color")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Graphic Color")]
     [RequireComponent(typeof(Graphic))]
     public class GraphicColor : UIBehaviour
     {
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs
index c1477e47b8a..f9795421c0b 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs
@@ -12,7 +12,7 @@ namespace Unity.UI.Shaders.Sample
     /// <summary>
     /// A simple Meter.
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Meter")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Meter")]
     [RequireComponent(typeof(Graphic))]
     [DisallowMultipleComponent]
     public class Meter : UIBehaviour, IMaterialModifier
@@ -108,7 +108,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         }
 
 #if UNITY_EDITOR
-        [MenuItem("GameObject/UI/ShaderGraph Samples/Meter", false, 30)]
+        [MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Meter", false, 30)]
         static void CreateToggleGameObject(MenuCommand command)
         {
             GameObject go = ObjectFactory.CreateGameObject("Meter", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(Meter) });
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs
index 6c594ce6c3c..660d6f7edc9 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs
@@ -13,7 +13,7 @@ namespace Unity.UI.Shaders.Sample
     /// A simple ProgressBar.
     /// <para>Becomes interactable when associated with a <see cref="CustomSlider"/></para>
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/Range Bar")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Range Bar")]
     [RequireComponent(typeof(Graphic))]
     [DisallowMultipleComponent]
     public class RangeBar : UIBehaviour, IMaterialModifier
@@ -137,7 +137,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         }
 
 #if UNITY_EDITOR
-        [MenuItem("GameObject/UI/ShaderGraph Samples/Range Bar", false, 30)]
+        [MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Range Bar", false, 30)]
         static void CreateToggleGameObject(MenuCommand command)
         {
             GameObject go = ObjectFactory.CreateGameObject("Range Bar", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(RangeBar) });
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs
index a5e23c61e56..ccef45d76e7 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs
@@ -7,7 +7,7 @@ namespace Unity.UI.Shaders.Sample
     /// <summary>
     /// Sets the UI Material's Property to the <see cref="UnityEngine.RectTransform"/>'s screen size.
     /// </summary>
-    [AddComponentMenu("UI/ShaderGraph Samples/RectTransform Size")]
+    [AddComponentMenu("UI (Canvas)/ShaderGraph Samples/RectTransform Size")]
     [ExecuteAlways]
     [RequireComponent(typeof(RectTransform), typeof(Graphic))]
     [DisallowMultipleComponent]
diff --git a/Packages/com.unity.visualeffectgraph/Documentation~/sample-content.md b/Packages/com.unity.visualeffectgraph/Documentation~/sample-content.md
index c26294b7689..b148e2b7689 100644
--- a/Packages/com.unity.visualeffectgraph/Documentation~/sample-content.md
+++ b/Packages/com.unity.visualeffectgraph/Documentation~/sample-content.md
@@ -30,7 +30,7 @@ The helper scripts this sample includes are:
 - **VFXOutputEventPlayAudio**: When it receives an Output Event with the name you specify, this helper script plays a sound from an AudioSource
 - **VFXOutputEventPrefabSpawn**: When it receives an Output Event with the name you specify, this helper script spawns an invisible Prefab from a pool of Prefabs. It spawns them at a given position and rotation. It also manages the life of the Prefab based on the Event's [lifetime attribute](Reference-Attributes.md). When the Prefabs spawns, you can use **VFXOutputEventPrefabAttributeHandler** scripts to configure the Prefab's child elements. For more information, see [Using VFXOutputEventPrefabSpawn ](#using-vfxoutputeventprefabspawn).
 - **VFXOutputEventRigidBody**: When it receives an Output Event with the name you specify, this helper script applies a force to a [RigidBody](https://docs.unity3d.com/ScriptReference/Rigidbody.html).
-- **VFXOutputEventRigidBody**: When it receives an Output Event with the name you specify, this helper script triggers a [UnityEvent](https://docs.unity3d.com/ScriptReference/Events.UnityEvent.html).
+- **VFXOutputEventUnityEvent**: When it receives an Output Event with the name you specify, this helper script triggers a [UnityEvent](https://docs.unity3d.com/ScriptReference/Events.UnityEvent.html).
 
 ### Using VFXOutputEventPrefabSpawn
 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937.meta
new file mode 100644
index 00000000000..fa89a8aef99
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 631a99d02461475cb9d48a3b86a70960
+timeCreated: 1764124845
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources.meta
new file mode 100644
index 00000000000..16ce83418d2
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55a1a5558f68a2c47825a9bcb4382453
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph
new file mode 100644
index 00000000000..249d6bc1cd0
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph
@@ -0,0 +1,949 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "468cad4b8a9d47c0b94f545a25290969",
+    "m_Properties": [
+        {
+            "m_Id": "717c4bfd2adf4f5dbb84b2d5d712ded2"
+        },
+        {
+            "m_Id": "f83f36a9fa5748158e136fc667b47c71"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "891621aaec554f0b97981df82914be23"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "d9a1fe5907164a40af97432a3e6c957c"
+        },
+        {
+            "m_Id": "71e89e1482b5425a99f5e9c3428f99ea"
+        },
+        {
+            "m_Id": "0cf20c690b37412b9ffe64bf2c2241f9"
+        },
+        {
+            "m_Id": "3c923239e3e34109945dfc365b82686c"
+        },
+        {
+            "m_Id": "54b906f5dfb24981b1f22716eaeaf4f4"
+        },
+        {
+            "m_Id": "2b8eb6bcbcd54392a7e6cb3758839e88"
+        },
+        {
+            "m_Id": "19d2d4f1e8db47068cb5e3ba63723c75"
+        },
+        {
+            "m_Id": "9503b50f8dcc4061958b8ac5d0d5ddf5"
+        },
+        {
+            "m_Id": "599646d3eb46420aa9a247281e93d8dc"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "19d2d4f1e8db47068cb5e3ba63723c75"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "2b8eb6bcbcd54392a7e6cb3758839e88"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "2b8eb6bcbcd54392a7e6cb3758839e88"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "599646d3eb46420aa9a247281e93d8dc"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "599646d3eb46420aa9a247281e93d8dc"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3c923239e3e34109945dfc365b82686c"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "9503b50f8dcc4061958b8ac5d0d5ddf5"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "599646d3eb46420aa9a247281e93d8dc"
+                },
+                "m_SlotId": 1
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "d9a1fe5907164a40af97432a3e6c957c"
+            },
+            {
+                "m_Id": "71e89e1482b5425a99f5e9c3428f99ea"
+            },
+            {
+                "m_Id": "0cf20c690b37412b9ffe64bf2c2241f9"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 200.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "3c923239e3e34109945dfc365b82686c"
+            },
+            {
+                "m_Id": "54b906f5dfb24981b1f22716eaeaf4f4"
+            }
+        ]
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Shader Graphs",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": ""
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": [
+        {
+            "m_Id": "46e90e85969c4afabc6b33999c4a5695"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "030da3741548473fa9e150d5af8dbdf5",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "0cf20c690b37412b9ffe64bf2c2241f9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Tangent",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9ca59f6665fd410a8b6e4358f7828d00"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0d3e5445e17f44b8a36051d7b0759e12",
+    "m_Id": 1,
+    "m_DisplayName": "Saturation",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Saturation",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "19d2d4f1e8db47068cb5e3ba63723c75",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -852.3104858398438,
+            "y": 152.48277282714845,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "7bd84d8534e345f780d11d9992f2fe60"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "717c4bfd2adf4f5dbb84b2d5d712ded2"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1b4c48b74a7342fa8d413677c86b4ece",
+    "m_Id": 7,
+    "m_DisplayName": "A",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "20b90824bd4846ce9cf6ac8bf1782774",
+    "m_Id": 0,
+    "m_DisplayName": "Saturation",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
+    "m_ObjectId": "2b8eb6bcbcd54392a7e6cb3758839e88",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -606.517333984375,
+            "y": 137.68966674804688,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "5be952bc445647b79ff490e718778679"
+        },
+        {
+            "m_Id": "a1bc0453052f4515b5cb293e976a574e"
+        },
+        {
+            "m_Id": "b63cab73877f4727a3772aa9d08d83de"
+        },
+        {
+            "m_Id": "c8335c78228c47eda1c4430043158f95"
+        },
+        {
+            "m_Id": "1b4c48b74a7342fa8d413677c86b4ece"
+        },
+        {
+            "m_Id": "47bea00c95b142429e8cdcae907e5bac"
+        },
+        {
+            "m_Id": "6323a38d96d94769b0f7065537799ed8"
+        },
+        {
+            "m_Id": "3675d7a152944690b984a041ee47e9e3"
+        }
+    ],
+    "synonyms": [
+        "tex2d"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_TextureType": 0,
+    "m_NormalMapSpace": 0,
+    "m_EnableGlobalMipBias": true,
+    "m_MipSamplingMode": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
+    "m_ObjectId": "3675d7a152944690b984a041ee47e9e3",
+    "m_Id": 3,
+    "m_DisplayName": "Sampler",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Sampler",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "3c923239e3e34109945dfc365b82686c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.BaseColor",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "db0ffc587e2b43c49843f46ff88ee9c4"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "46e90e85969c4afabc6b33999c4a5695",
+    "m_Datas": [],
+    "m_ActiveSubTarget": {
+        "m_Id": "fa5aca91ee5443edac682642281bd154"
+    },
+    "m_AllowMaterialOverride": false,
+    "m_SurfaceType": 0,
+    "m_ZTestMode": 4,
+    "m_ZWriteControl": 0,
+    "m_AlphaMode": 0,
+    "m_RenderFace": 2,
+    "m_AlphaClip": false,
+    "m_CastShadows": true,
+    "m_ReceiveShadows": true,
+    "m_DisableTint": false,
+    "m_AdditionalMotionVectorMode": 0,
+    "m_AlembicMotionVectors": false,
+    "m_SupportsLODCrossFade": false,
+    "m_CustomEditorGUI": "",
+    "m_SupportVFX": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+    "m_ObjectId": "47bea00c95b142429e8cdcae907e5bac",
+    "m_Id": 1,
+    "m_DisplayName": "Texture",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Texture",
+    "m_StageCapability": 3,
+    "m_BareResource": false,
+    "m_Texture": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "54b906f5dfb24981b1f22716eaeaf4f4",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Alpha",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "749366c0afac4d7898a504b283c0c086"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Alpha"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SaturationNode",
+    "m_ObjectId": "599646d3eb46420aa9a247281e93d8dc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Saturation",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -257.0,
+            "y": 171.0,
+            "width": 173.99996948242188,
+            "height": 117.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8dd80cdda9fb421585b59b9282dad629"
+        },
+        {
+            "m_Id": "0d3e5445e17f44b8a36051d7b0759e12"
+        },
+        {
+            "m_Id": "030da3741548473fa9e150d5af8dbdf5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "5be952bc445647b79ff490e718778679",
+    "m_Id": 0,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "6323a38d96d94769b0f7065537799ed8",
+    "m_Id": 2,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+    "m_ObjectId": "717c4bfd2adf4f5dbb84b2d5d712ded2",
+    "m_Guid": {
+        "m_GuidSerialized": "ec020eae-8f7c-43a3-ab40-8b828b1e3148"
+    },
+    "m_Name": "MainTex",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "MainTex",
+    "m_DefaultReferenceName": "_MainTex",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Value": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "isMainTexture": false,
+    "useTilingAndOffset": false,
+    "m_Modifiable": true,
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "71e89e1482b5425a99f5e9c3428f99ea",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Normal",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "89b68402558a4dc4bd5f8f4fdb048401"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "749366c0afac4d7898a504b283c0c086",
+    "m_Id": 0,
+    "m_DisplayName": "Alpha",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Alpha",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+    "m_ObjectId": "7bd84d8534e345f780d11d9992f2fe60",
+    "m_Id": 0,
+    "m_DisplayName": "MainTex",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "891621aaec554f0b97981df82914be23",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "717c4bfd2adf4f5dbb84b2d5d712ded2"
+        },
+        {
+            "m_Id": "f83f36a9fa5748158e136fc667b47c71"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "899d02fd88664dca848b4ae9fbdae787",
+    "m_Id": 0,
+    "m_DisplayName": "Position",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Position",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "89b68402558a4dc4bd5f8f4fdb048401",
+    "m_Id": 0,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "8dd80cdda9fb421585b59b9282dad629",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "9503b50f8dcc4061958b8ac5d0d5ddf5",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -396.0,
+            "y": 296.0,
+            "width": 129.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "20b90824bd4846ce9cf6ac8bf1782774"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "f83f36a9fa5748158e136fc667b47c71"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "9ca59f6665fd410a8b6e4358f7828d00",
+    "m_Id": 0,
+    "m_DisplayName": "Tangent",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Tangent",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a1bc0453052f4515b5cb293e976a574e",
+    "m_Id": 4,
+    "m_DisplayName": "R",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b63cab73877f4727a3772aa9d08d83de",
+    "m_Id": 5,
+    "m_DisplayName": "G",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "c8335c78228c47eda1c4430043158f95",
+    "m_Id": 6,
+    "m_DisplayName": "B",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "d9a1fe5907164a40af97432a3e6c957c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "899d02fd88664dca848b4ae9fbdae787"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "db0ffc587e2b43c49843f46ff88ee9c4",
+    "m_Id": 0,
+    "m_DisplayName": "Base Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "BaseColor",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 0.5,
+        "g": 0.5,
+        "b": 0.5,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "f83f36a9fa5748158e136fc667b47c71",
+    "m_Guid": {
+        "m_GuidSerialized": "176f765f-1b1b-4d70-90be-4e64c089d6c6"
+    },
+    "m_Name": "Saturation",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Saturation",
+    "m_DefaultReferenceName": "_Saturation",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Value": 1.0,
+    "m_FloatType": 0,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget",
+    "m_ObjectId": "fa5aca91ee5443edac682642281bd154"
+}
+
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph.meta
new file mode 100644
index 00000000000..506e03daa7a
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/UUM127937SG.shadergraph.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1c620119ff2084043832208bbe47fd6d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png
new file mode 100644
index 00000000000..4c671a71d58
Binary files /dev/null and b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png differ
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png.meta
new file mode 100644
index 00000000000..e7b5dca049d
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/Resources/smallGreenStar.png.meta
@@ -0,0 +1,170 @@
+fileFormatVersion: 2
+guid: 219bc3fdfd18baf4ca58e09a522239b5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 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: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: tvOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline:
+    - - {x: -7, y: 16}
+      - {x: -16, y: 7}
+      - {x: -16, y: -13}
+      - {x: -15, y: -16}
+      - {x: 16, y: -16}
+      - {x: 16, y: 14}
+      - {x: 10, y: 16}
+    physicsShape:
+    - - {x: 2, y: 15}
+      - {x: -1, y: 15}
+      - {x: -4, y: 4}
+      - {x: -14.931009, y: 3.978939}
+      - {x: -15, y: 1}
+      - {x: -7, y: -4}
+      - {x: -7, y: -6}
+      - {x: -10, y: -15}
+      - {x: -7, y: -15}
+      - {x: 1, y: -9}
+      - {x: 7, y: -15}
+      - {x: 11, y: -15}
+      - {x: 8, y: -4}
+      - {x: 16, y: 2}
+      - {x: 16, y: 4}
+      - {x: 5, y: 4}
+    - - {x: -2, y: -4}
+      - {x: -2, y: 1}
+      - {x: 4, y: 1}
+      - {x: 4, y: -4}
+    bones: []
+    spriteID: 2e67f41127f80634b8bbd443a396fec5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs
new file mode 100644
index 00000000000..c7df87bc43f
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs
@@ -0,0 +1,32 @@
+using UnityEngine;
+
+namespace SpriteRendererTests
+{
+    [RequireComponent(typeof(SpriteRenderer))]
+    public class UUM127937: MonoBehaviour
+    {
+        private static readonly int Saturation = Shader.PropertyToID("_Saturation");
+        private static readonly int AnotherProp = Shader.PropertyToID("_AnotherProp");
+
+        public static readonly float sDefault = 0.2f;
+
+        private void Start()
+        {
+            SpriteRenderer ren = this.GetComponent<SpriteRenderer>();
+            MaterialPropertyBlock propertyBlock = new();
+            ren.GetPropertyBlock(propertyBlock);
+            propertyBlock.SetFloat(Saturation, sDefault);
+            propertyBlock.SetFloat(AnotherProp, sDefault);
+            ren.SetPropertyBlock(propertyBlock);
+        }
+
+        public float GetSaturation()
+        {
+            SpriteRenderer ren = this.GetComponent<SpriteRenderer>();
+            MaterialPropertyBlock propertyBlock = new();
+            ren.GetPropertyBlock(propertyBlock);
+            var saturation = propertyBlock.GetFloat(Saturation);
+            return saturation;
+        }
+    }
+}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs.meta
new file mode 100644
index 00000000000..4ec71bb36f5
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 009846b1a4b14bbcac6569bf36b91f7f
+timeCreated: 1764124864
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs
new file mode 100644
index 00000000000..1a488bf8e79
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs
@@ -0,0 +1,145 @@
+using System.Collections;
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.TestTools;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+namespace SpriteRendererTests
+{
+    public class UUM127937Test
+    {
+        GameObject m_TestGo;
+        SpriteRenderer m_SpriteRenderer;
+        UUM127937 m_UUM127937;
+
+        private GameObject m_BaseObj;
+        private Camera m_BaseCamera;
+        private UniversalAdditionalCameraData m_BaseCameraData;
+
+        private bool m_OriginalUseSRPBatching = true;
+
+        [OneTimeSetUp]
+        public void OneTimeSetup()
+        {
+            m_BaseObj = new GameObject();
+            m_BaseObj.transform.position = new Vector3(0.0f, 0.0f, -10.0f);
+            m_BaseObj.transform.forward = Vector3.forward;
+            m_BaseCamera = m_BaseObj.AddComponent<Camera>();
+            m_BaseCameraData = m_BaseObj.AddComponent<UniversalAdditionalCameraData>();
+
+            m_BaseCamera.allowHDR = false;
+            m_BaseCamera.clearFlags = CameraClearFlags.SolidColor;
+            m_BaseCameraData.SetRenderer(2); // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset.
+            m_BaseCameraData.renderType = CameraRenderType.Base;
+            m_BaseCameraData.renderPostProcessing = false;
+            m_BaseCamera.targetTexture = new RenderTexture(m_BaseCamera.pixelWidth, m_BaseCamera.pixelHeight, 24);
+
+#if UNITY_EDITOR
+            EditorApplication.ExecuteMenuItem("Window/General/Game");
+#endif
+        }
+
+        [SetUp]
+        public void Setup()
+        {
+            m_TestGo = new GameObject("TestGo");
+            m_SpriteRenderer = m_TestGo.AddComponent<SpriteRenderer>();
+            var sprite = Resources.Load<Sprite>("smallGreenStar");
+            var material = Resources.Load<Material>("UUM127937SG");
+            Assert.NotNull(sprite);
+            Assert.NotNull(material);
+            m_SpriteRenderer.sprite = sprite;
+            m_SpriteRenderer.material = material;
+            m_UUM127937 = m_TestGo.AddComponent<UUM127937>();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Object.Destroy(m_TestGo);
+        }
+
+        [OneTimeTearDown]
+        public void OneTimeCleanup()
+        {
+            Object.DestroyImmediate(m_BaseObj);
+        }
+
+        [UnityTest]
+        [UnityPlatform(RuntimePlatform.OSXEditor, RuntimePlatform.LinuxEditor, RuntimePlatform.WindowsEditor)]
+        public IEnumerator SpriteRenderer_ChangeSerializedProperty_Color_DoesNotClearMaterialPropertyBlock()
+        {
+            yield return null;
+            yield return null;
+
+            var startSaturation = m_UUM127937.GetSaturation();
+
+            Assert.AreEqual(UUM127937.sDefault, startSaturation);
+
+            yield return null;
+
+#if UNITY_EDITOR
+            SerializedObject so = new SerializedObject(m_SpriteRenderer);
+            SerializedProperty sp = so.FindProperty("m_Color");
+            Assert.NotNull(sp);
+
+            so.Update();
+
+            sp.colorValue = Color.white;
+            sp.colorValue = Color.rebeccaPurple;
+
+            so.ApplyModifiedProperties();
+
+            yield return null;
+
+            Assert.AreEqual(Color.rebeccaPurple, m_SpriteRenderer.color);
+#endif
+
+            yield return null;
+
+            var endSaturation = m_UUM127937.GetSaturation();
+
+            Assert.AreEqual(startSaturation, endSaturation);
+        }
+
+        [UnityTest]
+        [UnityPlatform(RuntimePlatform.OSXEditor, RuntimePlatform.LinuxEditor, RuntimePlatform.WindowsEditor)]
+        public IEnumerator SpriteRenderer_ChangeSerializedProperty_Flip_DoesNotClearMaterialPropertyBlock()
+        {
+            yield return null;
+            yield return null;
+
+            var startSaturation = m_UUM127937.GetSaturation();
+
+            Assert.AreEqual(UUM127937.sDefault, startSaturation);
+
+            yield return null;
+
+#if UNITY_EDITOR
+            SerializedObject so = new SerializedObject(m_SpriteRenderer);
+            SerializedProperty sp = so.FindProperty("m_FlipX");
+            Assert.NotNull(sp);
+
+            so.Update();
+
+            sp.boolValue = !sp.boolValue;
+
+            so.ApplyModifiedProperties();
+
+            yield return null;
+
+            Assert.AreEqual(true, m_SpriteRenderer.flipX);
+#endif
+
+            yield return null;
+
+            var endSaturation = m_UUM127937.GetSaturation();
+
+            Assert.AreEqual(startSaturation, endSaturation);
+        }
+    }
+}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs.meta
new file mode 100644
index 00000000000..a9c406a6069
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Runtime/UUM127937/UUM127937Test.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce52904ff5d44b79ba074c5344e2ec5f
+timeCreated: 1764124779
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
index c907f5dcdbd..3328ce44df0 100644
--- a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
+++ b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
@@ -17,7 +17,7 @@
     "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr",
     "com.unity.timeline": "1.8.8",
     "com.unity.ugui": "2.0.0",
-    "com.unity.ui.test-framework": "file:../../../../../Packages/com.unity.ui.test-framework",
+    "com.unity.ui.test-framework": "6.3.0",
     "com.unity.visualeffectgraph": "file:../../../../../Packages/com.unity.visualeffectgraph",
     "local.gtf.references": "file:../../../Packages/local.gtf.references",
     "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework",