diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs
index 78fe73ff26c..1cef74c3290 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs
@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
                     uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs
index a1a3439789e..7e58424b088 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs
@@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs
index 1f306686115..bc1b14f4ff5 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEditor;
 using UnityEngine.Rendering.UnifiedRayTracing;
 
@@ -149,7 +150,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(renderer.component.GetEntityId()), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
@@ -157,7 +158,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     int layerMask = 1 << terrain.component.gameObject.layer;
                     if ((layerMask & mask) == 0)
                         continue;
-                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(EntityId.ToULong(terrain.component.GetEntityId()), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
@@ -478,8 +479,9 @@ static uint[] GetMaterialIndices(Renderer renderer)
             uint[] matIndices = new uint[submeshCount];
             for (int i = 0; i < matIndices.Length; ++i)
             {
+                Debug.Assert(UnsafeUtility.SizeOf<EntityId>() == sizeof(int), "If this assert is firing, the size of EntityId has changed. This downcase to uint is unsafe.");
                 if (i < renderer.sharedMaterials.Length && renderer.sharedMaterials[i] != null)
-                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetEntityId().GetRawData();
+                    matIndices[i] = (uint)EntityId.ToULong(renderer.sharedMaterials[i].GetEntityId());
                 else
                     matIndices[i] = 0;
             }
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/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs b/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs
index 51aad347df4..415e80f192a 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs
@@ -7,11 +7,13 @@ namespace UnityEditor.Rendering.UnifiedRayTracing
 {
     internal class ShaderTemplates
     {
+        internal static readonly Texture2D shaderIcon = EditorGUIUtility.IconContent("d_TextAsset Icon").image as Texture2D;
+
         [MenuItem("Assets/Create/Shader/Unified Ray Tracing Shader", false, 1)]
         internal static void CreateNewUnifiedRayTracingShader()
         {
             var action = ScriptableObject.CreateInstance<DoCreateUnifiedRayTracingShader>();
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "NewUnifiedRayTracingShader.urtshader", null, null);
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "NewUnifiedRayTracingShader.urtshader", shaderIcon, null);
         }
 
         internal class DoCreateUnifiedRayTracingShader : AssetCreationEndAction
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 726a3c34701..bb29b4cf382 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/Runtime/GPUDriven/InstanceCuller.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs
index b5a27c8446f..1dd70efe6e6 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs
@@ -2027,7 +2027,7 @@ public unsafe JobHandle CreateCullJobTree(
                 {
                     EntityId viewEntityId = cc.viewID.GetEntityId();
                     indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewEntityId);
-                    cullingOutput.customCullingResult[0] = (IntPtr)viewEntityId.GetRawData();
+                    cullingOutput.customCullingResult[0] = (IntPtr)EntityId.ToULong(viewEntityId);
                 }
                 IndirectBufferLimits indirectBufferLimits = m_IndirectStorage.GetLimits(indirectContextIndex);
                 NativeArray<IndirectBufferAllocInfo> indirectBufferAllocInfo = m_IndirectStorage.GetAllocInfoSubArray(indirectContextIndex);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/PatchUtil.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/PatchUtil.hlsl
index 46cc797e118..496b10b9633 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/PatchUtil.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/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.core/Runtime/Lighting/SurfaceCache/VectorLogic.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/VectorLogic.hlsl
index 9c95cd462d3..4186a810511 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/VectorLogic.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/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.core/Runtime/PathTracing/PathTracingUtil.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
index e78a05b9445..183152d2e4b 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
@@ -264,7 +264,7 @@ internal static ulong EntityIDToUlong(EntityId id)
             Debug.Assert(UnsafeUtility.SizeOf<EntityId>() == sizeof(int),
                 "If this assert is firing, the size of EntityId has changed. Remove the intermediate cast to int below, and cast directly to ulong instead.");
 
-            return (ulong)(int)id.GetRawData();
+            return (ulong)(int)EntityId.ToULong(id);
         }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs
index 9da571575fc..e9b27d2f39b 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs
@@ -209,9 +209,9 @@ internal void SetTexture(RenderTargetIdentifier tex)
         public ulong GetUniqueID()
         {
             if (m_RT != null)
-                return m_RT.GetEntityId().GetRawData();
+                return EntityId.ToULong(m_RT.GetEntityId());
             else if (m_ExternalTexture != null)
-                return m_ExternalTexture.GetEntityId().GetRawData();
+                return EntityId.ToULong(m_ExternalTexture.GetEntityId());
             else
                 return (ulong)m_NameID.GetHashCode(); // No instance ID so we return the hash code.
         }
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs
index bc3872d5fc3..6213661179c 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs
@@ -746,7 +746,7 @@ public int GetTextureID(Texture texture)
         /// <returns>The TextureIdentifier, which stores the EntityId of the texture.</returns>
         public TextureIdentifier GetTextureIdentifier(Texture texture)
         {
-            return new TextureIdentifier(texture.GetEntityId().GetRawData());
+            return new TextureIdentifier(EntityId.ToULong(texture.GetEntityId()));
         }
 
 
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~/TableOfContents.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md
index 9a9408a9ba9..977180ddee0 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md
@@ -50,6 +50,7 @@
   * [Convert lighting and shadows](convert-from-built-in-convert-lighting-and-shadows.md)
   * [Convert materials and shaders](convert-from-built-in-convert-materials-and-shaders.md)
   * [Convert project with HDRP wizard](convert-from-built-in-convert-project-with-hdrp-wizard.md)
