diff --git a/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl b/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl
index 457a252cda8..ce84819da66 100644
--- a/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERCONFIG_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index bb2059fee2f..09ddd4013b8 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -16,11 +16,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Removed the material pass probe volumes evaluation mode.
 - Volume parameter of type Cubemap can now accept Cubemap render textures and custom render textures.
+- Replaced last package version checker in Wizard to a link on Package Manager
 
 ## [10.3.0] - 2020-12-01
 
-Version Updated
-The version number for this package has increased due to a version update of a related graphics package.
+### Changed
+- Rename HDRP sub menu in Assets/Create/Shader to HD Render Pipeline for consistency.
 
 ## [10.2.1] - 2020-11-30
 
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Images/RenderPipelineWizard1.png b/com.unity.render-pipelines.high-definition/Documentation~/Images/RenderPipelineWizard1.png
index cb7fdcd7e3f..7dad354f201 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Images/RenderPipelineWizard1.png
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Images/RenderPipelineWizard1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59190dc7205bc230452ac7d763c1270c8eb7da0c7e958e74171b7f56058c5deb
-size 35091
+oid sha256:7a142757d345a02828a09fd3f00ca19bc9391b4903e14398e024f1333a29ede6
+size 41765
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Wizard.md b/com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Wizard.md
index bc71b16c853..566d7c0dc7c 100644
--- a/com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Wizard.md
+++ b/com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Wizard.md
@@ -8,16 +8,15 @@ To open the **Render Pipeline Wizard**, go to **Window > Render Pipeline** and s
 
 ## Packages
 
-At the top of the window, there is an information box that shows you the currently installed version of HDRP, as well as the latest version of HDRP that is compatible with your current Unity version.
+At the top of the window, there is an information text that shows you the currently installed version of HDRP. The **Check Update** button provides a shortcut to the HDRP package in the Package Manager window.
 
 You also have a button allow you to creates a local instance of the [High Definition Render Pipeline Config package](HDRP-Config-Package.md) in the **LocalPackage** folder of your HDRP Project. If already installed, some information about its location are displayed below.
 
 ## Default Path Settings
 
