diff --git a/common.DotSettings b/common.DotSettings
index 0eb4875d49..6f40d029a7 100644
--- a/common.DotSettings
+++ b/common.DotSettings
@@ -20,5 +20,11 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Async/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Mutable/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/HideTypeNameHintsWhenTypeNameIsEvidentFromVariableName/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowMethodReturnTypeNameHints/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForImplicitlyTypedVariables/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForLambdaExpressionParameters/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForLinqQueryRangeVariables/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/TypeNameHintsOptions/ShowTypeNameHintsForPatternMatchingExpressions/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Volo/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateDefinitionManager.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateDefinitionManager.cs
index feadd3442f..cbd2d15463 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateDefinitionManager.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateDefinitionManager.cs
@@ -8,8 +8,10 @@ namespace Volo.Abp.TextTemplating
         [NotNull]
         TemplateDefinition Get([NotNull] string name);
 
+        [NotNull]
         IReadOnlyList<TemplateDefinition> GetAll();
 
+        [CanBeNull]
         TemplateDefinition GetOrNull(string name);
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TemplateDefinitionTests.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TemplateDefinitionTests.cs
index 2202c098b1..bc0e8b94c4 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TemplateDefinitionTests.cs
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TemplateDefinitionTests.cs
@@ -13,10 +13,24 @@ namespace Volo.Abp.TextTemplating
         }
 
         [Fact]
-        public void Should_Retrieve_Template_Definition()
+        public void Should_Retrieve_Template_Definition_By_Name()
         {
             var definition = _templateDefinitionManager.Get(TestTemplates.TestTemplate1);
             definition.Name.ShouldBe(TestTemplates.TestTemplate1);
         }
+
+        [Fact]
+        public void Should_Get_Null_If_Template_Not_Found()
+        {
+            var definition = _templateDefinitionManager.GetOrNull("undefined-template");
+            definition.ShouldBeNull();
+        }
+
+        [Fact]
+        public void Should_Retrieve_All_Template_Definitions()
+        {
+            var definitions = _templateDefinitionManager.GetAll();
+            definitions.Count.ShouldBeGreaterThan(1);
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
index 1ff8be9bab..134ebdc74a 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
@@ -5,8 +5,11 @@
         public override void Define(ITemplateDefinitionContext context)
         {
             context
-                .Add(new TemplateDefinition(
+                .Add(
+                    new TemplateDefinition(
                         TestTemplates.TestTemplate1
+                    ), new TemplateDefinition(
+                        TestTemplates.TestTemplateLayout1
                     )
                 );
         }
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplates.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplates.cs
index 8e6e21ea85..e5b7bcc9ae 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplates.cs
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplates.cs
@@ -3,5 +3,6 @@
     public static class TestTemplates
     {
         public const string TestTemplate1 = "TestTemplate1";
+        public const string TestTemplateLayout1 = "TestTemplateLayout1";
     }
 }
\ No newline at end of file