+  * [Render Pipeline Converter window reference](rp-converter.md)
 * [Lighting](lighting.md)
   * [Understand physical light units](Physical-Light-Units.md)
   * [Light sources](light-sources.md)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-from-built-in-convert-materials-and-shaders.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-from-built-in-convert-materials-and-shaders.md
index 0cfef4978c6..eb7cf0f21e1 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-from-built-in-convert-materials-and-shaders.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-from-built-in-convert-materials-and-shaders.md
@@ -1,39 +1,80 @@
 # Convert materials and shaders
 
-To upgrade the Materials in your Scene to HDRP-compatible Materials:
+After you [set up your project to use HDRP](convert-from-built-in-convert-project-with-hdrp-wizard.md), use the material upgraders or the [Render Pipeline Converter](rp-converter.md) to convert prebuilt material and shaders made for a Built-In Render Pipeline project to be compatible with the High Definition Render Pipeline (HDRP).
+
+Material upgraders and the Render Pipeline Converter don't support converting custom materials or shaders. To convert custom materials and shaders, you must [convert them manually](#ManualConversion).
+
+**Warning**: Using material upgraders or the Render Pipeline Converter overwrites several files in your project folder. These can't be restored after Unity overwrites them. Before you start this task, back up any files you don't want to lose.
+
+## Convert materials and shaders using material upgraders
+
+To upgrade the materials and shaders from the Built-In Render Pipeline to HDRP with material upgraders, do the following:
 
 1. Go to **Edit** > **Rendering** > **Materials**
 2. Choose one of the following options:
 
