diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSurfaceOptionPropertyBlock.cs
index e317f10df6e..81133c2e116 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSurfaceOptionPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSurfaceOptionPropertyBlock.cs
@@ -18,7 +18,7 @@ class EyeSurfaceOptionPropertyBlock : SurfaceOptionPropertyBlock
     {
         class Styles
         {
-            public static GUIContent materialType = new GUIContent("Material Type", "TODO");
+            public static GUIContent materialType = new GUIContent("Material Type", "Allow to select the type of lighting model used with this Eye Material.");
             public static GUIContent irisNormalType = new GUIContent("Iris Normal", "Override the iris normal");
         }
 
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSurfaceOptionPropertyBlock.cs
index 706ab693062..f87a00d9e50 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSurfaceOptionPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSurfaceOptionPropertyBlock.cs
@@ -18,7 +18,7 @@ class FabricSurfaceOptionPropertyBlock : SurfaceOptionPropertyBlock
     {
         class Styles
         {
-            public static GUIContent materialType = new GUIContent("Material Type", "TODO");
+            public static GUIContent materialType = new GUIContent("Material Type", "Allow to select the type of lighting model used with this Fabric Material. Either for cooton wood or for Silk.");
         }
 
         FabricData fabricData;
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/AdvancedOptionsPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/AdvancedOptionsPropertyBlock.cs
index 154cf4248eb..64fac6c2368 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/AdvancedOptionsPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/AdvancedOptionsPropertyBlock.cs
@@ -17,8 +17,8 @@ class AdvancedOptionsPropertyBlock : SubTargetPropertyBlock
     {
         class Styles
         {
-            public static GUIContent overrideBakedGI = new GUIContent("Override Baked GI", "TODO");
-            public static GUIContent supportLodCrossFade = new GUIContent("Support LOD CrossFade", "TODO");
+            public static GUIContent overrideBakedGI = new GUIContent("Override Baked GI", "When enabled, inputs to override the current GI are exposed on the master node.");
+            public static GUIContent supportLodCrossFade = new GUIContent("Support LOD CrossFade", "When enabled, allow to use the animated transition for LOD feature on this material.");
         }
 
         protected override string title => "Advanced Options";
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs
index 08a8167d89c..36d031ee8f8 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs
@@ -27,8 +27,8 @@ public enum Features
 
         class Styles
         {
-            public static GUIContent fragmentNormalSpace = new GUIContent("Fragment Normal Space", "TODO");
-            public static GUIContent doubleSidedModeText = new GUIContent("Double Sided Mode", "TODO");
+            public static GUIContent fragmentNormalSpace = new GUIContent("Fragment Normal Space", "Select the space use for normal map in Fragment shader in this shader graph.");
+            public static GUIContent doubleSidedModeText = new GUIContent("Double Sided Mode", "Select the double sided mode to use with this Material.");
         }
 
         Features enabledFeatures;
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs
index d0ca6631734..35bfe88b371 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSurfaceOptionPropertyBlock.cs
@@ -18,7 +18,7 @@ class StackLitSurfaceOptionPropertyBlock : SurfaceOptionPropertyBlock
     {
         class Styles
         {
-            public static GUIContent materialType = new GUIContent("Material Type", "TODO");
+            public static GUIContent materialType = new GUIContent("Material Type", "Allow to select the lighting model to used with this Material.");
         }
 
         StackLitData stackLitData;
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSurfaceOptionPropertyBlock.cs
index 7b1a9b1f558..8b6a13af74f 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSurfaceOptionPropertyBlock.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSurfaceOptionPropertyBlock.cs
@@ -18,7 +18,7 @@ class HDUnlitSurfaceOptionPropertyBlock : SurfaceOptionPropertyBlock
     {
         class Styles
         {
-            public static GUIContent shadowMatte = new GUIContent("Shadow Matte", "TODO");
+            public static GUIContent shadowMatte = new GUIContent("Shadow Matte", "When enabled, shadow matte inputs are exposed on the master node.");
         }
 
         HDUnlitData unlitData;
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 b2193797804..c15f087eae6 100644
--- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs
@@ -107,14 +107,18 @@ internal static void UpgradeDefaultRenderingLayerMask()
 
             foreach (var mesh in meshRenderers)
             {
+                Undo.RecordObject(mesh, "MeshRenderer Layer Mask update");
                 mesh.renderingLayerMask |= (ShaderVariablesGlobal.DefaultRenderingLayerMask & ShaderVariablesGlobal.RenderingDecalLayersMask);
+                EditorUtility.SetDirty(mesh);
             }
 
             var terrains = Resources.FindObjectsOfTypeAll<Terrain>();
 
             foreach (var terrain in terrains)
             {
+                Undo.RecordObject(terrain, "Terrain Layer Mask update");
                 terrain.renderingLayerMask |= (ShaderVariablesGlobal.DefaultRenderingLayerMask & ShaderVariablesGlobal.RenderingDecalLayersMask);
+                EditorUtility.SetDirty(terrain);
             }
         }
 
@@ -131,13 +135,17 @@ internal static void UpgradeDefaultRenderingLayerMaskForSelection()
                     MeshRenderer mesh;
                     if (gameObj.TryGetComponent<MeshRenderer>(out mesh))
                     {
+                        Undo.RecordObject(mesh, "MeshRenderer Layer Mask update");
                         mesh.renderingLayerMask |= (ShaderVariablesGlobal.DefaultRenderingLayerMask & ShaderVariablesGlobal.RenderingDecalLayersMask);
+                        EditorUtility.SetDirty(mesh);
                     }
 
                     Terrain terrain;
                     if (gameObj.TryGetComponent<Terrain>(out terrain))
                     {
+                        Undo.RecordObject(terrain, "Terrain Layer Mask update");
                         terrain.renderingLayerMask |= (ShaderVariablesGlobal.DefaultRenderingLayerMask & ShaderVariablesGlobal.RenderingDecalLayersMask);
+                        EditorUtility.SetDirty(terrain);
                     }
                 }
             }