-| **Property**                               | **Description**                                              |
-| ------------------------------------------ | ------------------------------------------------------------ |
-| **Default Resources Folder**               | Set the folder name that the Render Pipeline Wizard uses when it loads or creates resources. Click the **Populate / Reset** button to populate the **Default Resources Folder** with the resources that HDRP needs to render a Scene (for details, see [Populating the default resources folder](#populating-the-default-resources-folder)). If a default Asset already exists in the folder then clicking the Populate/Reset button resets the existing Asset. |
-| **Install Configuration Editable Package** | Creates a local instance of the [High Definition Render Pipeline Config package](HDRP-Config-Package.md) in the **LocalPackage** folder of your HDRP Project. |
+| **Property**                 | **Description**                                              |
+| ---------------------------- | ------------------------------------------------------------ |
+| **Default Resources Folder** | Set the folder name that the Render Pipeline Wizard uses when it loads or creates resources. Click the **Populate / Reset** button to populate the **Default Resources Folder** with the resources that HDRP needs to render a Scene (for details, see [Populating the default resources folder](#populating-the-default-resources-folder)). If a default Asset already exists in the folder then clicking the Populate/Reset button resets the existing Asset. |
 
 ### Populating the default resources folder
 
@@ -54,6 +53,7 @@ This tab provides you with configuration options to help you make your Unity Pro
 | **- Assigned**                   | Checks to make sure you have assigned an [HDRP Asset](HDRP-Asset.md) to the **Scriptable Render Pipeline Settings** field (menu: **Edit** > **Project Settings** > **Graphics**).<br />Press the **Fix** button to open a pop-up that allows you to either assign an HDRP Asset or create and assign a new one. |
 | **- Runtime Resources**          | Checks to make sure that your HDRP Asset references a [**Render Pipeline Resources**](HDRP-Asset.md) Asset.<br />Press the **Fix** button to reload the runtime resources for the HDRP Asset. |
 | **- Editor Resources**           | Checks to make sure that your HDRP Asset references a [**Render Pipeline Editor Resources**](HDRP-Asset.md)  Asset.<br />Press the **Fix** button to reload the runtime resources for the HDRP Asset. |
+| **- SRP Batcher** | Checks to make sure that SRP Batcher is enabled.<br />Press the **Fix** button to enable it in the used HDRP Asset. |
 | **- Diffusion Profile**          | Checks to make sure that your HDRP Asset references a [**Diffusion Profile**](Diffusion-Profile.md) Asset.<br />Press the **Fix** button to reload the runtime resources for the HDRP Asset. |
 | **Default Volume Profile** | Checks to make sure you have assigned a **Default Volume Profile Asset** in **Edit** > **Project Settings** > **HDRP Default Settings** .<br />Press the **Fix** button to open a pop-up that allows you to either assign a Profile or create and assign a new one. |
 
@@ -97,5 +97,6 @@ When upgrading a project from the built-in render pipeline to HDRP, you need to
 
 - **Upgrade Project Materials to High Definition Materials**: Upgrades every Material in your Unity Project to HDRP Materials.
 - **Upgrade Selected Materials to High Definition Materials**: Upgrades every Material currently selected to HDRP Materials.
+- **Upgrade HDRP Materials to Latest Version:** Upgrades every Material in your Unity Project to the latest version.
 
 The lighting will not match as HDRP use a different attenuation function than built-in and use correct math to handle lighting model. There is no function that can convert the look. Thus the lighting will require to be redone.
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Decal/ShaderGraph/CreateDecalShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Decal/ShaderGraph/CreateDecalShaderGraph.cs
index 0bbf6e52dd1..32d2a92c6aa 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Decal/ShaderGraph/CreateDecalShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Decal/ShaderGraph/CreateDecalShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateDecalShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Decal Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Decal Shader Graph", false, 208)]
         public static void CreateDecalGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/CreateEyeShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/CreateEyeShaderGraph.cs
index 016a645f085..e59924e67c7 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/CreateEyeShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/CreateEyeShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateEyeShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Eye Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Eye Shader Graph", false, 208)]
         public static void CreateEyeGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/CreateFabricShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/CreateFabricShaderGraph.cs
index f5fc8f5ae5a..028c2ce8250 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/CreateFabricShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/CreateFabricShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateFabricShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Fabric Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Fabric Shader Graph", false, 208)]
         public static void CreateFabricGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/CreateHairShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/CreateHairShaderGraph.cs
index 9f69c4b34d2..2a5d87b27a3 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/CreateHairShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/CreateHairShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateHairShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Hair Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Hair Shader Graph", false, 208)]
         public static void CreateHairGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/CreateHDLitShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/CreateHDLitShaderGraph.cs
index e5cd237edb8..4e9adbaaa55 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/CreateHDLitShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/CreateHDLitShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateLitShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Lit Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Lit Shader Graph", false, 208)]
         public static void CreateHDLitGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/CreateStackLitShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/CreateStackLitShaderGraph.cs
index 451be645b34..93c2d0263ad 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/CreateStackLitShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/CreateStackLitShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateStackLitShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/StackLit Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/StackLit Shader Graph", false, 208)]
         public static void CreateStackLitGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/CreateHDUnlitShaderGraph.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/CreateHDUnlitShaderGraph.cs
index 6cc9fafd70d..6de5dafdc3a 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/CreateHDUnlitShaderGraph.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/CreateHDUnlitShaderGraph.cs
@@ -5,7 +5,7 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateUnlitShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Unlit Shader Graph", false, 208)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Unlit Shader Graph", false, 208)]
         public static void CreateHDUnlitGraph()
         {
             var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
index bd80788caf6..24765594387 100644
--- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
@@ -181,14 +181,14 @@ static void MenuCreateDiffusionProfile()
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreateNewAssetDiffusionProfileSettings>(), "New Diffusion Profile.asset", icon, null);
         }
 
-        [MenuItem("Assets/Create/Shader/HDRP/Custom FullScreen Pass")]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Custom FullScreen Pass")]
         static void MenuCreateCustomFullScreenPassShader()
         {
             string templatePath = $"{HDUtils.GetHDRenderPipelinePath()}/Editor/RenderPipeline/CustomPass/CustomPassFullScreenShader.template";
             ProjectWindowUtil.CreateScriptAssetFromTemplateFile(templatePath, "New FullScreen CustomPass.shader");
         }
 
-        [MenuItem("Assets/Create/Shader/HDRP/Custom Renderers Pass")]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Custom Renderers Pass")]
         static void MenuCreateCustomRenderersPassShader()
         {
             string templatePath = $"{HDUtils.GetHDRenderPipelinePath()}/Editor/RenderPipeline/CustomPass/CustomPassRenderersShader.template";
@@ -209,7 +209,7 @@ static void MenuCreateCSharpPostProcessVolume()
             ProjectWindowUtil.CreateScriptAssetFromTemplateFile(templatePath, "New Post Process Volume.cs");
         }
 
-        [MenuItem("Assets/Create/Shader/HDRP/Post Process", priority = CoreUtils.assetCreateMenuPriority3)]
+        [MenuItem("Assets/Create/Shader/HD Render Pipeline/Post Process", priority = CoreUtils.assetCreateMenuPriority3)]
         static void MenuCreatePostProcessShader()
         {
             string templatePath = $"{HDUtils.GetHDRenderPipelinePath()}/Editor/PostProcessing/Templates/CustomPostProcessingShader.template";
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunrisSunset@2x.png b/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunriseSunset@2x.png
similarity index 100%
rename from com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunrisSunset@2x.png
rename to com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunriseSunset@2x.png
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunrisSunset@2x.png.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunriseSunset@2x.png.meta
similarity index 100%
rename from com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunrisSunset@2x.png.meta
rename to com.unity.render-pipelines.high-definition/Editor/RenderPipelineResources/Texture/LightUnitIcons/d_SunriseSunset@2x.png.meta
diff --git a/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss b/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss
index c163322b19f..fba71409dae 100644
--- a/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss
+++ b/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss
@@ -135,19 +135,30 @@ ToolbarRadio
     margin-right: 130px;
 }
 
-#Repopulate
+.RightAnchoredButton
 {
     position: absolute;
     right: 0px;
-    width: 120px;
+    width: 114px;
+    margin-top: 0px;
+    margin-right: 10px;
 }
 
-#LargeButton
+.LargeButton
 {
     margin-left: 20px;
     margin-right: 20px;
 }
 
+#HDRPVersionContainer
+{
+    flex-direction: row;
+    margin-top: 10px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    padding-left: 3px;
+}
+
 
 /* spacing between categories */
 
diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
index 0f033d17e1a..06295143d3c 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
@@ -752,7 +752,7 @@ void FixDXRActivation(bool fromAsyncUnused)
 
         #endregion
 
-        #region Packman
+        #region Package Manager
 
         const string k_HdrpPackageName = "com.unity.render-pipelines.high-definition";
         const string k_HdrpConfigPackageName = "com.unity.render-pipelines.high-definition-config";
@@ -821,8 +821,7 @@ void InstallLocalConfigurationPackage(Action onCompletion)
 
         void RefreshDisplayOfConfigPackageArea()
         {
-            if (!m_UsedPackageRetriever.isRunning)
-                IsLocalConfigurationPackageInstalledAsync(present => UpdateDisplayOfConfigPackageArea(present ? ConfigPackageState.Present : ConfigPackageState.Missing));
+            IsLocalConfigurationPackageInstalledAsync(present => UpdateDisplayOfConfigPackageArea(present ? ConfigPackageState.Present : ConfigPackageState.Missing));
         }
 
         static void CopyFolder(string sourceFolder, string destFolder)
@@ -915,72 +914,7 @@ void Finished()
             }
         }
         UsedPackageRetriever m_UsedPackageRetriever = new UsedPackageRetriever();
-
-        class LastAvailablePackageVersionRetriever
-        {
-            PackageManager.Requests.SearchRequest m_CurrentRequest;
-            Action<string> m_CurrentAction;
-            string m_CurrentPackageName;
-
-            Queue<(string packageName, Action<string> action)> m_Queue = new Queue<(string packageName, Action<string> action)>();
-
-            bool isCurrentInProgress => m_CurrentRequest != null && !m_CurrentRequest.Equals(null) && !m_CurrentRequest.IsCompleted;
-
-            public bool isRunning => isCurrentInProgress || m_Queue.Count() > 0;
-
-            public void ProcessAsync(string packageName, Action<string> action)
-            {
-                if (isCurrentInProgress)
-                    m_Queue.Enqueue((packageName, action));
-                else
-                    Start(packageName, action);
-            }
-
-            void Start(string packageName, Action<string> action)
-            {
-                m_CurrentAction = action;
-                m_CurrentPackageName = packageName;
-                m_CurrentRequest = PackageManager.Client.Search(packageName, offlineMode: false);
-                EditorApplication.update += Progress;
-            }
-
-            void Progress()
-            {
-                //Can occures on Wizard close or if scripts reloads
-                if (m_CurrentRequest == null || m_CurrentRequest.Equals(null))
-                {
-                    EditorApplication.update -= Progress;
-                    return;
-                }
-
-                if (m_CurrentRequest.IsCompleted)
-                    Finished();
-            }
-
-            void Finished()
-            {
-                EditorApplication.update -= Progress;
-                if (m_CurrentRequest.Status == PackageManager.StatusCode.Success)
-                {
-                    string lastVersion = m_CurrentRequest.Result[0].versions.latestCompatible;
-                    m_CurrentAction?.Invoke(lastVersion);
-                }
-                else if (m_CurrentRequest.Status >= PackageManager.StatusCode.Failure)
-                    Debug.LogError($"Failed to find package {m_CurrentPackageName}. Reason: {m_CurrentRequest.Error.message}");
-                else
-                    Debug.LogError("Unsupported progress state " + m_CurrentRequest.Status);
-
-                m_CurrentRequest = null;
-
-                if (m_Queue.Count > 0)
-                {
-                    (string packageIdOrName, Action<string> action) = m_Queue.Dequeue();
-                    EditorApplication.delayCall += () => Start(packageIdOrName, action);
-                }
-            }
-        }
-        LastAvailablePackageVersionRetriever m_LastAvailablePackageRetriever = new LastAvailablePackageVersionRetriever();
-
+        
         class PackageInstaller
         {
             PackageManager.Requests.AddRequest m_CurrentRequest;
diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs
index d96770d48c1..16557706417 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs
@@ -44,10 +44,9 @@ static class Style
             public const string migrateSelectedButton = "Upgrade Selected Materials to High Definition Materials";
             public const string migrateMaterials = "Upgrade HDRP Materials to Latest Version";
 
-            public const string hdrpVersionLast = "You are using High-Definition Render Pipeline lastest {0} version."; //{0} will be replaced when displayed by the version number.
-            public const string hdrpVersionNotLast = "You are using High-Definition Render Pipeline {0} version. A new {1} version is available."; //{0} and {1} will be replaced when displayed by the version number.
-            public const string hdrpVersionWithLocalPackage = "You are using High-Definition Render Pipeline local {0} version. Last packaged version available is {1}."; //{0} and {1} will be replaced when displayed by the version number.
-            public const string hdrpVersionChecking = "Checking last version available for High-Definition Render Pipeline.";
+            public const string HDRPVersion = "Current HDRP version: ";
+            public const string HDRPVersionUpdateButton = "Check update";
+
 
             //configuration debugger
             public const string resolve = "Fix";
@@ -383,9 +382,9 @@ VisualElement CreateFolderData()
             var repopulate = new Button(Repopulate)
             {
                 text = Style.firstTimeInitLabel,
-                tooltip = Style.firstTimeInitTooltip,
-                name = "Repopulate"
+                tooltip = Style.firstTimeInitTooltip
             };
+            repopulate.AddToClassList("RightAnchoredButton");
 
             var row = new VisualElement() { name = "ResourceRow" };
             row.Add(defaultResourceFolder);
@@ -431,11 +430,11 @@ VisualElement CreateWizardBehaviour()
         }
 
         VisualElement CreateLargeButton(string title, Action action)
-            => new Button(action)
         {
-            text = title,
-            name = "LargeButton"
-        };
+            Button button = new Button(action) { text = title };
+            button.AddToClassList("LargeButton");
+            return button;
+        }
 
         VisualElement CreateInstallConfigPackageArea()
         {
@@ -533,38 +532,24 @@ Label CreateTitle(string title)
             return label;
         }
 
-        HelpBox CreateHdrpVersionChecker()
+        VisualElement CreateHdrpVersionChecker()
         {
-            var helpBox = new HelpBox(HelpBox.Kind.Info, Style.hdrpVersionChecking);
+            VisualElement container = new VisualElement() { name = "HDRPVersionContainer" };
 
-            m_LastAvailablePackageRetriever.ProcessAsync(k_HdrpPackageName, version =>
-            {
-                m_UsedPackageRetriever.ProcessAsync(k_HdrpPackageName, (installed, packageInfo) =>
-                {
-                    // With recent introduction of preview srp version, our HDRP wizard don't work with Version() call
-                    // patch it for now until this is solve.
-                    bool compatibleWithVersionCall = version.ToString().Contains("preview") ? false : true;
+            TextElement label = new TextElement() { text = Style.HDRPVersion + "checking..." };
+            label.AddToClassList("normal");
+            container.Add(label);
 
-                    // installed is not used because this one will be always installed
-                    if (packageInfo.source == PackageManager.PackageSource.Local)
-                    {
-                        helpBox.kind = HelpBox.Kind.Info;
-                        helpBox.text = String.Format(Style.hdrpVersionWithLocalPackage, packageInfo.version, version);
-                    }
-                    else if (compatibleWithVersionCall && (new Version(packageInfo.version) < new Version(version)))
-                    {
-                        helpBox.kind = HelpBox.Kind.Warning;
-                        helpBox.text = String.Format(Style.hdrpVersionNotLast, packageInfo.version, version);
-                    }
-                    else if (compatibleWithVersionCall && (new Version(packageInfo.version) == new Version(version)))
-                    {
-                        helpBox.kind = HelpBox.Kind.Info;
-                        helpBox.text = String.Format(Style.hdrpVersionLast, version);
-                    }
-                });
-            });
+            Button button = new Button(() =>
+                UnityEditor.PackageManager.UI.Window.Open("com.unity.render-pipelines.high-definition"))
+            { text = Style.HDRPVersionUpdateButton };
+            button.AddToClassList("RightAnchoredButton");
+            container.Add(button);
+
+            m_UsedPackageRetriever.ProcessAsync(k_HdrpPackageName, (installed, packageInfo)
+                => label.text = Style.HDRPVersion + packageInfo.version + (packageInfo.source == PackageManager.PackageSource.Local ? " (local)" : ""));
 
-            return helpBox;
+            return container;
         }
 
         #endregion
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Core/Utilities/GeometryUtils.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Core/Utilities/GeometryUtils.cs.hlsl
index cc6e48102ef..fc30fe4dfd0 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Core/Utilities/GeometryUtils.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Core/Utilities/GeometryUtils.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef GEOMETRYUTILS_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl
index 8092779ee14..009d812d2fa 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef COLORPICKERDEBUG_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl
index 8e3563cf69e..f23e6568552 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef DEBUGDISPLAY_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl
index dad80848b91..17b02b66a32 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef LIGHTINGDEBUG_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialDebug.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialDebug.cs.hlsl
index 7d1d5b74c28..e18347409dc 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialDebug.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialDebug.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef MATERIALDEBUG_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl
index bb572c8e565..3a1c3cda480 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef MIPMAPDEBUG_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/RayCountManager.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Debug/RayCountManager.cs.hlsl
index 4dc1b09ef80..51c47c0ad89 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/RayCountManager.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/RayCountManager.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef RAYCOUNTMANAGER_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightDefinition.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightDefinition.cs.hlsl
index a70b0c64199..1bba5923ff4 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightDefinition.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightDefinition.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef LIGHTDEFINITION_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl
index 4c4eeacfcfc..fe2574d4ce6 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef LIGHTLOOP_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolume.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolume.cs.hlsl
index fcb2a0f2f0f..8bd09b826fd 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolume.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolume.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef PROBEVOLUME_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs.hlsl
index 3abb9fa64c1..2e27848cf6a 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeLighting.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef PROBEVOLUMELIGHTING_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs.hlsl
index f592dfe6892..8b4bb38f172 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ScreenSpaceGlobalIllumination.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SCREENSPACEGLOBALILLUMINATION_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesAmbientOcclusion.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesAmbientOcclusion.cs.hlsl
index 4b26b4190a1..c64f8da6530 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesAmbientOcclusion.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesAmbientOcclusion.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESAMBIENTOCCLUSION_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceReflection.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceReflection.cs.hlsl
index 770a0ab1865..62c9d38715f 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceReflection.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/ShaderVariablesScreenSpaceReflection.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESSCREENSPACEREFLECTION_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs.hlsl
index c66758380ec..9d751d6c7c5 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef HDSHADOWMANAGER_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.cs.hlsl
index 82ab856b1de..06f40f7f870 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef VOLUMETRICLIGHTING_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.cs.hlsl
index 181714a685d..dbab64fb5ee 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef AXF_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Builtin/BuiltinData.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Builtin/BuiltinData.cs.hlsl
index e87a10187bf..108595d8bd4 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Builtin/BuiltinData.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Builtin/BuiltinData.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef BUILTINDATA_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
index 060bce6c8fe..1b1371a8e68 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef DECAL_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.cs.hlsl
index fddf55f7a99..5bc266c43ee 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef DIFFUSIONPROFILESETTINGS_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.cs.hlsl
index e759e34f0b9..8fa8c7b450c 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef EYE_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.cs.hlsl
index 59468eae559..762b9537558 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef FABRIC_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/GGXConvolution/GGXConvolution.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/GGXConvolution/GGXConvolution.cs.hlsl
index 87c80b5ba9d..c69c3e6f68a 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/GGXConvolution/GGXConvolution.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/GGXConvolution/GGXConvolution.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef GGXCONVOLUTION_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/Hair.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/Hair.cs.hlsl
index e56958a5766..341a8a5072a 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/Hair.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/Hair.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef HAIR_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.cs.hlsl
index 32a33741d13..15ee53db835 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef LIT_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/MaterialBlendModeEnum.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/MaterialBlendModeEnum.cs.hlsl
index 1651cc12044..2a8de565246 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/MaterialBlendModeEnum.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/MaterialBlendModeEnum.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef MATERIALBLENDMODEENUM_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/PreIntegratedFGD/PreIntegratedFGD.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/PreIntegratedFGD/PreIntegratedFGD.cs.hlsl
index 50e0f374fbe..15b175202b6 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/PreIntegratedFGD/PreIntegratedFGD.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/PreIntegratedFGD/PreIntegratedFGD.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef PREINTEGRATEDFGD_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/StackLit/StackLit.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/StackLit/StackLit.cs.hlsl
index 49c203cb301..d19d1dfe043 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/StackLit/StackLit.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/StackLit/StackLit.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef STACKLIT_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.cs.hlsl
index 2b893dd65e1..7608c48b311 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef UNLIT_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Tonemapping.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Tonemapping.cs.hlsl
index 01a14dbe92d..5df93e791c0 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Tonemapping.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Tonemapping.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef TONEMAPPING_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStencilUsage.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStencilUsage.cs.hlsl
index 945e20b699f..5a7e5cfc720 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStencilUsage.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStencilUsage.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef HDSTENCILUSAGE_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs.hlsl
index 3be48d0bde0..ff3a69fcb88 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingLightCluster.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef HDRAYTRACINGLIGHTCLUSTER_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs.hlsl
index e2a9d0a0865..99ed20ad3e0 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef HDRAYTRACINGMANAGER_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.cs.hlsl
index d29c436d4b6..c6bddcd7a3e 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESRAYTRACING_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.cs.hlsl
index fb1a76af2f1..8609046a469 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESRAYTRACINGLIGHTLOOP_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassInjectionPoint.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassInjectionPoint.cs.hlsl
index 95ac0aa7abd..3b723a099e1 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassInjectionPoint.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassInjectionPoint.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef CUSTOMPASSINJECTIONPOINT_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl
index c54ab9d5838..b8a233455ee 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPass.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERPASS_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl
index bb8a65871fc..9387f8c43c6 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESGLOBAL_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesXR.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesXR.cs.hlsl
index 18eedf51a4c..b1af5b419fe 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesXR.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesXR.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESXR_CS_HLSL
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl
index b7df04f15ca..55faf02f803 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl
+++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/ShaderVariablesPhysicallyBasedSky.cs.hlsl
@@ -1,5 +1,5 @@
 //
-// This file was automatically generated. Please don't edit by hand.
+// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead
 //
 
 #ifndef SHADERVARIABLESPHYSICALLYBASEDSKY_CS_HLSL