-    * **Convert All Built-in Materials to HDRP**: Converts every compatible Material in your Project to an HDRP Material.
-    * **Convert Selected Built-in Materials to HDRP**: Converts every compatible Material currently selected in the Project window to an HDRP Material.
-    * **Convert Scene Terrains to HDRP Terrains**: Replaces the built-in default standard terrain Material in every [Terrain](https://docs.unity3d.com/Manual/script-Terrain.html) in the scene with HDRP default Terrain Material.
+    * **Convert All Built-in Materials to HDRP**: Converts every compatible material in your project to an HDRP material.
+    * **Convert Selected Built-in Materials to HDRP**: Converts every compatible material currently selected in the Project window to an HDRP Material.
+    * **Convert Scene Terrains to HDRP Terrains**: Replaces the built-in default standard terrain material in every [Terrain](https://docs.unity3d.com/Manual/script-Terrain.html) in the scene with HDRP default Terrain material.
 
-## Limitations
+### Limitations
 
-The automatic upgrade options described above can't upgrade all Materials to HDRP correctly:
+The automatic upgrade options described can't upgrade all materials to HDRP correctly:
 
-* You can't automatically upgrade custom Materials or Shaders to HDRP. You must [convert custom Materials and Shaders manually](#ManualConversion).
 * HDRP can only convert materials from the **Assets** folder of your project. HDRP uses the [error shader](xref:shader-error) for GameObjects that use the default read-only material from the Built-In Render Pipeline, for example [primitives](xref:um-primitive-objects).  
-* Height mapped Materials might look incorrect. This is because HDRP supports more height map displacement techniques and decompression options than the Built-in Render Pipeline. To upgrade a Material that uses a heightmap, modify the Material's **Amplitude** and **Base** properties until the result more closely matches the Built-in Render Pipeline version.
+* Height mapped materials might look incorrect. This is because HDRP supports more height map displacement techniques and decompression options than the Built-In Render Pipeline. To upgrade a material that uses a heightmap, modify the Material's **Amplitude** and **Base** properties until the result more closely matches the Built-In Render Pipeline version.
 * You can't upgrade particle shaders. HDRP doesn't support particle shaders, but it does provide Shader Graphs that are compatible with the [Built-in Particle System](https://docs.unity3d.com/Manual/Built-inParticleSystem.html). These Shader Graphs work in a similar way to the built-in particle shaders. To use these Shader Graphs, import the **Particle System Shader Samples** sample:
 
     1. Open the Package Manager window (menu: **Window** > **Package Management** > **Package Manager**).
     2. Find and click the **High Definition RP** entry.
     3. In the package information for **High Definition RP**, go to the **Samples** section and click the **Import into Project** button next to **Particle System Shader Samples**.
 
+<a name="render-pipeline-converter"></a>
+
+## Convert shaders using the Render Pipeline Converter
+
+To convert prebuilt shaders from the Built-In Render Pipeline to HDRP with the Render Pipeline Converter, do the following:
+
+1. Go to **Window** > **Rendering** > **Render Pipeline Converter**. 
+
+    Unity opens the [Render Pipeline Converter window](rp-converter.md).  
+2. Set **Source Pipeline** to **Built-in**.  
+3. Set **Target Pipeline** to **High Definition Render Pipeline (HDRP)**.  
+4. Select the checkbox next to **Material Shader Converter**. 
+5. Select **Scan**. 
+
+    Unity processes the assets in your project and displays the list of shaders it can convert under your selected converter.  
+6. Select the checkboxes next to the assets you want to convert.  
+7. Select **Convert Assets**. 
+
+    When Unity finishes the conversion process, the window displays the status of each conversion.
+
+### Shader mapping
+
+The following table shows which HDRP resource path the Built-In Render Pipeline materials map to when you use the Render Pipeline Converter.
+
+| **Built-In Render Pipeline material** | **HDRP resource path**                                                   |
+| ------------------------------------- | ------------------------------------------------------------------------ |
+| `Default-Diffuse`                     | `Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat`         |
+| `Default-Material`	                | `Runtime/RenderPipelineResources/Material/DefaultHDMaterial.mat`         |
+| `Default-ParticleSystem`              | `Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat` |
+| `Default-Particle`	                | `Runtime/RenderPipelineResources/Material/DefaultHDParticleMaterial.mat` |
+| `Default-Terrain-Diffuse`	            | `Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat`  |
+| `Default-Terrain-Specular`	        | `Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat`  |
+| `Default-Terrain-Standard`            | `Runtime/RenderPipelineResources/Material/DefaultHDTerrainMaterial.mat`  |
+
 <a name="ManualConversion"></a>
 
-## Converting Materials manually
+## Convert materials manually
 
-HDRP uses multiple processes to automatically convert Built-in Standard and Unlit Materials to HDRP Lit and Unlit Materials respectively. These processes use an overlay function to blend the color channels together, similar to the process you would use in image editing software like Adobe Photoshop.
+HDRP uses multiple processes to automatically convert Built-in Standard and Unlit Materials to HDRP Lit and Unlit materials respectively. These processes use an overlay function to blend the color channels together, similar to the process you would use in image editing software like Adobe Photoshop.
 
-To help you convert custom Materials manually, this section describes the maps that the converter creates from the Built-in Materials.
+To help you convert custom materials manually, this section describes the maps that the converter creates from the Built-in Materials.
 
 ### Mask maps
 
-The Built-in Shader to HDRP Shader conversion process combines the different Material maps of the Built-in Standard Shader into the separate RGBA channels of the mask map in the HDRP [Lit Material](lit-material.md). For information on which color channel each map goes in, see [mask map](Mask-Map-and-Detail-Map.md#MaskMap).
+The Built-in Shader to HDRP Shader conversion process combines the different material maps of the Built-in Standard Shader into the separate RGBA channels of the mask map in the HDRP [Lit Material](lit-material.md). For information on which color channel each map goes in, refer to [Mask map](Mask-Map-and-Detail-Map.md#MaskMap).
 
 ### Detail maps
 
-The Built-in Shader to HDRP Shader conversion process combines the different detail maps of the Built-in Standard Shader into the separate RGBA channels of the detail map in the HDRP [Lit Material](lit-material.md). It also adds a smoothness detail too. For information on which color channel each map goes in, see [detail map](Mask-Map-and-Detail-Map.md#DetailMap).
+The Built-in Shader to HDRP Shader conversion process combines the different detail maps of the Built-in Standard Shader into the separate RGBA channels of the detail map in the HDRP [Lit Material](lit-material.md). It also adds a smoothness detail too. For information on which color channel each map goes in, refer to [Detail map](Mask-Map-and-Detail-Map.md#DetailMap).
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-project-from-built-in-render-pipeline.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-project-from-built-in-render-pipeline.md
index c1f0bf75e32..7325837701d 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-project-from-built-in-render-pipeline.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/convert-project-from-built-in-render-pipeline.md
@@ -8,3 +8,4 @@ The High Definition Render Pipeline (HDRP) uses a new set of shaders and lightin
 | [Convert lighting and shadows](convert-from-built-in-convert-lighting-and-shadows.md) | Convert a project to physical Light units to control the intensity of Lights, instead of the arbitrary units the Built-in Render Pipeline uses. | 
 | [Convert materials and shaders](convert-from-built-in-convert-materials-and-shaders.md) | Upgrade the materials in your scene to HDRP-compatible materials, either automatically or manually. |
 | [Convert project with HDRP wizard](convert-from-built-in-convert-project-with-hdrp-wizard.md) | Add the HDRP package to a Built-in Render Pipeline project and set up HDRP. |
+| [Render Pipeline Converter window reference](rp-converter.md) | Explore the settings in the Render Pipeline Converter. |
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/rp-converter.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/rp-converter.md
new file mode 100644
index 00000000000..ea85b12728b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/rp-converter.md
@@ -0,0 +1,15 @@
+# Render Pipeline Converter window for HDRP reference
+
+After you [set up your project to use HDRP](convert-from-built-in-convert-project-with-hdrp-wizard.md), you can use the Render Pipeline Converter to convert shaders made for a Built-In Render Pipeline project to assets compatible with the High Definition Render Pipeline (HDRP).
+
+To open the Render Pipeline Converter window, go to **Window** > **Rendering** > **Render Pipeline Converter**. For more information on how to use the Render Pipeline Converter for HDRP, refer to [Convert materials and shaders](convert-from-built-in-convert-materials-and-shaders.md#render-pipeline-converter).
+
+**Warning**: Using the Render Pipeline Converter overwrites several files in your project folder. These can't be restored after Unity overwrites them. Before you start this task, back up any files you don't want to lose.
+
+## Pipeline Converter tab
+
+| **Property** | **Description** |
+|:-------------|:----------------|
+| **Source Pipeline** | Sets the pipeline you want to convert your assets from. |   
+| **Target Pipeline** | Sets the pipeline you want to convert your assets to.   |  
+| **Material Shader Converter** | Converts [prebuilt shaders for the Built-In Render Pipeline](https://docs.unity3d.com/Manual/shader-built-in-birp.html) to [shaders in HDRP](materials-and-surfaces.md). This converter doesn't support custom shaders. For more information on how to convert custom shaders for HDRP, refer to [Convert materials manually](convert-from-built-in-convert-materials-and-shaders.md#ManualConversion).|
\ No newline at end of file
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/Editor/Converter/Converters.cs b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
index 2eba9b457a1..39236182cbf 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
@@ -10,8 +10,7 @@ namespace UnityEditor.Rendering.Universal
     /// <summary>
     /// Filter for the list of converters used in batch mode.
     /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>.)
-    [Obsolete("This enum has been obsoleted, please use the Type of the converter directly. #from(6000.4)")]
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
     public enum ConverterFilter
     {
         /// <summary>
@@ -28,8 +27,7 @@ public enum ConverterFilter
     /// <summary>
     /// The container to run in batch mode.
     /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId)"/>.)
-    [Obsolete("This enum has been obsoleted, please use the Type of the converter directly. #from(6000.4)")]
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId)"/>
     public enum ConverterContainerId
     {
         /// <summary>
@@ -54,7 +52,6 @@ public enum ConverterContainerId
     }
 
     [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    [Obsolete("This attribute has been obsoleted, please use the Type of the converter directly. #from(6000.4)")]
     internal class BatchModeConverterInfo : Attribute
     {
         public Type converterType { get; }
@@ -70,8 +67,7 @@ public BatchModeConverterInfo(ConverterContainerId containerName, Type converter
     /// <summary>
     /// The converter to run in batch mode.
     /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>.)
-    [Obsolete("This enum has been obsoleted, please use the Type of the converter directly. #from(6000.4)")]
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
     public enum ConverterId
     {
         /// <summary>
@@ -148,14 +144,11 @@ private static void DumpAvailableConverters()
         /// Call this method to run all the converters in a specific container in batch mode.
         /// </summary>
         /// <param name="containerName">The name of the container which will be batched. All Converters in this Container will run if prerequisites are met.</param>
-        [Obsolete("RunInBatchMode will be removed. Please open the Unity Editor and perform the conversion from the Converter UI. #from(6000.4)", false)]
         public static void RunInBatchMode(ConverterContainerId containerName)
         {
             RunInBatchMode(containerName, new List<ConverterId>() { }, ConverterFilter.Exclusive);
         }
 
-        [Obsolete("RunInBatchMode will be removed. Please open the Unity Editor and perform the conversion from the Converter UI. #from(6000.4)", false)]
-
         internal static bool TryGetTypeInContainer(ConverterId value, ConverterContainerId containerName, out Type type)
         {
             type = null;
@@ -178,15 +171,12 @@ internal static bool TryGetTypeInContainer(ConverterId value, ConverterContainer
         /// <param name="containerName">The name of the container which will be batched.</param>
         /// <param name="converterList">The list of converters that will be either included or excluded from batching. These converters need to be part of the passed in container for them to run.</param>
         /// <param name="converterFilter">The enum that decide if the list of converters will be included or excluded when batching.</param>
-        [Obsolete("RunInBatchMode will be removed. Please open the Unity Editor and perform the conversion from the Converter UI. #from(6000.4)", false)]
         public static void RunInBatchMode(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
         {
             var types = FilterConverters(containerName, converterList, converterFilter);
             RunInBatchMode(types);
         }
 
-        [Obsolete("RunInBatchMode will be removed. Please open the Unity Editor and perform the conversion from the Converter UI. #from(6000.4)", false)]
-
         internal static List<Type> FilterConverters(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
         {
             Array converters = Enum.GetValues(typeof(ConverterId));
@@ -213,6 +203,8 @@ internal static List<Type> FilterConverters(ConverterContainerId containerName,
         /// <returns>False if there were errors.</returns>
         internal static bool RunInBatchMode(List<Type> converterTypes)
         {
+            Debug.LogWarning("Using this API can lead to incomplete or unpredictable conversion outcomes. For reliable results, please perform the conversion via the dedicated window: Window > Rendering > Render Pipeline Converter.");
+
             List<IRenderPipelineConverter> convertersToExecute = new();
 
             bool errors = false;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs b/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs
index e5c20b91e39..4df25560e0f 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs
@@ -86,8 +86,8 @@ private struct LightCookieMapping
                 if (d == 0)
                 {
                     // Sort by texture ID if "undecided" to batch fetches to the same cookie texture.
-                    var ai = alc.GetEntityId().GetRawData();
-                    var bi = blc.GetEntityId().GetRawData();
+                    var ai = EntityId.ToULong(alc.GetEntityId());
+                    var bi = EntityId.ToULong(blc.GetEntityId());
                     return (int)(ai - bi);
                 }
                 return d;
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 6d4bade9a37..ed72754eae2 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/CopyDepthPass.cs
@@ -220,8 +220,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/Tests/Editor/Tools/Converters/ConvertersTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
index 1c292a1ebaa..75197112041 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using UnityEngine.TestTools;
+using UnityEngine;
 
 namespace UnityEditor.Rendering.Universal.Tools
 {
@@ -49,6 +51,19 @@ public void BatchModeFails()
             Assert.IsFalse(ok);
         }
 
+        [Test]
+        public void RunInBatchMode_LogsUsageWarning()
+        {
+            LogAssert.Expect(
+                LogType.Warning,
+                "Using this API can lead to incomplete or unpredictable conversion outcomes. " +
+                "For reliable results, please perform the conversion via the dedicated window: " +
+                "Window > Rendering > Render Pipeline Converter."
+            );
+
+            bool _ = Converters.RunInBatchMode(new List<Type>() {});
+        }
+
 #pragma warning disable CS0618 // Type or member is obsolete
         public static IEnumerable<TestCaseData> TestCases()
         {
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 2657bbc4439..c95ef75217a 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
@@ -1961,7 +1961,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/Editor/Resources/Styles/HlslFunctionView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss
index 606efd90698..a852005ac61 100644
--- a/Packages/com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss
+++ b/Packages/com.unity.shadergraph/Editor/Resources/Styles/HlslFunctionView.uss
@@ -27,9 +27,13 @@ HlslFunctionView > #Row {
     margin-bottom: 0;
 }
 
+.unity-base-text-field {
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
 .unity-base-text-field__input {
     flex-direction: column;
-    flex-grow: 1;
     -unity-text-align: upper-left;
     overflow: hidden;
 }
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/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXCameraCullingTest.cs b/Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXCameraCullingTest.cs
index c45bbbda908..4f9aa010102 100644
--- a/Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXCameraCullingTest.cs
+++ b/Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXCameraCullingTest.cs
@@ -37,6 +37,7 @@ public void Cleanup()
         }
 
         [UnityTest]
+        [Ignore("Unstable: https://jira.unity3d.com/browse/UUM-119807")]
         public IEnumerator Ensure_Camera_Commands_Are_Culled()
         {
             UnityEngine.SceneManagement.SceneManager.LoadScene(kScenePath);
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.meta
new file mode 100644
index 00000000000..9eafceb57c3
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5f45cb303b059342b6e4a0a63fa399b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity
new file mode 100644
index 00000000000..dc9455b748f
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity
@@ -0,0 +1,569 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &528940401
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 528940403}
+  - component: {fileID: 528940402}
+  m_Layer: 0
+  m_Name: Grid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!156049354 &528940402
+Grid:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 528940401}
+  m_Enabled: 1
+  m_CellSize: {x: 1, y: 1, z: 0}
+  m_CellGap: {x: 0, y: 0, z: 0}
+  m_CellLayout: 0
+  m_CellSwizzle: 0
+--- !u!4 &528940403
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 528940401}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 825349042}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &825349041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 825349042}
+  - component: {fileID: 825349044}
+  - component: {fileID: 825349043}
+  - component: {fileID: 825349045}
+  m_Layer: 0
+  m_Name: Tilemap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &825349042
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 825349041}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 528940403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!483693784 &825349043
+TilemapRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 825349041}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_ChunkSize: {x: 32, y: 32, z: 32}
+  m_ChunkCullingBounds: {x: 0, y: 0.25, z: 0}
+  m_MaxChunkCount: 16
+  m_MaxFrameAge: 16
+  m_SortOrder: 0
+  m_Mode: 0
+  m_DetectChunkCullingBounds: 0
+--- !u!1839735485 &825349044
+Tilemap:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 825349041}
+  m_Enabled: 1
+  m_Tiles: {}
+  m_AnimatedTiles: {}
+  m_TileAssetArray: []
+  m_TileSpriteArray: []
+  m_TileMatrixArray: []
+  m_TileColorArray: []
+  m_TileObjectToInstantiateArray: []
+  m_AnimationFrameRate: 1
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Origin: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0, y: 0, z: 1}
+  m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
+  m_TileOrientation: 0
+  m_TileOrientationMatrix:
+    e00: 1
+    e01: 0
+    e02: 0
+    e03: 0
+    e10: 0
+    e11: 1
+    e12: 0
+    e13: 0
+    e20: 0
+    e21: 0
+    e22: 1
+    e23: 0
+    e30: 0
+    e31: 0
+    e32: 0
+    e33: 1
+--- !u!114 &825349045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 825349041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ba34f9c144701474d874e676cdb77350, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  tile: {fileID: 11400000, guid: 08002d404144b40bf842342dda8fa3e4, type: 2}
+--- !u!1 &1269218297
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1269218299}
+  - component: {fileID: 1269218298}
+  m_Layer: 0
+  m_Name: Light 2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1269218298
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1269218297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ComponentVersion: 2
+  m_LightType: 4
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_LightVolumeIntensity: 1
+  m_LightVolumeEnabled: 0
+  m_ApplyToSortingLayers: eb0feddf00000000e980ef06
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 2
+  m_UseNormalMap: 0
+  m_ShadowsEnabled: 1
+  m_ShadowIntensity: 0.75
+  m_ShadowSoftness: 0.3
+  m_ShadowSoftnessFalloffIntensity: 0.5
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_LocalBounds:
+    m_Center: {x: 0, y: -0.00000011920929, z: 0}
+    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 0
+  m_PointLightOuterRadius: 1
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
+--- !u!4 &1269218299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1269218297}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 15.443904, y: -0.15094891, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2103671723
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2103671727}
+  - component: {fileID: 2103671726}
+  - component: {fileID: 2103671725}
+  - component: {fileID: 2103671724}
+  - component: {fileID: 2103671728}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2103671724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2103671723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
+--- !u!81 &2103671725
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2103671723}
+  m_Enabled: 1
+--- !u!20 &2103671726
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2103671723}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 1}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &2103671727
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2103671723}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2, y: 5, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2103671728
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2103671723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ImageComparisonSettings:
+    TargetWidth: 1280
+    TargetHeight: 720
+    TargetMSAASamples: 1
+    PerPixelCorrectnessThreshold: 0.001
+    PerPixelGammaThreshold: 0.003921569
+    PerPixelAlphaThreshold: 0.003921569
+    RMSEThreshold: 0
+    AverageCorrectnessThreshold: 0.005
+    IncorrectPixelsThreshold: 0.0000038146973
+    UseHDR: 0
+    UseBackBuffer: 0
+    ImageResolution: 2
+    ActiveImageTests: 1
+    ActivePixelTests: -1
+  WaitFrames: 5
+  XRCompatible: 1
+  gpuDrivenCompatible: 1
+  CheckMemoryAllocation: 0
+  renderBackendCompatibility: 2
+  SetBackBufferResolution: 0
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 2103671727}
+  - {fileID: 1269218299}
+  - {fileID: 528940403}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity.meta
new file mode 100644
index 00000000000..3264281aa90
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cabcd6bc6f8277e49bc78d67ee71aae3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts.meta
new file mode 100644
index 00000000000..21acd3fb8fd
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 253a655b31ee54844b26ba6a8670a1fb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs
new file mode 100644
index 00000000000..0432a58a863
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs
@@ -0,0 +1,68 @@
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.Tilemaps;
+
+[RequireComponent(typeof(Tilemap))]
+public class EditorPreview_BoxFill : MonoBehaviour
+{
+    public TileBase tile;
+
+    Tilemap tilemap;
+    bool updated = false;
+
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        tilemap = GetComponent<Tilemap>();
+        updated = false;
+        Assert.NotNull(tile);
+        Assert.NotNull(tilemap);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (updated)
+            return;
+
+        updated = true;
+
+        TileChangeData[] tileChangeDatas = new TileChangeData[5 * 5];
+        for (var y = 0; y < 5; y++)
+        {
+            for (var x = 0; x < 5; x++)
+            {
+                var tileChangeData = new TileChangeData();
+                tileChangeData.position = new Vector3Int(x, y, 0);
+                tileChangeData.tile = tile;
+                tileChangeData.color = Color.white;
+                tileChangeData.transform = Matrix4x4.identity;
+                tileChangeDatas[y * 5 + x] = tileChangeData;
+            }
+        }
+
+#if UNITY_EDITOR
+        for (var y = 0; y < 5; y++)
+        {
+            for (var x = 0; x < 5; x++)
+            {
+                tilemap.SetEditorPreviewTile(new Vector3Int(x, y, 0), tile);
+            }
+        }
+#endif
+
+        tilemap.SetTiles(tileChangeDatas, false);
+
+#if UNITY_EDITOR
+        for (var y = 0; y < 5; y++)
+        {
+            for (var x = 0; x < 5; x++)
+            {
+                tilemap.SetEditorPreviewTile(new Vector3Int(x, y, 0), null);
+                tilemap.SetEditorPreviewColor(new Vector3Int(x, y, 0), Color.white);
+                tilemap.SetEditorPreviewTransformMatrix(new Vector3Int(x, y, 0), Matrix4x4.identity);
+            }
+        }
+#endif
+    }
+}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs.meta
new file mode 100644
index 00000000000..05a88ea1a0b
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Scripts/EditorPreview_BoxFill.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ba34f9c144701474d874e676cdb77350
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites.meta
new file mode 100644
index 00000000000..dfe2952c4ae
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2adfe6f7b5e3f814c97caf9d5594cd2c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png
new file mode 100644
index 00000000000..dc498102953
Binary files /dev/null and b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png differ
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png.meta
new file mode 100644
index 00000000000..1143045654d
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Sprites/Dungeon.png.meta
@@ -0,0 +1,637 @@
+fileFormatVersion: 2
+guid: 4e794009527fa49a7a0e11880aaa3a50
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 8074338581418846440
+    second: Dungeon_00
+  - first:
+      213: 4519664136019108208
+    second: Dungeon_01
+  - first:
+      213: -6337999885091750218
+    second: Dungeon_02
+  - first:
+      213: -5779282676337348671
+    second: Dungeon_03
+  - first:
+      213: -1238933728272178944
+    second: Dungeon_04
+  - first:
+      213: -4637172546458061636
+    second: Dungeon_05
+  - first:
+      213: 1404196382344981941
+    second: Dungeon_06
+  - first:
+      213: -6537453368205885854
+    second: Dungeon_07
+  - first:
+      213: -3932762474534642510
+    second: Dungeon_08
+  - first:
+      213: -38647862416911262
+    second: Dungeon_09
+  - first:
+      213: 9158922217335370285
+    second: Dungeon_10
+  - first:
+      213: -2913927307954446974
+    second: Dungeon_11
+  - first:
+      213: -8314697479797604436
+    second: Dungeon_12
+  - first:
+      213: -8560909203809222747
+    second: Dungeon_13
+  - first:
+      213: -2860982009417361707
+    second: Dungeon_14
+  - first:
+      213: 833101472512629755
+    second: Dungeon_15
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 128
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: CloudRendering
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Switch
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: GameCoreXboxOne
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: GameCoreScarlett
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Dungeon_00
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 440
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8e8a3bdf820dd0070800000000000000
+      internalID: 8074338581418846440
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_01
+      rect:
+        serializedVersion: 2
+        x: 152
+        y: 440
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 071ed73e59219be30800000000000000
+      internalID: 4519664136019108208
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_02
+      rect:
+        serializedVersion: 2
+        x: 296
+        y: 440
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6beb3a64fa6ea08a0800000000000000
+      internalID: -6337999885091750218
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_03
+      rect:
+        serializedVersion: 2
+        x: 440
+        y: 440
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 1cfe75c960ddbcfa0800000000000000
+      internalID: -5779282676337348671
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_04
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 296
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 001261a965c6ecee0800000000000000
+      internalID: -1238933728272178944
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_05
+      rect:
+        serializedVersion: 2
+        x: 152
+        y: 296
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: cb47c26432475afb0800000000000000
+      internalID: -4637172546458061636
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_06
+      rect:
+        serializedVersion: 2
+        x: 296
+        y: 296
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5bdaf848b25bc7310800000000000000
+      internalID: 1404196382344981941
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_07
+      rect:
+        serializedVersion: 2
+        x: 440
+        y: 296
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 26e386c6ccc4645a0800000000000000
+      internalID: -6537453368205885854
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_08
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 152
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2bc5067bd550c69c0800000000000000
+      internalID: -3932762474534642510
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_09
+      rect:
+        serializedVersion: 2
+        x: 152
+        y: 152
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 264df4159f1b67ff0800000000000000
+      internalID: -38647862416911262
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_10
+      rect:
+        serializedVersion: 2
+        x: 296
+        y: 152
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: d2235b90b370b1f70800000000000000
+      internalID: 9158922217335370285
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_11
+      rect:
+        serializedVersion: 2
+        x: 440
+        y: 152
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 28d90145d86af87d0800000000000000
+      internalID: -2913927307954446974
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_12
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 8
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: caff3ddf1b24c9c80800000000000000
+      internalID: -8314697479797604436
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_13
+      rect:
+        serializedVersion: 2
+        x: 152
+        y: 8
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5af3490df6a813980800000000000000
+      internalID: -8560909203809222747
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_14
+      rect:
+        serializedVersion: 2
+        x: 296
+        y: 8
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5d615e34500cb48d0800000000000000
+      internalID: -2860982009417361707
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Dungeon_15
+      rect:
+        serializedVersion: 2
+        x: 440
+        y: 8
+        width: 128
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: bfb58f21065cf8b00800000000000000
+      internalID: 833101472512629755
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Dungeon_00: 8074338581418846440
+      Dungeon_01: 4519664136019108208
+      Dungeon_02: -6337999885091750218
+      Dungeon_03: -5779282676337348671
+      Dungeon_04: -1238933728272178944
+      Dungeon_05: -4637172546458061636
+      Dungeon_06: 1404196382344981941
+      Dungeon_07: -6537453368205885854
+      Dungeon_08: -3932762474534642510
+      Dungeon_09: -38647862416911262
+      Dungeon_10: 9158922217335370285
+      Dungeon_11: -2913927307954446974
+      Dungeon_12: -8314697479797604436
+      Dungeon_13: -8560909203809222747
+      Dungeon_14: -2860982009417361707
+      Dungeon_15: 833101472512629755
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles.meta
new file mode 100644
index 00000000000..69f2ca32454
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a83b151354ffe7f48a72daed07133b22
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset
new file mode 100644
index 00000000000..d74d729994d
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset
@@ -0,0 +1,246 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: 9d1514134bc4fbd41bb739b1b9a49231, type: 3}
+  m_Name: Dungeon
+  m_EditorClassIdentifier: 
+  m_DefaultSprite: {fileID: -2860982009417361707, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+  m_DefaultGameObject: {fileID: 0}
+  m_DefaultColliderType: 1
+  m_TilingRules:
+  - m_Id: 0
+    m_Sprites:
+    - {fileID: 8074338581418846440, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.915
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 0100000001000000010000000100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: -1, y: 1, z: 0}
+    - {x: 0, y: 1, z: 0}
+    - {x: 1, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: -1, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: 1, y: -1, z: 0}
+    m_RuleTransform: 0
+  - m_Id: 13
+    m_Sprites:
+    - {fileID: 4519664136019108208, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 01000000010000000100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 0, y: 1, z: 0}
+    - {x: 1, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: -1, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: 1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 11
+    m_Sprites:
+    - {fileID: -6337999885091750218, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 010000000100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 0, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: -1, y: -1, z: 0}
+    - {x: 1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 12
+    m_Sprites:
+    - {fileID: -5779282676337348671, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 010000000100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 0, y: 1, z: 0}
+    - {x: 1, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: -1, z: 0}
+    - {x: 0, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 10
+    m_Sprites:
+    - {fileID: -1238933728272178944, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 0100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 0, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: -1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 9
+    m_Sprites:
+    - {fileID: -4637172546458061636, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 01000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 0, y: 1, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    m_RuleTransform: 0
+  - m_Id: 8
+    m_Sprites:
+    - {fileID: 1404196382344981941, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 0100000001000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: -1, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: -1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 7
+    m_Sprites:
+    - {fileID: -6537453368205885854, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 01000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: -1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 6
+    m_Sprites:
+    - {fileID: -3932762474534642510, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 01000000010000000100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: -1, z: 0}
+    - {x: 0, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 3
+    m_Sprites:
+    - {fileID: -38647862416911262, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 010000000100000001000000
+    m_NeighborPositions:
+    - {x: -1, y: 0, z: 0}
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 5
+    m_Sprites:
+    - {fileID: 9158922217335370285, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 0100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: -1, y: 0, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 4
+    m_Sprites:
+    - {fileID: -2913927307954446974, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 010000000100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    - {x: 1, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 2
+    m_Sprites:
+    - {fileID: -8314697479797604436, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 0100000001000000
+    m_NeighborPositions:
+    - {x: 1, y: 0, z: 0}
+    - {x: 0, y: -1, z: 0}
+    m_RuleTransform: 1
+  - m_Id: 1
+    m_Sprites:
+    - {fileID: -8560909203809222747, guid: 4e794009527fa49a7a0e11880aaa3a50, type: 3}
+    m_GameObject: {fileID: 0}
+    m_AnimationSpeed: 1
+    m_PerlinScale: 0.5
+    m_Output: 0
+    m_ColliderType: 1
+    m_RandomTransform: 0
+    m_Neighbors: 01000000
+    m_NeighborPositions:
+    - {x: -1, y: 0, z: 0}
+    m_RuleTransform: 1
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset.meta
new file mode 100644
index 00000000000..978ed8f25b7
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill/Tiles/Dungeon.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08002d404144b40bf842342dda8fa3e4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset
index de633357cf9..ab19283c229 100644
--- a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset
@@ -284,6 +284,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/091_SpriteMask_SupportedRenderers.unity
     guid: b3db030be38d9441eba28d8038467ba7
+  - enabled: 1
+    path: Assets/Scenes/092_TilemapRenderer_EditorPreview_BoxFill.unity
+    guid: cabcd6bc6f8277e49bc78d67ee71aae3
   m_configObjects:
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 20e925b8abdd424429b17f709e9d00f8,
       type: 2}
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
index fbc6d9ada57..77f44acf4c2 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.4.0",
     "com.unity.visualeffectgraph": "file:../../../../../Packages/com.unity.visualeffectgraph",
     "com.unity.testframework.graphics": "file:../../../Packages/com.unity.test-framework.graphics",
     "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework",