diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
index 07aa50adf2..d0d829bbf3 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
@@ -13,8 +13,9 @@
     "Permission:Edit": "Edit",
     "Permission:Delete": "Delete",
     "Permission:Create": "Create",
-	"Permission:Accounting": "Accounting",
-	"Permission:Accounting:Quotation": "Quotation",
+    "Permission:Accounting": "Accounting",
+    "Permission:Accounting:Quotation": "Quotation",
+    "Permission:Accounting:Invoice": "Invoice",
     "Menu:Organizations": "Organizations",
     "Menu:Accounting": "Accounting",
     "Menu:Packages": "Packages",
@@ -101,13 +102,10 @@
     "CompanyName": "Company name",
     "CompanyAddress": "Company address",
     "Price": "Price",
-<<<<<<< Updated upstream
     "DiscountText": "Discount text",
     "DiscountQuantity": "Discount quantity",
-	"DiscountPrice": "Discount price",
+    "DiscountPrice": "Discount price",
     "Quotation": "Quotation",
-	"Generate": "Generate"
-=======
     "ExtraText": "Extra Text",
     "ExtraAmount": "Extra Amount",
     "DownloadQuotation": "Download Quotation",
@@ -117,9 +115,10 @@
     "InvoiceDate": "Invoice Date",
     "Quantity": "Quantity",
     "AddProduct": "Add Product",
-    "NeedToAddProduct": "Need to add product to generate invoice !",
+    "AddProductWarning": "You need to add product!",
     "TotalPrice": "Total Price",
-    "Generate": "Generate" 
->>>>>>> Stashed changes
+    "Generate": "Generate",
+    "MissingQuantityField": "The quantity field is required!",
+    "MissingPriceField": "The Price field is required!"
   }
 }
\ No newline at end of file
diff --git a/docs/en/Localization.md b/docs/en/Localization.md
index 11b838cf7f..954fe8620f 100644
--- a/docs/en/Localization.md
+++ b/docs/en/Localization.md
@@ -87,6 +87,21 @@ A JSON localization file content is shown below:
 * Every localization file should define the `culture` code for the file (like "en" or "en-US").
 * `texts` section just contains key-value collection of the localization strings (keys may have spaces too).
 
+### Default Resource
+
+`AbpLocalizationOptions.DefaultResourceType` can be set to a resource type, so it is used when the localization resource was not specified:
+
+````csharp
+Configure<AbpLocalizationOptions>(options =>
+{
+    options.DefaultResourceType = typeof(TestResource);
+});
+````
+
+> The [application startup template](Startup-Templates/Application.md) sets `DefaultResourceType` to the localization resource of the application.
+
+See the *Client Side* section below for a use case.
+
 ### Short Localization Resource Name
 
 Localization resources are also available in the client (JavaScript) side. So, setting a short name for the localization resource makes it easy to use localization texts. Example:
@@ -166,6 +181,10 @@ public class MyService
 }
 ````
 
+##### Format Arguments
+
+Format arguments can be passed after the localization key. If your message is `Hello {0}, welcome!`, then you can pass the `{0}` argument to the localizer like `_localizer["HelloMessage", "John"]`
+
 #### Simplest Usage In A Razor View/Page
 
 ````c#
@@ -180,18 +199,47 @@ Refer to the [Microsoft's localization documentation](https://docs.microsoft.com
 
 ABP provides JavaScript services to use the same localized texts in the client side.
 
-Get a localization resource:
+#### getResource
+
+`abp.localization.getResource` function is used to get a localization resource:
 
 ````js
 var testResource = abp.localization.getResource('Test');
 ````
 
-Localize a string:
+Then you can localize a string based on this resource:
 
 ````js
 var str = testResource('HelloWorld');
 ````
 
+#### localize
+
+`abp.localization.localize` function is a shortcut where you can both specify the text name and the resource name:
+
+````js
+var str = abp.localization.localize('HelloWorld', 'Test');
+````
+
+`HelloWorld` is the text to localize, where `Test` is the localization resource name here.
+
+If you don't specify the localization resource name, it uses the default localization resource defined on the `AbpLocalizationOptions` (see the *Default Resource* section above). Example:
+
+````js
+var str = abp.localization.localize('HelloWorld'); //uses the default resource
+````
+
+##### Format Arguments
+
+If your localized string contains arguments, like `Hello {0}, welcome!`, you can pass arguments to the localization methods. Examples:
+
+````js
+var str1 = abp.localization.getResource('Test')('HelloWelcomeMessage', 'John');
+var str2 = abp.localization.localize('HelloWorld', 'Test', 'John');
+````
+
+Both of the samples above produce the output `Hello John, welcome!`.
+
 ## See Also
 
 * [Localization in Angular UI](UI/Angular/Localization.md)
\ No newline at end of file
diff --git a/docs/en/Object-Extensions.md b/docs/en/Object-Extensions.md
index 6eff328c85..bee229dc27 100644
--- a/docs/en/Object-Extensions.md
+++ b/docs/en/Object-Extensions.md
@@ -197,8 +197,8 @@ ObjectExtensionManager.Instance
         "SocialSecurityNumber",
         options =>
         {
-            options.ValidationAttributes.Add(new RequiredAttribute());
-            options.ValidationAttributes.Add(
+            options.Attributes.Add(new RequiredAttribute());
+            options.Attributes.Add(
                 new StringLengthAttribute(32) {
                     MinimumLength = 6 
                 }
@@ -248,12 +248,12 @@ ObjectExtensionManager.Instance
     
     objConfig.AddOrUpdateProperty<string>("Password", propertyConfig =>
     {
-        propertyConfig.ValidationAttributes.Add(new RequiredAttribute());
+        propertyConfig.Attributes.Add(new RequiredAttribute());
     });
 
     objConfig.AddOrUpdateProperty<string>("PasswordRepeat", propertyConfig =>
     {
-        propertyConfig.ValidationAttributes.Add(new RequiredAttribute());
+        propertyConfig.Attributes.Add(new RequiredAttribute());
     });
 
     //Write a common validation logic works on multiple properties
diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index 5159f0a86e..5d6f3e99a2 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -279,9 +279,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectExtending",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectExtending.Tests", "test\Volo.Abp.ObjectExtending.Tests\Volo.Abp.ObjectExtending.Tests.csproj", "{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TextTemplating", "src\Volo.Abp.TextTemplating\Volo.Abp.TextTemplating.csproj", "{9E53F91F-EACD-4191-A487-E727741F1311}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TextTemplating", "src\Volo.Abp.TextTemplating\Volo.Abp.TextTemplating.csproj", "{9E53F91F-EACD-4191-A487-E727741F1311}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TextTemplating.Tests", "test\Volo.Abp.TextTemplating.Tests\Volo.Abp.TextTemplating.Tests.csproj", "{251C7FD3-D313-4BCE-8068-352EC7EEA275}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TextTemplating.Tests", "test\Volo.Abp.TextTemplating.Tests\Volo.Abp.TextTemplating.Tests.csproj", "{251C7FD3-D313-4BCE-8068-352EC7EEA275}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Validation.Abstractions", "src\Volo.Abp.Validation.Abstractions\Volo.Abp.Validation.Abstractions.csproj", "{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -841,6 +843,10 @@ Global
 		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -984,6 +990,7 @@ Global
 		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{9E53F91F-EACD-4191-A487-E727741F1311} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{251C7FD3-D313-4BCE-8068-352EC7EEA275} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{FA5D1D6A-2A05-4A3D-99C1-2B6C1D1F99A3} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs
index cc62a1e1b9..da99a3e948 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs
@@ -1,4 +1,5 @@
 using System;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending;
 using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
@@ -19,5 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         public MultiTenancyInfoDto MultiTenancy { get; set; }
 
         public CurrentTenantDto CurrentTenant { get; set; }
+
+        public ObjectExtensionsDto ObjectExtensions { get; set; }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs
index a5e6574e93..8064ff99d2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs
@@ -14,6 +14,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 
         public CurrentCultureDto CurrentCulture { get; set; }
 
+        public string DefaultResourceName { get; set; }
+
         public ApplicationLocalizationConfigurationDto()
         {
             Values = new Dictionary<string, Dictionary<string, string>>();
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
new file mode 100644
index 0000000000..f87fef31aa
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs
@@ -0,0 +1,178 @@
+using System.Collections.Generic;
+using System.Linq;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectExtending.Modularity;
+using Volo.Abp.Reflection;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    public class CachedObjectExtensionsDtoService : ICachedObjectExtensionsDtoService, ISingletonDependency
+    {
+        private volatile ObjectExtensionsDto _cachedValue;
+        private readonly object _syncLock = new object();
+
+        public virtual ObjectExtensionsDto Get()
+        {
+            if (_cachedValue == null)
+            {
+                lock (_syncLock)
+                {
+                    if (_cachedValue == null)
+                    {
+                        _cachedValue = GenerateCacheValue();
+                    }
+                }
+            }
+
+            return _cachedValue;
+        }
+
+        protected virtual ObjectExtensionsDto GenerateCacheValue()
+        {
+            var objectExtensionsDto = new ObjectExtensionsDto
+            {
+                Modules = new Dictionary<string, ModuleExtensionDto>()
+            };
+
+            foreach (var moduleConfig in ObjectExtensionManager.Instance.Modules())
+            {
+                objectExtensionsDto.Modules[moduleConfig.Key] = CreateModuleExtensionDto(moduleConfig.Value);
+            }
+
+            return objectExtensionsDto;
+        }
+
+        protected virtual ModuleExtensionDto CreateModuleExtensionDto(
+            ModuleExtensionConfiguration moduleConfig)
+        {
+            var moduleExtensionDto = new ModuleExtensionDto
+            {
+                Entities = new Dictionary<string, EntityExtensionDto>()
+            };
+
+            foreach (var objectConfig in moduleConfig.Entities)
+            {
+                moduleExtensionDto.Entities[objectConfig.Key] = GetEntityExtensionDto(objectConfig.Value);
+            }
+
+            foreach (var customConfig in moduleConfig.Configuration.Where(c => !c.Key.StartsWith("_")))
+            {
+                moduleExtensionDto.Configuration[customConfig.Key] = customConfig.Value;
+            }
+
+            return moduleExtensionDto;
+        }
+
+        protected virtual EntityExtensionDto GetEntityExtensionDto(
+            EntityExtensionConfiguration entityConfig)
+        {
+            var entityExtensionDto = new EntityExtensionDto
+            {
+                Properties = new Dictionary<string, ExtensionPropertyDto>(),
+                Configuration = new Dictionary<string, object>()
+            };
+
+            foreach (var propertyConfig in entityConfig.GetProperties())
+            {
+                if (!propertyConfig.IsAvailableToClients)
+                {
+                    continue;
+                }
+
+                entityExtensionDto.Properties[propertyConfig.Name] = CreateExtensionPropertyDto(propertyConfig);
+            }
+
+            foreach (var customConfig in entityConfig.Configuration.Where(c => !c.Key.StartsWith("_")))
+            {
+                entityExtensionDto.Configuration[customConfig.Key] = customConfig.Value;
+            }
+
+            return entityExtensionDto;
+        }
+
+        protected virtual ExtensionPropertyDto CreateExtensionPropertyDto(
+            ExtensionPropertyConfiguration propertyConfig)
+        {
+            var extensionPropertyDto = new ExtensionPropertyDto
+            {
+                Type = TypeHelper.GetFullNameHandlingNullableAndGenerics(propertyConfig.Type),
+                TypeSimple = TypeHelper.GetSimplifiedName(propertyConfig.Type),
+                Attributes = new List<ExtensionPropertyAttributeDto>(),
+                DisplayName = CreateDisplayNameDto(propertyConfig),
+                Configuration = new Dictionary<string, object>(),
+                Api = new ExtensionPropertyApiDto
+                {
+                    OnGet = new ExtensionPropertyApiGetDto
+                    {
+                        IsAvailable = propertyConfig.Api.OnGet.IsAvailable
+                    },
+                    OnCreate = new ExtensionPropertyApiCreateDto
+                    {
+                        IsAvailable = propertyConfig.Api.OnCreate.IsAvailable
+                    },
+                    OnUpdate = new ExtensionPropertyApiUpdateDto
+                    {
+                        IsAvailable = propertyConfig.Api.OnUpdate.IsAvailable
+                    }
+                },
+                Ui = new ExtensionPropertyUiDto
+                {
+                    OnCreateForm = new ExtensionPropertyUiFormDto
+                    {
+                        IsVisible = propertyConfig.UI.OnCreateForm.IsVisible
+                    },
+                    OnEditForm = new ExtensionPropertyUiFormDto
+                    {
+                        IsVisible = propertyConfig.UI.OnEditForm.IsVisible
+                    },
+                    OnTable = new ExtensionPropertyUiTableDto
+                    {
+                        IsVisible = propertyConfig.UI.OnTable.IsVisible
+                    }
+                }
+            };
+
+            foreach (var attribute in propertyConfig.Attributes)
+            {
+                extensionPropertyDto.Attributes.Add(
+                    ExtensionPropertyAttributeDto.Create(attribute)
+                );
+            }
+
+            foreach (var customConfig in propertyConfig.Configuration.Where(c => !c.Key.StartsWith("_")))
+            {
+                extensionPropertyDto.Configuration[customConfig.Key] = customConfig.Value;
+            }
+
+            return extensionPropertyDto;
+        }
+
+        protected virtual LocalizableStringDto CreateDisplayNameDto(ExtensionPropertyConfiguration propertyConfig)
+        {
+            if (propertyConfig.DisplayName == null)
+            {
+                return null;
+            }
+
+            if (propertyConfig.DisplayName is LocalizableString localizableStringInstance)
+            {
+                return new LocalizableStringDto(
+                    localizableStringInstance.Name,
+                    localizableStringInstance.ResourceType != null
+                        ? LocalizationResourceNameAttribute.GetName(localizableStringInstance.ResourceType)
+                        : null
+                );
+            }
+
+            if (propertyConfig.DisplayName is FixedLocalizableString fixedLocalizableString)
+            {
+                // "_" means don't use the default resource, but directly use the name.
+                return new LocalizableStringDto(fixedLocalizableString.Value, "_");
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs
new file mode 100644
index 0000000000..83093e0370
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class EntityExtensionDto
+    {
+        public Dictionary<string, ExtensionPropertyDto> Properties { get; set; }
+
+        public Dictionary<string, object> Configuration { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiCreateDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiCreateDto.cs
new file mode 100644
index 0000000000..a2a588a358
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiCreateDto.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyApiCreateDto
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiDto.cs
new file mode 100644
index 0000000000..a9b4ec5b24
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiDto.cs
@@ -0,0 +1,23 @@
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    public class ExtensionPropertyApiDto
+    {
+        [NotNull]
+        public ExtensionPropertyApiGetDto OnGet { get; set; }
+
+        [NotNull]
+        public ExtensionPropertyApiCreateDto OnCreate { get; set; }
+
+        [NotNull]
+        public ExtensionPropertyApiUpdateDto OnUpdate { get; set; }
+
+        public ExtensionPropertyApiDto()
+        {
+            OnGet = new ExtensionPropertyApiGetDto();
+            OnCreate = new ExtensionPropertyApiCreateDto();
+            OnUpdate = new ExtensionPropertyApiUpdateDto();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiGetDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiGetDto.cs
new file mode 100644
index 0000000000..e50a45d15a
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiGetDto.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyApiGetDto
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiUpdateDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiUpdateDto.cs
new file mode 100644
index 0000000000..a517b258da
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyApiUpdateDto.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyApiUpdateDto
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs
new file mode 100644
index 0000000000..c1c19350c2
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Reflection;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyAttributeDto
+    {
+        public string Type { get; set; }
+        public string TypeSimple { get; set; }
+        public Dictionary<string, object> Configuration { get; set; }
+
+        public static ExtensionPropertyAttributeDto Create(Attribute attribute)
+        {
+            var attributeType = attribute.GetType();
+            var dto = new ExtensionPropertyAttributeDto
+            {
+                Type = TypeHelper.GetFullNameHandlingNullableAndGenerics(attributeType),
+                TypeSimple = TypeHelper.GetSimplifiedName(attributeType),
+                Configuration = new Dictionary<string, object>()
+            };
+
+            if (attribute is StringLengthAttribute stringLengthAttribute)
+            {
+                dto.Configuration["MaximumLength"] = stringLengthAttribute.MaximumLength;
+                dto.Configuration["MinimumLength"] = stringLengthAttribute.MinimumLength;
+            }
+
+            //TODO: Others!
+
+            return dto;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs
new file mode 100644
index 0000000000..74214914b9
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyDto
+    {
+        public string Type { get; set; }
+
+        public string TypeSimple { get; set; }
+
+        [CanBeNull]
+        public LocalizableStringDto DisplayName { get; set; }
+
+        public ExtensionPropertyApiDto Api { get; set; }
+     
+        public ExtensionPropertyUiDto Ui { get; set; }
+
+        public List<ExtensionPropertyAttributeDto> Attributes { get; set; }
+
+        public Dictionary<string, object> Configuration { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs
new file mode 100644
index 0000000000..2fb841ec5a
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyUiDto
+    {
+        public ExtensionPropertyUiTableDto OnTable { get; set; }
+        public ExtensionPropertyUiFormDto OnCreateForm { get; set; }
+        public ExtensionPropertyUiFormDto OnEditForm { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiFormDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiFormDto.cs
new file mode 100644
index 0000000000..c4f6f5211c
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiFormDto.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyUiFormDto
+    {
+        public bool IsVisible { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiTableDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiTableDto.cs
new file mode 100644
index 0000000000..4c9e4a7ce0
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiTableDto.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ExtensionPropertyUiTableDto
+    {
+        public bool IsVisible { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ICachedObjectExtensionsDtoService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ICachedObjectExtensionsDtoService.cs
new file mode 100644
index 0000000000..f0163c8b55
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ICachedObjectExtensionsDtoService.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    public interface ICachedObjectExtensionsDtoService
+    {
+        ObjectExtensionsDto Get();
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs
new file mode 100644
index 0000000000..b80352d791
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs
@@ -0,0 +1,21 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class LocalizableStringDto
+    {
+        [NotNull]
+        public string Name { get; private set; }
+
+        [CanBeNull]
+        public string Resource { get; set; }
+
+        public LocalizableStringDto([NotNull] string name, string resource = null)
+        {
+            Name = Check.NotNullOrEmpty(name, nameof(name));
+            Resource = resource;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionConfigurationDto.cs
new file mode 100644
index 0000000000..e077596f59
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionConfigurationDto.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ModuleExtensionDto
+    {
+        public Dictionary<string, EntityExtensionDto> Entities { get; set; }
+
+        public Dictionary<string, object> Configuration { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs
new file mode 100644
index 0000000000..fd9665eab1
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
+{
+    [Serializable]
+    public class ObjectExtensionsDto
+    {
+        public Dictionary<string, ModuleExtensionDto> Modules { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
index a1601378d9..4504906566 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
@@ -144,8 +144,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 }
             }
         }
-
-
+        
         protected virtual void RemoveFormGroupItemsNotInModel(TagHelperContext context, TagHelperOutput output, List<FormGroupItem> items)
         {
             var models = GetModels(context, output);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
index 10ce263032..f264d21cd5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
@@ -21,6 +21,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         public bool AutoFocus { get; set; }
 
+        [HtmlAttributeName("type")]
+        public string InputTypeName { get; set; }
+
         public AbpFormControlSize Size { get; set; } = AbpFormControlSize.Default;
 
         [HtmlAttributeName("required-symbol")]
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
index 470b60004e..a2bb92a14d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -117,6 +117,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             return new InputTagHelper(_generator)
             {
                 For = TagHelper.AspFor,
+                InputTypeName = TagHelper.InputTypeName,
                 ViewContext = TagHelper.ViewContext
             };
         }
@@ -331,6 +332,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             var groupPrefix = "group-";
 
             var tagHelperAttributes = output.Attributes.Where(a => !a.Name.StartsWith(groupPrefix)).ToList();
+            
             var attrList = new TagHelperAttributeList();
 
             foreach (var tagHelperAttribute in tagHelperAttributes)
@@ -338,6 +340,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 attrList.Add(tagHelperAttribute);
             }
 
+            if (!TagHelper.InputTypeName.IsNullOrEmpty() && !attrList.ContainsName("type"))
+            {
+                attrList.Add("type", TagHelper.InputTypeName);
+            }
+
             return attrList;
         }
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs
index 0f4cc752c9..892f0d497a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs
@@ -36,6 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
         {
             context.Files.AddRange(new[]
             {
+                "/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js",
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/AbpPageToolbarOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/AbpPageToolbarOptions.cs
new file mode 100644
index 0000000000..f033fbaeab
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/AbpPageToolbarOptions.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class AbpPageToolbarOptions
+    {
+        public PageToolbarDictionary Toolbars { get; }
+
+        public AbpPageToolbarOptions()
+        {
+            Toolbars = new PageToolbarDictionary();
+        }
+
+        public void Configure<TPage>([NotNull] Action<PageToolbar> configureAction)
+        {
+            // ReSharper disable once AssignNullToNotNullAttribute
+            Configure(typeof(TPage).FullName, configureAction);
+        }
+
+        public void Configure([NotNull]string pageName, [NotNull]Action<PageToolbar> configureAction)
+        {
+            Check.NotNullOrWhiteSpace(pageName, nameof(pageName));
+            Check.NotNull(configureAction, nameof(configureAction));
+
+            var toolbar = Toolbars.GetOrAdd(pageName, () => new PageToolbar(pageName));
+            configureAction(toolbar);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarContributor.cs
new file mode 100644
index 0000000000..1b373025b6
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarContributor.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public interface IPageToolbarContributor
+    {
+        Task ContributeAsync(PageToolbarContributionContext context);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarManager.cs
new file mode 100644
index 0000000000..1a638e8901
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/IPageToolbarManager.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public interface IPageToolbarManager
+    {
+        Task<PageToolbarItem[]> GetItemsAsync(string pageName);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbar.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbar.cs
new file mode 100644
index 0000000000..7362e54074
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbar.cs
@@ -0,0 +1,17 @@
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbar
+    {
+        public string PageName { get; }
+
+        public PageToolbarContributorList Contributors { get; set; }
+
+        public PageToolbar([NotNull] string pageName)
+        {
+            PageName = Check.NotNullOrEmpty(pageName, nameof(pageName));
+            Contributors = new PageToolbarContributorList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributionContext.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributionContext.cs
new file mode 100644
index 0000000000..2203559add
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributionContext.cs
@@ -0,0 +1,27 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarContributionContext
+    {
+        [NotNull]
+        public string PageName { get; }
+
+        [NotNull]
+        public IServiceProvider ServiceProvider { get; }
+
+        [NotNull]
+        public PageToolbarItemList Items { get; }
+
+        public PageToolbarContributionContext(
+            [NotNull] string pageName,
+            [NotNull] IServiceProvider serviceProvider)
+        {
+            PageName = Check.NotNull(pageName, nameof(pageName));
+            ServiceProvider = Check.NotNull(serviceProvider, nameof(serviceProvider));
+
+            Items = new PageToolbarItemList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributor.cs
new file mode 100644
index 0000000000..2cff729aa0
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributor.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public abstract class PageToolbarContributor : IPageToolbarContributor
+    {
+        public abstract Task ContributeAsync(PageToolbarContributionContext context);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributorList.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributorList.cs
new file mode 100644
index 0000000000..e1c7c09934
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarContributorList.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarContributorList : List<IPageToolbarContributor>
+    {
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarDictionary.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarDictionary.cs
new file mode 100644
index 0000000000..30a868c5b1
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarDictionary : Dictionary<string, PageToolbar>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarExtensions.cs
new file mode 100644
index 0000000000..794b923b48
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarExtensions.cs
@@ -0,0 +1,84 @@
+using System;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar.Button;
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public static class PageToolbarExtensions
+    {
+        public static PageToolbar AddComponent<TComponent>(
+            this PageToolbar toolbar,
+            object argument = null,
+            int order = 0,
+            string requiredPolicyName = null)
+        {
+            return toolbar.AddComponent(
+                typeof(TComponent),
+                argument,
+                order,
+                requiredPolicyName
+            );
+        }
+
+        public static PageToolbar AddComponent(
+            this PageToolbar toolbar, 
+            Type componentType, 
+            object argument = null,
+            int order = 0,
+            string requiredPolicyName = null)
+        {
+            toolbar.Contributors.Add(
+                new SimplePageToolbarContributor(
+                    componentType,
+                    argument,
+                    order,
+                    requiredPolicyName
+                )
+            );
+
+            return toolbar;
+        }
+
+        public static PageToolbar AddButton(
+            this PageToolbar toolbar, 
+            ILocalizableString text,
+            string icon = null,
+            string name = null,
+            string id = null,
+            ILocalizableString busyText = null,
+            FontIconType iconType = FontIconType.FontAwesome,
+            AbpButtonType type = AbpButtonType.Primary,
+            AbpButtonSize size = AbpButtonSize.Small,
+            bool disabled = false,
+            int order = 0,
+            string requiredPolicyName = null)
+        {
+            if (busyText == null)
+            {
+                busyText = new LocalizableString(typeof(AbpUiResource), "ProcessingWithThreeDot");
+            }
+
+            toolbar.AddComponent<AbpPageToolbarButtonViewComponent>(
+                new
+                {
+                    text,
+                    icon,
+                    name,
+                    id,
+                    busyText,
+                    iconType,
+                    type,
+                    size,
+                    disabled
+                },
+                order,
+                requiredPolicyName
+            );
+
+            return toolbar;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItem.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItem.cs
new file mode 100644
index 0000000000..b73dc4d829
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItem.cs
@@ -0,0 +1,26 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarItem
+    {
+        [NotNull]
+        public Type ComponentType { get; }
+
+        [CanBeNull]
+        public object Arguments { get; set; }
+
+        public int Order { get; set; }
+
+        public PageToolbarItem(
+            [NotNull] Type componentType, 
+            [CanBeNull] object arguments = null, 
+            int order = 0)
+        {
+            ComponentType = Check.NotNull(componentType, nameof(componentType));
+            Arguments = arguments;
+            Order = order;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItemList.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItemList.cs
new file mode 100644
index 0000000000..69b943d376
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarItemList.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarItemList : List<PageToolbarItem>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs
new file mode 100644
index 0000000000..f54365674f
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class PageToolbarManager : IPageToolbarManager, ITransientDependency
+    {
+        protected AbpPageToolbarOptions Options { get; }
+        protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+
+        public PageToolbarManager(
+            IOptions<AbpPageToolbarOptions> options,
+            IHybridServiceScopeFactory serviceScopeFactory)
+        {
+            Options = options.Value;
+            ServiceScopeFactory = serviceScopeFactory;
+        }
+
+        public virtual async Task<PageToolbarItem[]> GetItemsAsync(string pageName)
+        {
+            var toolbar = Options.Toolbars.GetOrDefault(pageName);
+            if (toolbar == null || !toolbar.Contributors.Any())
+            {
+                return Array.Empty<PageToolbarItem>();
+            }
+
+            using (var scope = ServiceScopeFactory.CreateScope())
+            {
+                var context = new PageToolbarContributionContext(pageName, scope.ServiceProvider);
+
+                foreach (var contributor in toolbar.Contributors)
+                {
+                    await contributor.ContributeAsync(context);
+                }
+
+                return context.Items.OrderBy(i => i.Order).ToArray();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/SimplePageToolbarContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/SimplePageToolbarContributor.cs
new file mode 100644
index 0000000000..a07b357b42
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/SimplePageToolbarContributor.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars
+{
+    public class SimplePageToolbarContributor : IPageToolbarContributor
+    {
+        public Type ComponentType { get; }
+
+        public object Argument { get; set; }
+
+        public int Order { get; }
+
+        public string RequiredPolicyName { get; }
+
+        public SimplePageToolbarContributor(
+            Type componentType,
+            object argument = null,
+            int order = 0,
+            string requiredPolicyName = null)
+        {
+            ComponentType = componentType;
+            Argument = argument;
+            Order = order;
+            RequiredPolicyName = requiredPolicyName;
+        }
+
+        public async Task ContributeAsync(PageToolbarContributionContext context)
+        {
+            if(await ShouldAddComponentAsync(context))
+            {
+                context.Items.Add(new PageToolbarItem(ComponentType, Argument, Order));
+            }
+        }
+
+        protected virtual async Task<bool> ShouldAddComponentAsync(PageToolbarContributionContext context)
+        {
+            if (RequiredPolicyName != null)
+            {
+                var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
+                if (!await authorizationService.IsGrantedAsync(RequiredPolicyName))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs
new file mode 100644
index 0000000000..b07bc69abb
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar
+{
+    public class AbpPageToolbarViewComponent : AbpViewComponent
+    {
+        private readonly IPageToolbarManager _toolbarManager;
+
+        public AbpPageToolbarViewComponent(IPageToolbarManager toolbarManager)
+        {
+            _toolbarManager = toolbarManager;
+        }
+
+        public async Task<IViewComponentResult> InvokeAsync(string pageName)
+        {
+            var items = await _toolbarManager.GetItemsAsync(pageName);
+            return View("~/Pages/Shared/Components/AbpPageToolbar/Default.cshtml", items);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/AbpPageToolbarButtonViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/AbpPageToolbarButtonViewComponent.cs
new file mode 100644
index 0000000000..894ade7005
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/AbpPageToolbarButtonViewComponent.cs
@@ -0,0 +1,82 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button;
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar.Button
+{
+    public class AbpPageToolbarButtonViewComponent : AbpViewComponent
+    {
+        protected IStringLocalizerFactory StringLocalizerFactory { get; }
+
+        public AbpPageToolbarButtonViewComponent(IStringLocalizerFactory stringLocalizerFactory)
+        {
+            StringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        public IViewComponentResult Invoke(
+            ILocalizableString text,
+            string name,
+            string icon,
+            string id,
+            ILocalizableString busyText,
+            FontIconType iconType,
+            AbpButtonType type,
+            AbpButtonSize size,
+            bool disabled)
+        {
+            Check.NotNull(text, nameof(text));
+            
+            return View(
+                "~/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml",
+                new AbpPageToolbarButtonViewModel(
+                    text.Localize(StringLocalizerFactory),
+                    name,
+                    icon,
+                    id,
+                    busyText?.Localize(StringLocalizerFactory),
+                    iconType,
+                    type,
+                    size,
+                    disabled
+                )
+            );
+        }
+
+        public class AbpPageToolbarButtonViewModel
+        {
+            public string Text { get; }
+            public string Name { get; }
+            public string Icon { get; }
+            public string Id { get; }
+            public string BusyText { get; }
+            public FontIconType IconType { get; }
+            public AbpButtonType Type { get; }
+            public AbpButtonSize Size { get; }
+            public bool Disabled { get; }
+
+            public AbpPageToolbarButtonViewModel(
+                string text,
+                string name,
+                string icon,
+                string id,
+                string busyText,
+                FontIconType iconType,
+                AbpButtonType type,
+                AbpButtonSize size,
+                bool disabled)
+            {
+                Text = text;
+                Name = name;
+                Icon = icon;
+                Id = id;
+                BusyText = busyText;
+                IconType = iconType;
+                Type = type;
+                Size = size;
+                Disabled = disabled;
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
new file mode 100644
index 0000000000..10f2f7ceb2
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
@@ -0,0 +1,13 @@
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar.Button.AbpPageToolbarButtonViewComponent.AbpPageToolbarButtonViewModel
+<abp-button 
+    text="@Model.Text" 
+    name="@Model.Name" 
+    icon="@Model.Icon"
+    id="@Model.Id"
+    busy-text="@Model.BusyText"
+    icon-type="@Model.IconType"
+    button-type="@Model.Type" 
+    size="@Model.Size" 
+    disabled="@Model.Disabled"
+    class="mx-1"
+    />
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Default.cshtml
new file mode 100644
index 0000000000..a5331abc9e
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Default.cshtml
@@ -0,0 +1,5 @@
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars.PageToolbarItem[]
+@foreach (var toolbarItem in Model)
+{
+    @(await Component.InvokeAsync(toolbarItem.ComponentType, toolbarItem.Arguments))
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/_ViewImports.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/_ViewImports.cshtml
new file mode 100644
index 0000000000..c1da1f5f10
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
index 77cae54b67..cd31e73bc4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -1,60 +1,16 @@
-var abp = abp;
-
+var abp = abp || {};
 (function ($) {
 
-    /************************************************************************
-    * RECORD-ACTIONS extension for datatables                               
-     ---------------------------------------------------------------
-    * SINGLE BUTTON USAGE (creates the given JQuery element)
-       {
-            targets: 0,  //optional
-            rowAction: 
-            {
-                element: $("<button/>")
-                    .addClass("btn btn-primary btn-sm m-btn--icon")
-                    .text("My button")
-                    .prepend($("<i/>").addClass("la la-sign-in"))
-                    .click(function () {
-                        console.log($(this).data());
-                    })
-            },
-        },
-
-     ---------------------------------------------------------------
-     * LIST OF ITEMS USAGE
-       {
-           targets: 0, //optional
-           rowAction: 
-           {
-                text: 'My actions', //optional. default value: Actions
-                icon: 'bolt' //optional. default value: cog. See fa icon set https://fontawesome.com/v4.7.0/icons/
-                items:
-                    [
-                        {
-                            text: "My first action", //mandatory
-                            icon: "thumbs-o-down",  //optional.
-                            visible: true //optional. default value: true. Accepts boolean returning function too. Eg: function(){ return true/false;} ,
-                            action: function (data) {
-                                console.log(data.record);
-                            }
-                        },
-                         {
-                            text: "My second action",
-                            icon: "thumbs-o-up",
-                            visible: true, 
-                            action: function (data) {
-                                console.log(data.record);
-                            }
-                        }
-                    ]
-           }
-        },
-    *************************************************************************/
+    var datatables = abp.utils.createNamespace(abp, 'libs.datatables');
+
     var localize = function (key) {
         return abp.localization.getResource('AbpUi')(key);
     };
 
-    var recordActions = function () {
+    /************************************************************************
+    * RECORD-ACTIONS extension for datatables                                         *
+    *************************************************************************/
+    (function () {
         if (!$.fn.dataTableExt) {
             return;
         }
@@ -117,7 +73,7 @@
                 .addClass('action-button');
 
             var $dropdownButton = $('<button/>');
-            
+
             if (field.icon !== undefined) {
                 if (field.icon) {
                     $dropdownButton.append($("<i>").addClass("fa fa-" + field.icon + " mr-1"));
@@ -267,14 +223,12 @@
                 }
             });
 
-    }();
+    })();
 
     /************************************************************************
     * AJAX extension for datatables                                         *
     *************************************************************************/
-    var datatables = abp.utils.createNamespace(abp, 'libs.datatables');
-
-    var ajaxActions = function () {
+    (function () {
         datatables.createAjax = function (serverMethod, inputAction) {
             return function (requestData, callback, settings) {
                 var input = inputAction ? inputAction() : {};
@@ -318,14 +272,14 @@
                 }
             };
         };
-    }();
+    })();
 
     /************************************************************************
     * Configuration/Options normalizer for datatables                       *
     *************************************************************************/
-    var optionNormalizer = function () {
+    (function () {
 
-        var customizeRowActionColumn = function(column) {
+        var customizeRowActionColumn = function (column) {
             column.data = null;
             column.orderable = false;
             column.defaultContent = "";
@@ -336,6 +290,9 @@
         };
 
         datatables.normalizeConfiguration = function (configuration) {
+
+            configuration.scrollX = true;
+
             for (var i = 0; i < configuration.columnDefs.length; i++) {
                 var column = configuration.columnDefs[i];
                 if (!column.targets) {
@@ -369,6 +326,6 @@
             return configuration;
         };
 
-    }();
+    })();
 
 })(jQuery);
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js
new file mode 100644
index 0000000000..19882fbc62
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js
@@ -0,0 +1,192 @@
+var abp = abp || {};
+(function () {
+    abp.ui = abp.ui || {};
+    abp.ui.extensions = abp.ui.extensions || {};
+
+    abp.ui.extensions.ActionList = function () {
+        return new abp.utils.common.LinkedList();
+    };
+
+    abp.ui.extensions.ColumnList = function () {
+        return new abp.utils.common.LinkedList();
+    };
+
+    abp.ui.extensions.entityActions = (function () {
+        var _callbackLists = {};
+
+        function _get(name) {
+            var callbackList = _callbackLists[name];
+
+            if (!callbackList) {
+                callbackList = _callbackLists[name] = [];
+            }
+
+            return {
+                addContributor: _addContributor,
+                get actions() {
+                    return _getActions();
+                }
+            };
+
+            function _addContributor(contributeCallback, order) {
+                if (order === undefined || order >= callbackList.length) {
+                    callbackList.push(contributeCallback);
+                } else if (order === 0) {
+                    callbackList.unshift(contributeCallback);
+                } else {
+                    callbackList.splice(order, 0, contributeCallback);
+                }
+            }
+
+            function _getActions() {
+                var actionList = new abp.ui.extensions.ActionList();
+
+                callbackList.forEach(function (callback) {
+                    callback(actionList);
+                });
+
+                return actionList;
+            }
+        }
+
+        return {
+            get: _get
+        };
+    })();
+
+    abp.ui.extensions.tableColumns = (function () {
+        var _callbackLists = {};
+
+        function _get(name) {
+            var callbackList = _callbackLists[name];
+
+            if (!callbackList) {
+                callbackList = _callbackLists[name] = [];
+            }
+
+            return {
+                addContributor: _addContributor,
+                get columns() {
+                    return _getColumns();
+                }
+            };
+
+            function _addContributor(contributeCallback, order) {
+                if (order === undefined || order >= callbackList.length) {
+                    callbackList.push(contributeCallback);
+                } else if (order === 0) {
+                    callbackList.unshift(contributeCallback);
+                } else {
+                    callbackList.splice(order, 0, contributeCallback);
+                }
+            }
+
+            function _getColumns() {
+                var columnList = new abp.ui.extensions.ColumnList();
+
+                callbackList.forEach(function (callback) {
+                    callback(columnList);
+                });
+
+                return columnList;
+            }
+        }
+
+        return {
+            get: _get
+        };
+    })();
+
+    function initializeObjectExtensions() {
+
+        function localizeDisplayName(propertyName, displayName) {
+            if (displayName && displayName.name) {
+                return abp.localization.localize(displayName.name, displayName.resource);
+            }
+
+            if (abp.localization.isLocalized('DisplayName:' + propertyName)) {
+                return abp.localization.localize('DisplayName:' + propertyName);
+            }
+
+            return abp.localization.localize(propertyName);
+        }
+
+        function configureTableColumns(tableName, columnConfigs) {
+            abp.ui.extensions.tableColumns.get(tableName)
+                .addContributor(
+                    function (columnList) {
+                        columnList.addManyTail(columnConfigs);
+                    }
+                );
+        }
+
+        function getTableProperties(objectConfig) {
+            var propertyNames = Object.keys(objectConfig.properties);
+            var tableProperties = [];
+            for (var i = 0; i < propertyNames.length; i++) {
+                var propertyName = propertyNames[i];
+                var propertyConfig = objectConfig.properties[propertyName];
+                if (propertyConfig.ui.onTable.isVisible) {
+                    tableProperties.push({
+                        name: propertyName,
+                        config: propertyConfig
+                    });
+                }
+            }
+
+            return tableProperties;
+        }
+
+        function convertPropertiesToColumnConfigs(properties) {
+            var columnConfigs = [];
+
+            for (var i = 0; i < properties.length; i++) {
+                var tableProperty = properties[i];
+                columnConfigs.push({
+                    title: localizeDisplayName(tableProperty.name, tableProperty.config.displayName),
+                    data: "extraProperties." + tableProperty.name
+                });
+            }
+
+            return columnConfigs;
+        }
+
+        function configureEntity(moduleName, entityName, entityConfig) {
+            var tableProperties = getTableProperties(entityConfig);
+
+            if (tableProperties.length > 0) {
+                var tableName = abp.utils.toCamelCase(moduleName) + "." + abp.utils.toCamelCase(entityName);
+                var columnConfigs = convertPropertiesToColumnConfigs(tableProperties);
+                configureTableColumns(
+                    tableName,
+                    columnConfigs
+                );
+            }
+        }
+
+        function configureModule(moduleName, moduleConfig) {
+            var entityNames = Object.keys(moduleConfig.entities);
+            for (var i = 0; i < entityNames.length; i++) {
+                configureEntity(
+                    moduleName,
+                    entityNames[i],
+                    moduleConfig.entities[entityNames[i]]
+                );
+            }
+        }
+
+        var moduleNames = Object.keys(abp.objectExtensions.modules);
+
+        for (var i = 0; i < moduleNames.length; i++) {
+            configureModule(
+                moduleNames[i],
+                abp.objectExtensions.modules[moduleNames[i]]
+            );
+        }
+    }
+
+    abp.event.on('abp.configurationInitialized', function () {
+        initializeObjectExtensions();
+    });
+
+})();
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
index 7e469f4195..00ba8423b3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Localization;
 using Volo.Abp.ApiVersioning;
 using Volo.Abp.AspNetCore.Mvc.ApiExploring;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
@@ -90,8 +91,11 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             var mvcCoreBuilder = context.Services.AddMvcCore();
             context.Services.ExecutePreConfiguredActions(mvcCoreBuilder);
-            
-            var abpMvcDataAnnotationsLocalizationOptions = context.Services.ExecutePreConfiguredActions(new AbpMvcDataAnnotationsLocalizationOptions());
+
+            var abpMvcDataAnnotationsLocalizationOptions = context.Services
+                .ExecutePreConfiguredActions(
+                    new AbpMvcDataAnnotationsLocalizationOptions()
+                );
 
             context.Services
                 .AddSingleton<IOptions<AbpMvcDataAnnotationsLocalizationOptions>>(
@@ -111,8 +115,17 @@ namespace Volo.Abp.AspNetCore.Mvc
                 {
                     options.DataAnnotationLocalizerProvider = (type, factory) =>
                     {
-                        var resourceType = abpMvcDataAnnotationsLocalizationOptions.AssemblyResources.GetOrDefault(type.Assembly);
-                        return factory.Create(resourceType ?? type);
+                        var resourceType = abpMvcDataAnnotationsLocalizationOptions
+                            .AssemblyResources
+                            .GetOrDefault(type.Assembly);
+
+                        if (resourceType != null)
+                        {
+                            return factory.Create(resourceType);
+                        }
+
+                        return factory.CreateDefaultOrNull() ?? 
+                               factory.Create(type);
                     };
                 })                
                 .AddViewLocalization(); //TODO: How to configure from the application? Also, consider to move to a UI module since APIs does not care about it.
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
index f1225f1abf..4aa183a43d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs
@@ -5,6 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.Features;
 using Volo.Abp.AspNetCore.Mvc.ModelBinding;
+using Volo.Abp.AspNetCore.Mvc.ModelBinding.Metadata;
 using Volo.Abp.AspNetCore.Mvc.Response;
 using Volo.Abp.AspNetCore.Mvc.Uow;
 using Volo.Abp.AspNetCore.Mvc.Validation;
@@ -48,6 +49,7 @@ namespace Volo.Abp.AspNetCore.Mvc
         private static void AddModelBinders(MvcOptions options)
         {
             options.ModelBinderProviders.Insert(0, new AbpDateTimeModelBinderProvider());
+            options.ModelBinderProviders.Insert(0, new AbpExtraPropertiesDictionaryModelBinderProvider());
         }
 
         private static void AddMetadataProviders(MvcOptions options, IServiceCollection services)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
index 4b4cf521c2..187823b663 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending;
 using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
 using Volo.Abp.Authorization;
 using Volo.Abp.Features;
@@ -30,6 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         private readonly ISettingDefinitionManager _settingDefinitionManager;
         private readonly IFeatureDefinitionManager _featureDefinitionManager;
         private readonly ILanguageProvider _languageProvider;
+        private readonly ICachedObjectExtensionsDtoService _cachedObjectExtensionsDtoService;
 
         public AbpApplicationConfigurationAppService(
             IOptions<AbpLocalizationOptions> localizationOptions,
@@ -41,7 +43,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             ISettingProvider settingProvider,
             ISettingDefinitionManager settingDefinitionManager,
             IFeatureDefinitionManager featureDefinitionManager,
-            ILanguageProvider languageProvider)
+            ILanguageProvider languageProvider,
+            ICachedObjectExtensionsDtoService cachedObjectExtensionsDtoService)
         {
             _serviceProvider = serviceProvider;
             _abpAuthorizationPolicyProvider = abpAuthorizationPolicyProvider;
@@ -51,6 +54,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             _settingDefinitionManager = settingDefinitionManager;
             _featureDefinitionManager = featureDefinitionManager;
             _languageProvider = languageProvider;
+            _cachedObjectExtensionsDtoService = cachedObjectExtensionsDtoService;
             _localizationOptions = localizationOptions.Value;
             _multiTenancyOptions = multiTenancyOptions.Value;
         }
@@ -67,12 +71,12 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
                 CurrentUser = GetCurrentUser(),
                 Setting = await GetSettingConfigAsync(),
                 MultiTenancy = GetMultiTenancy(),
-                CurrentTenant = GetCurrentTenant()
-
+                CurrentTenant = GetCurrentTenant(),
+                ObjectExtensions = _cachedObjectExtensionsDtoService.Get()
             };
         }
 
-        protected  virtual  CurrentTenantDto GetCurrentTenant()
+        protected virtual CurrentTenantDto GetCurrentTenant()
         {
             return new CurrentTenantDto()
             {
@@ -154,6 +158,13 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 
             localizationConfig.CurrentCulture = GetCurrentCultureInfo();
 
+            if (_localizationOptions.DefaultResourceType != null)
+            {
+                localizationConfig.DefaultResourceName = LocalizationResourceNameAttribute.GetName(
+                    _localizationOptions.DefaultResourceType
+                );
+            }
+
             Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetLocalizationConfigAsync()");
 
             return localizationConfig;
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
index f957fd894f..1042ee4d08 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
@@ -206,7 +206,7 @@ namespace Volo.Abp.AspNetCore.Mvc
             /* TODO: Add interfaces
              */
 
-            var typeName = ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(type);
+            var typeName = TypeHelper.GetFullNameHandlingNullableAndGenerics(type);
 
             if (applicationModel.Types.ContainsKey(typeName))
             {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs
index 6428cf485e..9b376ab540 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using System;
-using Volo.Abp.Settings;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.AspNetCore.Mvc.Localization
 {
@@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Localization
         [HttpGet]
         public IActionResult Switch(string culture, string uiCulture = "", string returnUrl = "")
         {
-            if (!GlobalizationHelper.IsValidCultureCode(culture))
+            if (!CultureHelper.IsValidCultureCode(culture))
             {
                 throw new AbpException("Unknown language: " + culture + ". It must be a valid culture!");
             }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/GlobalizationHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/GlobalizationHelper.cs
deleted file mode 100644
index a84faeb8f9..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/GlobalizationHelper.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Globalization;
-
-namespace Volo.Abp.AspNetCore.Mvc.Localization
-{
-    internal static class GlobalizationHelper
-    {
-        public static bool IsValidCultureCode(string cultureCode)
-        {
-            if (cultureCode.IsNullOrWhiteSpace())
-            {
-                return false;
-            }
-
-            try
-            {
-                CultureInfo.GetCultureInfo(cultureCode);
-                return true;
-            }
-            catch (CultureNotFoundException)
-            {
-                return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs
new file mode 100644
index 0000000000..3ed1eda3a1
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertiesDictionaryModelBinderProvider.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Data;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public class AbpExtraPropertiesDictionaryModelBinderProvider : IModelBinderProvider
+    {
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.ModelType != typeof(Dictionary<string, object>))
+            {
+                return null;
+            }
+
+            if (!context.Metadata.ContainerType.IsAssignableTo<IHasExtraProperties>())
+            {
+                return null;
+            }
+
+            var binderType = typeof(DictionaryModelBinder<string, object>);
+            var keyBinder = context.CreateBinder(context.MetadataProvider.GetMetadataForType(typeof(string)));
+            var valueBinder = new AbpExtraPropertyModelBinder(context.Metadata.ContainerType);
+            var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+            var mvcOptions = context.Services.GetRequiredService<IOptions<MvcOptions>>().Value;
+
+            return (IModelBinder)Activator.CreateInstance(
+                binderType,
+                keyBinder,
+                valueBinder,
+                loggerFactory,
+                true /* allowValidatingTopLevelNodes */,
+                mvcOptions);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs
new file mode 100644
index 0000000000..d3f570b1ce
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpExtraPropertyModelBinder.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Volo.Abp.ObjectExtending;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public class AbpExtraPropertyModelBinder : IModelBinder
+    {
+        public Type ExtensibleObjectType { get; }
+
+        public AbpExtraPropertyModelBinder(Type extensibleObjectType)
+        {
+            ExtensibleObjectType = extensibleObjectType;
+        }
+
+        public virtual Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                return Task.CompletedTask;
+            }
+
+            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
+
+            var model = ConvertStringToPropertyType(
+                bindingContext,
+                valueProviderResult.FirstValue
+            );
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+
+            return Task.CompletedTask;
+        }
+
+        protected virtual object ConvertStringToPropertyType(ModelBindingContext bindingContext, string value)
+        {
+            if (bindingContext.ModelMetadata.ConvertEmptyStringToNull && string.IsNullOrWhiteSpace(value))
+            {
+                return null;
+            }
+
+            var extensionInfo = ObjectExtensionManager.Instance.GetOrNull(ExtensibleObjectType);
+            if (extensionInfo == null)
+            {
+                return value;
+            }
+
+            var propertyName = ExtraPropertyBindingHelper.ExtractExtraPropertyName(bindingContext.ModelName);
+            if (propertyName == null)
+            {
+                return value;
+            }
+
+            var propertyInfo = extensionInfo.GetPropertyOrNull(propertyName);
+            if (propertyInfo == null)
+            {
+                return value;
+            }
+
+            return Convert.ChangeType(value, propertyInfo.Type);
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper.cs
new file mode 100644
index 0000000000..0bd4c43173
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public static class ExtraPropertyBindingHelper
+    {
+        /// <summary>
+        /// <paramref name="expression"/> is a string like "UserInfo.ExtraProperties[SocialSecurityNumber]"
+        /// This method returns "SocialSecurityNumber" for this example. */
+        /// </summary>
+        public static string ExtractExtraPropertyName(string expression)
+        {
+            var index = expression.IndexOf("ExtraProperties[", StringComparison.Ordinal);
+            if (index < 0)
+            {
+                return null;
+            }
+
+            return expression.Substring(index + 16, expression.Length - index - 17);
+        }
+
+        /// <summary>
+        /// <paramref name="expression"/> is a string like "UserInfo.ExtraProperties[SocialSecurityNumber]"
+        /// This method returns "UserInfo" for this example.
+        /// </summary>
+        public static string ExtractContainerName(string expression)
+        {
+            var index = expression.IndexOf("ExtraProperties[", StringComparison.Ordinal);
+            if (index < 0)
+            {
+                return null;
+            }
+
+            return expression.Left(index).TrimEnd('.');
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs
index b77354aab2..94a08a0507 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.Mvc.Validation;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.ModelBinding.Metadata
@@ -14,14 +14,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding.Metadata
     [ExposeServices(typeof(IModelMetadataProvider))]
     public class AbpModelMetadataProvider : DefaultModelMetadataProvider
     {
-        private static readonly PropertyInfo ValidationAttributeErrorMessageStringProperty;
-
-        static AbpModelMetadataProvider()
-        {
-            ValidationAttributeErrorMessageStringProperty = typeof(ValidationAttribute)
-                .GetProperty("ErrorMessageString", BindingFlags.Instance | BindingFlags.NonPublic);
-        }
-
         public AbpModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider)
             : base(detailsProvider)
         {
@@ -56,7 +48,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding.Metadata
         {
             if (validationAttribute.ErrorMessage == null)
             {
-                validationAttribute.ErrorMessage = ValidationAttributeErrorMessageStringProperty.GetValue(validationAttribute) as string;
+                ValidationAttributeHelper.SetDefaultErrorMessage(validationAttribute);
             }
         }
     }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/ValidationAttributeHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/ValidationAttributeHelper.cs
new file mode 100644
index 0000000000..955b83c48f
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/ValidationAttributeHelper.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
+using System.Text;
+
+namespace Volo.Abp.AspNetCore.Mvc.Validation
+{
+    public static class ValidationAttributeHelper
+    {
+        private static readonly PropertyInfo ValidationAttributeErrorMessageStringProperty = typeof(ValidationAttribute)
+            .GetProperty("ErrorMessageString", BindingFlags.Instance | BindingFlags.NonPublic);
+
+        public static void SetDefaultErrorMessage(ValidationAttribute validationAttribute)
+        {
+            validationAttribute.ErrorMessage =
+                ValidationAttributeErrorMessageStringProperty.GetValue(validationAttribute) as string;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ViewFeatures/AbpValidationHtmlAttributeProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ViewFeatures/AbpValidationHtmlAttributeProvider.cs
new file mode 100644
index 0000000000..84a3d05e25
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ViewFeatures/AbpValidationHtmlAttributeProvider.cs
@@ -0,0 +1,132 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Volo.Abp.AspNetCore.Mvc.ModelBinding;
+using Volo.Abp.AspNetCore.Mvc.Validation;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.Validation.Localization;
+
+namespace Volo.Abp.AspNetCore.Mvc.ViewFeatures
+{
+    [Dependency(ReplaceServices = true)]
+    [ExposeServices(typeof(ValidationHtmlAttributeProvider))]
+    public class AbpValidationHtmlAttributeProvider
+        : DefaultValidationHtmlAttributeProvider, ISingletonDependency
+    {
+        private readonly IModelMetadataProvider _metadataProvider;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IStringLocalizer<AbpValidationResource> _validationStringLocalizer;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+
+        public AbpValidationHtmlAttributeProvider(
+            IOptions<MvcViewOptions> optionsAccessor,
+            IModelMetadataProvider metadataProvider,
+            ClientValidatorCache clientValidatorCache,
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IStringLocalizerFactory stringLocalizerFactory,
+            IStringLocalizer<AbpValidationResource> validationStringLocalizer)
+            : base(
+                optionsAccessor,
+                metadataProvider,
+                clientValidatorCache)
+        {
+            _metadataProvider = metadataProvider;
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+            _stringLocalizerFactory = stringLocalizerFactory;
+            _validationStringLocalizer = validationStringLocalizer;
+        }
+
+        public override void AddValidationAttributes(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            IDictionary<string, string> attributes)
+        {
+            base.AddValidationAttributes(viewContext, modelExplorer, attributes);
+            AddExtraPropertyValidationsAttributes(viewContext, modelExplorer, attributes);
+        }
+
+        protected virtual void AddExtraPropertyValidationsAttributes(ViewContext viewContext, ModelExplorer modelExplorer, IDictionary<string, string> attributes)
+        {
+            var nameAttribute = attributes.GetOrDefault("name");
+            if (nameAttribute == null)
+            {
+                return;
+            }
+
+            var extraPropertyName = ExtraPropertyBindingHelper.ExtractExtraPropertyName(nameAttribute);
+            if (extraPropertyName == null)
+            {
+                return;
+            }
+
+            //TODO: containerName can be null on controller actions..?
+            var containerName = ExtraPropertyBindingHelper.ExtractContainerName(nameAttribute);
+            if (containerName == null)
+            {
+                return;
+            }
+
+            if (modelExplorer.Container?.ModelType == null)
+            {
+                return;
+            }
+
+            var extensibleObjectType = modelExplorer.Container.ModelType
+                .GetProperty(containerName, BindingFlags.Instance | BindingFlags.Public)
+                ?.PropertyType;
+            if (extensibleObjectType == null)
+            {
+                return;
+            }
+
+            var extensionPropertyInfo = ObjectExtensionManager.Instance.GetPropertyOrNull(
+                extensibleObjectType,
+                extraPropertyName
+            );
+
+            if (extensionPropertyInfo == null)
+            {
+                return;
+            }
+
+            if (modelExplorer.Metadata is DefaultModelMetadata metadata)
+            {
+                metadata.DisplayMetadata.DisplayName =
+                    () => extensionPropertyInfo.GetLocalizedDisplayName(_stringLocalizerFactory);
+            }
+
+            foreach (var validationAttribute in extensionPropertyInfo.GetValidationAttributes())
+            {
+                var validationContext = new ClientModelValidationContext(
+                    viewContext,
+                    modelExplorer.Metadata,
+                    _metadataProvider,
+                    attributes
+                );
+
+                if (validationAttribute.ErrorMessage == null)
+                {
+                    ValidationAttributeHelper.SetDefaultErrorMessage(validationAttribute);
+                }
+
+                var validationAttributeAdapter = _validationAttributeAdapterProvider.GetAttributeAdapter(
+                        validationAttribute,
+                        _validationStringLocalizer
+                    );
+
+                validationAttributeAdapter?.AddValidation(validationContext);
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs
new file mode 100644
index 0000000000..9bb6c903a9
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtendingPropertyInfoExtensions.cs
@@ -0,0 +1,98 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class ObjectExtensionPropertyInfoAspNetCoreMvcExtensions
+    {
+        public static string GetInputType(this ObjectExtensionPropertyInfo propertyInfo)
+        {
+            foreach (var attribute in propertyInfo.Attributes)
+            {
+                var inputTypeByAttribute = GetInputTypeFromAttributeOrNull(attribute);
+                if (inputTypeByAttribute != null)
+                {
+                    return inputTypeByAttribute;
+                }
+            }
+
+            return GetInputTypeFromTypeOrNull(propertyInfo.Type)
+                   ?? "text"; //default
+        }
+
+        private static string GetInputTypeFromAttributeOrNull(Attribute attribute)
+        {
+            if (attribute is EmailAddressAttribute)
+            {
+                return "email";
+            }
+
+            if (attribute is UrlAttribute)
+            {
+                return "url";
+            }
+
+            if (attribute is HiddenInputAttribute)
+            {
+                return "hidden";
+            }
+
+            if (attribute is PhoneAttribute)
+            {
+                return "tel";
+            }
+
+            if (attribute is DataTypeAttribute dataTypeAttribute)
+            {
+                switch (dataTypeAttribute.DataType)
+                {
+                    case DataType.Password:
+                        return "password";
+                    case DataType.Date:
+                        return "date";
+                    case DataType.Time:
+                        return "time";
+                    case DataType.EmailAddress:
+                        return "email";
+                    case DataType.Url:
+                        return "url";
+                    case DataType.PhoneNumber:
+                        return "tel";
+                    case DataType.DateTime:
+                        return "datetime-local";
+                }
+            }
+
+            return null;
+        }
+
+        private static string GetInputTypeFromTypeOrNull(Type type)
+        {
+            if (type == typeof(bool))
+            {
+                return "checkbox";
+            }
+
+            if (type == typeof(DateTime))
+            {
+                return "datetime-local";
+            }
+
+            if (type == typeof(int) ||
+                type == typeof(long) || 
+                type == typeof(byte) ||
+                type == typeof(sbyte) ||
+                type == typeof(short) ||
+                type == typeof(ushort) ||
+                type == typeof(uint) ||
+                type == typeof(long) ||
+                type == typeof(ulong))
+            {
+                return "number";
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
index ca1a23fcfc..bd3037d830 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
@@ -1,9 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using IdentityModel.Client;
+using Polly;
+using Polly.Extensions.Http;
 using Volo.Abp.Cli.Auth;
+using Microsoft.Extensions.Logging;
 
 namespace Volo.Abp.Cli.Http
 {
@@ -41,5 +47,55 @@ namespace Volo.Abp.Cli.Http
                 client.SetBearerToken(accessToken);
             }
         }
+
+        public async Task<HttpResponseMessage> GetHttpResponseMessageWithRetryAsync<T>
+        (
+            string url,
+            CancellationToken? cancellationToken = null,
+            ILogger<T> logger = null,
+            IEnumerable<TimeSpan> sleepDurations = null
+        )
+        {
+            if (sleepDurations == null)
+            {
+                sleepDurations = new[]
+                {
+                    TimeSpan.FromSeconds(2),
+                    TimeSpan.FromSeconds(4),
+                    TimeSpan.FromSeconds(7)
+                };
+            }
+
+            if (!cancellationToken.HasValue)
+            {
+                cancellationToken = CancellationToken.None;
+            }
+
+            return await HttpPolicyExtensions
+                .HandleTransientHttpError()
+                .OrResult(msg => !msg.IsSuccessStatusCode)
+                .WaitAndRetryAsync(sleepDurations,
+                    (responseMessage, timeSpan, retryCount, context) =>
+                    {
+                        if (responseMessage.Exception != null)
+                        {
+                            string httpErrorCode = responseMessage.Result == null ?
+                                httpErrorCode = string.Empty :
+                                "HTTP-" + (int)responseMessage.Result.StatusCode + ", ";
+
+                            logger?.LogWarning(
+                                $"{retryCount}. HTTP request attempt failed to {url} with an error: {httpErrorCode}{responseMessage.Exception.Message}. " +
+                                $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
+                        }
+                        else if (responseMessage.Result != null)
+                        {
+                            logger?.LogWarning(
+                                $"{retryCount}. HTTP request attempt failed to {url} with an error: {(int)responseMessage.Result.StatusCode}-{responseMessage.Result.ReasonPhrase}. " +
+                                $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
+                        }
+                    })
+                .ExecuteAsync(async () => await this.GetAsync(url, cancellationToken.Value));
+        }
+
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
index cddead548f..33a2e10fdf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
@@ -13,6 +13,7 @@ using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.ProjectBuilding;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Json;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Cli.Licensing
 {
@@ -20,14 +21,21 @@ namespace Volo.Abp.Cli.Licensing
     {
         protected IJsonSerializer JsonSerializer { get; }
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
+
         private readonly ILogger<AbpIoApiKeyService> _logger;
         private DeveloperApiKeyResult _apiKeyResult = null;
 
-        public AbpIoApiKeyService(IJsonSerializer jsonSerializer, IRemoteServiceExceptionHandler remoteServiceExceptionHandler, ILogger<AbpIoApiKeyService> logger)
+        public AbpIoApiKeyService(
+            IJsonSerializer jsonSerializer,
+            ICancellationTokenProvider cancellationTokenProvider,
+            IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
+            ILogger<AbpIoApiKeyService> logger)
         {
             JsonSerializer = jsonSerializer;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
             _logger = logger;
+            CancellationTokenProvider = cancellationTokenProvider;
         }
 
         public async Task<DeveloperApiKeyResult> GetApiKeyOrNullAsync(bool invalidateCache = false)
@@ -51,31 +59,10 @@ namespace Volo.Abp.Cli.Licensing
 
             using (var client = new CliHttpClient())
             {
-                var response = await HttpPolicyExtensions
-                    .HandleTransientHttpError()
-                    .OrResult(msg => !msg.IsSuccessStatusCode)
-                    .WaitAndRetryAsync(new[]
-                        {
-                            TimeSpan.FromSeconds(1),
-                            TimeSpan.FromSeconds(3),
-                            TimeSpan.FromSeconds(7)
-                        },
-                        (responseMessage, timeSpan, retryCount, context) =>
-                        {
-                            if (responseMessage.Exception != null)
-                            {
-                                _logger.LogWarning(
-                                    $"{retryCount}. request attempt failed to {url} with an error: \"{responseMessage.Exception.Message}\". " +
-                                    $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
-                            }
-                            else if (responseMessage.Result != null)
-                            {
-                                _logger.LogWarning(
-                                    $"{retryCount}. request attempt failed {url} with {(int)responseMessage.Result.StatusCode}-{responseMessage.Result.ReasonPhrase}. " +
-                                    $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
-                            }
-                        })
-                    .ExecuteAsync(async () => await client.GetAsync(url));
+                var response = await client.GetHttpResponseMessageWithRetryAsync(
+                    url: url,
+                    cancellationToken: CancellationTokenProvider.Token,
+                    logger: _logger);
 
                 if (!response.IsSuccessStatusCode)
                 {
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
index c0eb6fd209..0fd35582bf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
@@ -1,16 +1,10 @@
 using Newtonsoft.Json;
 using NuGet.Versioning;
-using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Polly;
-using Polly.Extensions.Http;
 using Volo.Abp.Cli.Auth;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.Licensing;
@@ -29,6 +23,8 @@ namespace Volo.Abp.Cli.NuGet
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
         protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
         private readonly IApiKeyService _apiKeyService;
+        private List<string> _proPackageList;
+        private DeveloperApiKeyResult _apiKeyResult;
 
         public NuGetService(
             IJsonSerializer jsonSerializer,
@@ -45,20 +41,20 @@ namespace Volo.Abp.Cli.NuGet
 
         public async Task<SemanticVersion> GetLatestVersionOrNullAsync(string packageId, bool includePreviews = false, bool includeNightly = false)
         {
-            List<string> proPackageList = null;
-
             if (AuthService.IsLoggedIn())
             {
-                proPackageList = await GetProPackageListAsync();
+                if (_proPackageList == null)
+                {
+                    _proPackageList = await GetProPackageListAsync();
+                }
             }
 
             string url;
             if (includeNightly)
             {
-                url =
-                    $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+                url = $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json";
             }
-            else if (proPackageList?.Contains(packageId) ?? false)
+            else if (_proPackageList?.Contains(packageId) ?? false)
             {
                 url = await GetNuGetUrlForCommercialPackage(packageId);
             }
@@ -67,15 +63,13 @@ namespace Volo.Abp.Cli.NuGet
                 url = $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
             }
 
-
             using (var client = new CliHttpClient(setBearerToken: false))
             {
-                var responseMessage = await GetHttpResponseMessageWithRetryAsync(client, url);
-
-                if (!responseMessage.IsSuccessStatusCode)
-                {
-                    throw new Exception($"ERROR: Remote server returns '{responseMessage.StatusCode}'");
-                }
+                var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+                    url,
+                    cancellationToken: CancellationTokenProvider.Token,
+                    logger: Logger
+                );
 
                 await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
 
@@ -98,62 +92,41 @@ namespace Volo.Abp.Cli.NuGet
 
         private async Task<string> GetNuGetUrlForCommercialPackage(string packageId)
         {
-            var apiKeyResult = await _apiKeyService.GetApiKeyOrNullAsync();
-            return CliUrls.GetNuGetPackageInfoUrl(apiKeyResult.ApiKey, packageId);
-        }
+            if (_apiKeyResult == null)
+            {
+                _apiKeyResult = await _apiKeyService.GetApiKeyOrNullAsync();
+            }
 
-        private async Task<HttpResponseMessage> GetHttpResponseMessageWithRetryAsync(HttpClient client, string url)
-        {
-            return await HttpPolicyExtensions
-                .HandleTransientHttpError()
-                .OrResult(msg => !msg.IsSuccessStatusCode)
-                .WaitAndRetryAsync(new[]
-                    {
-                        TimeSpan.FromSeconds(2),
-                        TimeSpan.FromSeconds(4),
-                        TimeSpan.FromSeconds(7)
-                    },
-                    (responseMessage, timeSpan, retryCount, context) =>
-                    {
-                        if (responseMessage.Exception != null)
-                        {
-                            Logger.LogWarning(
-                                $"{retryCount}. HTTP request attempt failed to {url} with an error: HTTP {(int)responseMessage.Result.StatusCode}-{responseMessage.Exception.Message}. " +
-                                $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
-                        }
-                        else if (responseMessage.Result != null)
-                        {
-                            Logger.LogWarning(
-                                $"{retryCount}. HTTP request attempt failed to {url} with an error: {(int)responseMessage.Result.StatusCode}-{responseMessage.Result.ReasonPhrase}. " +
-                                $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
-                        }
-                    })
-                .ExecuteAsync(async () => await client.GetAsync(url, CancellationTokenProvider.Token));
+            return CliUrls.GetNuGetPackageInfoUrl(_apiKeyResult.ApiKey, packageId);
         }
 
         private async Task<List<string>> GetProPackageListAsync()
         {
             using var client = new CliHttpClient();
 
-            var responseMessage = await client.GetAsync(
-                $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames",
-                CancellationTokenProvider.Token
+            var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames";
+
+            var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+                url: url,
+                cancellationToken: CancellationTokenProvider.Token,
+                logger: Logger
             );
 
-            if (!responseMessage.IsSuccessStatusCode)
+            if (responseMessage.IsSuccessStatusCode)
             {
-                var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
-                var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+                return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
+            }
 
-                if (remoteServiceErrorMessage != null)
-                {
-                    exceptionMessage += remoteServiceErrorMessage;
-                }
-                Logger.LogInformation(exceptionMessage);
-                return null;
+            var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+            var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+
+            if (remoteServiceErrorMessage != null)
+            {
+                exceptionMessage += remoteServiceErrorMessage;
             }
 
-            return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
+            Logger.LogError(exceptionMessage);
+            return null;
         }
 
         public class NuGetVersionResultDto
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetPackageListFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetPackageListFinder.cs
index 41907276f4..75e9156ce0 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetPackageListFinder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/MyGetPackageListFinder.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.Cli.ProjectModification
             Logger = NullLogger<MyGetPackageListFinder>.Instance;
         }
 
-        public async Task<MyGetApiResponse> GetPackages()
+        public async Task<MyGetApiResponse> GetPackagesAsync()
         {
             if (_response != null)
             {
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
index a5a2e506cc..1a279fafc7 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
@@ -13,25 +13,31 @@ using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.IO;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Cli.ProjectModification
 {
     public class NpmPackagesUpdater : ITransientDependency
     {
         public ILogger<NpmPackagesUpdater> Logger { get; set; }
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
 
         private readonly PackageJsonFileFinder _packageJsonFileFinder;
         private readonly NpmGlobalPackagesChecker _npmGlobalPackagesChecker;
         private readonly MyGetPackageListFinder _myGetPackageListFinder;
-
         private readonly Dictionary<string, string> _fileVersionStorage = new Dictionary<string, string>();
+        private MyGetApiResponse _myGetApiResponse;
 
-        public NpmPackagesUpdater(PackageJsonFileFinder packageJsonFileFinder, NpmGlobalPackagesChecker npmGlobalPackagesChecker, MyGetPackageListFinder myGetPackageListFinder)
+        public NpmPackagesUpdater(
+            PackageJsonFileFinder packageJsonFileFinder,
+            NpmGlobalPackagesChecker npmGlobalPackagesChecker,
+            MyGetPackageListFinder myGetPackageListFinder,
+            ICancellationTokenProvider cancellationTokenProvider)
         {
             _packageJsonFileFinder = packageJsonFileFinder;
             _npmGlobalPackagesChecker = npmGlobalPackagesChecker;
             _myGetPackageListFinder = myGetPackageListFinder;
-
+            CancellationTokenProvider = cancellationTokenProvider;
             Logger = NullLogger<NpmPackagesUpdater>.Instance;
         }
 
@@ -77,7 +83,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        private async Task DeleteNpmrcFileAsync(string directoryName)
+        private static async Task DeleteNpmrcFileAsync(string directoryName)
         {
             FileHelper.DeleteIfExists(Path.Combine(directoryName, ".npmrc"));
 
@@ -135,11 +141,13 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 using (var client = new CliHttpClient(TimeSpan.FromMinutes(1)))
                 {
-                    var responseMessage = await client.GetAsync(
-                        $"{CliUrls.WwwAbpIo}api/myget/apikey/"
+                    var response = await client.GetHttpResponseMessageWithRetryAsync(
+                        url: $"{CliUrls.WwwAbpIo}api/myget/apikey/",
+                        cancellationToken: CancellationTokenProvider.Token,
+                        logger: Logger
                     );
 
-                    return Encoding.Default.GetString(await responseMessage.Content.ReadAsByteArrayAsync());
+                    return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
                 }
             }
             catch (Exception)
@@ -148,26 +156,26 @@ namespace Volo.Abp.Cli.ProjectModification
             }
         }
 
-        private bool IsAngularProject(string fileDirectory)
+        private static bool IsAngularProject(string fileDirectory)
         {
             return File.Exists(Path.Combine(fileDirectory, "angular.json"));
         }
 
-        protected virtual async Task<bool> UpdatePackagesInFile(string file, bool includePreviews = false, bool switchToStable = false)
+        protected virtual async Task<bool> UpdatePackagesInFile(string filePath, bool includePreviews = false, bool switchToStable = false)
         {
             var packagesUpdated = false;
-            var fileContent = File.ReadAllText(file);
+            var fileContent = File.ReadAllText(filePath);
             var packageJson = JObject.Parse(fileContent);
             var abpPackages = GetAbpPackagesFromPackageJson(packageJson);
 
             if (!abpPackages.Any())
             {
-                return packagesUpdated;
+                return false;
             }
 
             foreach (var abpPackage in abpPackages)
             {
-                var updated = await TryUpdatePackage(file, abpPackage, includePreviews, switchToStable);
+                var updated = await TryUpdatingPackage(filePath, abpPackage, includePreviews, switchToStable);
 
                 if (updated)
                 {
@@ -175,15 +183,18 @@ namespace Volo.Abp.Cli.ProjectModification
                 }
             }
 
-            var modifiedFileContent = packageJson.ToString(Formatting.Indented);
+            var updatedContent = packageJson.ToString(Formatting.Indented);
 
-            File.WriteAllText(file, modifiedFileContent);
+            File.WriteAllText(filePath, updatedContent);
 
             return packagesUpdated;
         }
 
-        protected virtual async Task<bool> TryUpdatePackage(string file, JProperty package,
-            bool includePreviews = false, bool switchToStable = false)
+        protected virtual async Task<bool> TryUpdatingPackage(
+            string filePath,
+            JProperty package,
+            bool includePreviews = false,
+            bool switchToStable = false)
         {
             var currentVersion = (string)package.Value;
 
@@ -198,23 +209,31 @@ namespace Volo.Abp.Cli.ProjectModification
 
             package.Value.Replace(versionWithPrefix);
 
-            Logger.LogInformation($"Updated {package.Name} to {version} in {file.Replace(Directory.GetCurrentDirectory(), "")}.");
+            Logger.LogInformation($"Updated {package.Name} to {version} in {filePath.Replace(Directory.GetCurrentDirectory(), "")}.");
             return true;
         }
 
-        protected virtual async Task<string> GetLatestVersion(JProperty package, string currentVersion,
-            bool includePreviews = false, bool switchToStable = false)
+        protected virtual async Task<string> GetLatestVersion(
+            JProperty package,
+            string currentVersion,
+            bool includePreviews = false,
+            bool switchToStable = false)
         {
             if (_fileVersionStorage.ContainsKey(package.Name))
             {
                 return _fileVersionStorage[package.Name];
             }
 
-            string newVersion = currentVersion;
+            var newVersion = currentVersion;
 
             if (includePreviews || (!switchToStable && currentVersion.Contains("-preview")))
             {
-                var mygetPackage = (await _myGetPackageListFinder.GetPackages()).Packages.FirstOrDefault(p => p.Id == package.Name);
+                if (_myGetApiResponse == null)
+                {
+                    _myGetApiResponse = await _myGetPackageListFinder.GetPackagesAsync();
+                }
+
+                var mygetPackage = _myGetApiResponse.Packages.FirstOrDefault(p => p.Id == package.Name);
                 if (mygetPackage != null)
                 {
                     newVersion = mygetPackage.Versions.Last();
@@ -225,7 +244,6 @@ namespace Volo.Abp.Cli.ProjectModification
                 newVersion = CmdHelper.RunCmdAndGetOutput($"npm show {package.Name} version");
             }
 
-
             _fileVersionStorage[package.Name] = newVersion;
 
             return newVersion;
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
index 587492804b..fb2a386ef9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs
@@ -42,8 +42,9 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual async Task UpdateInternalAsync(string projectPath, bool includePreviews = false, bool switchToStable = false)
         {
             var fileContent = File.ReadAllText(projectPath);
+            var updatedContent = await UpdateVoloPackagesAsync(fileContent, includePreviews, switchToStable);
 
-            File.WriteAllText(projectPath, await UpdateVoloPackagesAsync(fileContent, includePreviews, switchToStable));
+            File.WriteAllText(projectPath, updatedContent);
         }
 
         private async Task<string> UpdateVoloPackagesAsync(string content, bool includePreviews = false, bool switchToStable = false)
@@ -74,16 +75,13 @@ namespace Volo.Abp.Cli.ProjectModification
 
                         var versionAttribute = package.Attributes["Version"];
                         var currentVersion = versionAttribute.Value;
-                        var packageVersion = SemanticVersion.Parse(currentVersion);
-
-                        Logger.LogDebug("Checking package: \"{0}\" - Current version: {1}", packageId, packageVersion);
+                        var currentSemanticVersion = SemanticVersion.Parse(currentVersion);
 
+                        Logger.LogDebug("Checking package: \"{0}\" - Current version: {1}", packageId, currentSemanticVersion);
 
                         if (includePreviews || (currentVersion.Contains("-preview") && !switchToStable))
                         {
-                            var latestVersion = (await _myGetPackageListFinder.GetPackages()).Packages
-                                .FirstOrDefault(p => p.Id == packageId)
-                                ?.Versions.LastOrDefault();
+                            var latestVersion = await GetLatestVersionFromMyGet(packageId);
 
                             if (currentVersion != latestVersion)
                             {
@@ -99,14 +97,14 @@ namespace Volo.Abp.Cli.ProjectModification
                         {
                             var latestVersion = await _nuGetService.GetLatestVersionOrNullAsync(packageId);
 
-                            if (latestVersion != null && (currentVersion.Contains("-preview") || packageVersion < latestVersion))
+                            if (latestVersion != null && (currentVersion.Contains("-preview") || currentSemanticVersion < latestVersion))
                             {
-                                Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, packageVersion.ToString(), latestVersion.ToString());
+                                Logger.LogInformation("Updating package \"{0}\" from v{1} to v{2}.", packageId, currentSemanticVersion.ToString(), latestVersion.ToString());
                                 versionAttribute.Value = latestVersion.ToString();
                             }
                             else
                             {
-                                Logger.LogInformation("Package: \"{0}-v{1}\" is up to date.", packageId, packageVersion);
+                                Logger.LogInformation("Package: \"{0}-v{1}\" is up to date.", packageId, currentSemanticVersion);
                             }
                         }
                     }
@@ -116,11 +114,18 @@ namespace Volo.Abp.Cli.ProjectModification
             }
             catch (Exception ex)
             {
-                Logger.LogError("Cannot update volo packages! An error occured while updating the package \"{0}\". Error: {1}", packageId, ex.Message);
+                Logger.LogError("Cannot update Volo.* packages! An error occured while updating the package \"{0}\". Error: {1}", packageId, ex.Message);
                 Logger.LogException(ex);
             }
 
             return await Task.FromResult(content);
         }
+
+        private async Task<string> GetLatestVersionFromMyGet(string packageId)
+        {
+            var myGetPack = await _myGetPackageListFinder.GetPackagesAsync();
+
+            return myGetPack.Packages.FirstOrDefault(p => p.Id == packageId)?.Versions.LastOrDefault();
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs
index 34931bfc95..3995bf4440 100644
--- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs
+++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.Extensions.Localization
 {
-    public static class AbpStringLocalizerFactoryExtensions
+    public static class AbpCoreStringLocalizerFactoryExtensions
     {
         public static IStringLocalizer Create<TResource>(this IStringLocalizerFactory localizerFactory)
         {
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs
index d4d9cfb1c0..f27f52089a 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs
@@ -35,6 +35,24 @@ namespace Volo.Abp.Localization
             });
         }
 
+        public static bool IsValidCultureCode(string cultureCode)
+        {
+            if (cultureCode.IsNullOrWhiteSpace())
+            {
+                return false;
+            }
+
+            try
+            {
+                CultureInfo.GetCultureInfo(cultureCode);
+                return true;
+            }
+            catch (CultureNotFoundException)
+            {
+                return false;
+            }
+        }
+
         public static string GetBaseCultureName(string cultureName)
         {
             return cultureName.Contains("-")
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
index 5f66f4788e..11f43f852e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/TypeHelper.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using JetBrains.Annotations;
 
 namespace Volo.Abp.Reflection
 {
@@ -131,5 +132,137 @@ namespace Volo.Abp.Reflection
                    type == typeof(TimeSpan) ||
                    type == typeof(Guid);
         }
+
+        public static T GetDefaultValue<T>()
+        {
+            return default;
+        }
+
+        public static object GetDefaultValue(Type type)
+        {
+            if (type.IsValueType)
+            {
+                return Activator.CreateInstance(type);
+            }
+
+            return null;
+        }
+
+        public static string GetFullNameHandlingNullableAndGenerics([NotNull] Type type)
+        {
+            Check.NotNull(type, nameof(type));
+
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                return type.GenericTypeArguments[0].FullName + "?";
+            }
+
+            if (type.IsGenericType)
+            {
+                var genericType = type.GetGenericTypeDefinition();
+                return $"{genericType.FullName.Left(genericType.FullName.IndexOf('`'))}<{type.GenericTypeArguments.Select(GetFullNameHandlingNullableAndGenerics).JoinAsString(",")}>";
+            }
+
+            return type.FullName;
+        }
+
+        public static string GetSimplifiedName([NotNull] Type type)
+        {
+            Check.NotNull(type, nameof(type));
+
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                return GetSimplifiedName(type.GenericTypeArguments[0]) + "?";
+            }
+
+            if (type.IsGenericType)
+            {
+                var genericType = type.GetGenericTypeDefinition();
+                return $"{genericType.FullName.Left(genericType.FullName.IndexOf('`'))}<{type.GenericTypeArguments.Select(GetSimplifiedName).JoinAsString(",")}>";
+            }
+
+            if (type == typeof(string))
+            {
+                return "string";
+            }
+            else if (type == typeof(int))
+            {
+                return "number";
+            }
+            else if (type == typeof(long))
+            {
+                return "number";
+            }
+            else if (type == typeof(bool))
+            {
+                return "boolean";
+            }
+            else if (type == typeof(char))
+            {
+                return "string";
+            }
+            else if (type == typeof(double))
+            {
+                return "number";
+            }
+            else if (type == typeof(float))
+            {
+                return "number";
+            }
+            else if (type == typeof(decimal))
+            {
+                return "number";
+            }
+            else if (type == typeof(DateTime))
+            {
+                return "string";
+            }
+            else if (type == typeof(DateTimeOffset))
+            {
+                return "string";
+            }
+            else if (type == typeof(TimeSpan))
+            {
+                return "string";
+            }
+            else if (type == typeof(Guid))
+            {
+                return "string";
+            }
+            else if (type == typeof(byte))
+            {
+                return "number";
+            }
+            else if (type == typeof(sbyte))
+            {
+                return "number";
+            }
+            else if (type == typeof(short))
+            {
+                return "number";
+            }
+            else if (type == typeof(ushort))
+            {
+                return "number";
+            }
+            else if (type == typeof(uint))
+            {
+                return "number";
+            }
+            else if (type == typeof(ulong))
+            {
+                return "number";
+            }
+            else if (type == typeof(IntPtr))
+            {
+                return "number";
+            }
+            else if (type == typeof(UIntPtr))
+            {
+                return "number";
+            }
+
+            return type.FullName;
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/AggregateRoot.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/AggregateRoot.cs
index be02f3d398..b0c20131ef 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/AggregateRoot.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/AggregateRoot.cs
@@ -25,8 +25,9 @@ namespace Volo.Abp.Domain.Entities
 
         protected AggregateRoot()
         {
-            ExtraProperties = new Dictionary<string, object>();
             ConcurrencyStamp = Guid.NewGuid().ToString("N");
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
 
         protected virtual void AddLocalEvent(object eventData)
@@ -85,15 +86,17 @@ namespace Volo.Abp.Domain.Entities
 
         protected AggregateRoot()
         {
-            ExtraProperties = new Dictionary<string, object>();
             ConcurrencyStamp = Guid.NewGuid().ToString("N");
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
 
         protected AggregateRoot(TKey id)
             : base(id)
         {
-            ExtraProperties = new Dictionary<string, object>();
             ConcurrencyStamp = Guid.NewGuid().ToString("N");
+            ExtraProperties = new Dictionary<string, object>();
+            this.SetDefaultsForExtraProperties();
         }
 
         protected virtual void AddLocalEvent(object eventData)
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/en.json b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/en.json
index 6fa4e626ff..4444e1bfd6 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/en.json
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/en.json
@@ -18,6 +18,8 @@
     "Description:Abp.Mailing.Smtp.Password": "The password for the user name associated with the credentials.",
     "Description:Abp.Mailing.Smtp.Domain": "The domain or computer name that verifies the credentials.",
     "Description:Abp.Mailing.Smtp.EnableSsl": "Whether the SmtpClient uses Secure Sockets Layer (SSL) to encrypt the connection.",
-    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Whether the DefaultCredentials are sent with requests."
+    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Whether the DefaultCredentials are sent with requests.",
+    "TextTemplate:StandardEmailTemplates.Layout": "Default email layout template",
+    "TextTemplate:StandardEmailTemplates.Message": "Simple message template for emails"
   }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/tr.json b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/tr.json
new file mode 100644
index 0000000000..242920c8d9
--- /dev/null
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Localization/tr.json
@@ -0,0 +1,25 @@
+{
+  "culture": "tr",
+  "texts": {
+    "DisplayName:Abp.Mailing.DefaultFromAddress": "Varsayılan gönderici adresi",
+    "DisplayName:Abp.Mailing.DefaultFromDisplayName": "Varsayılan gönderici adı",
+    "DisplayName:Abp.Mailing.Smtp.Host": "Sunucu",
+    "DisplayName:Abp.Mailing.Smtp.Port": "Port",
+    "DisplayName:Abp.Mailing.Smtp.UserName": "Kullanıcı adı",
+    "DisplayName:Abp.Mailing.Smtp.Password": "Şifre",
+    "DisplayName:Abp.Mailing.Smtp.Domain": "Domain",
+    "DisplayName:Abp.Mailing.Smtp.EnableSsl": "SSL aktif",
+    "DisplayName:Abp.Mailing.Smtp.UseDefaultCredentials": "Varsayılan kimlik kullan",
+    "Description:Abp.Mailing.DefaultFromAddress": "Varsayılan gönderici adresi",
+    "Description:Abp.Mailing.DefaultFromDisplayName": "Varsayılan gönderici adı",
+    "Description:Abp.Mailing.Smtp.Host": "SMTP üzerinden e-posta göndermek için kullanılacak sunucunun IP adresi ya da adı.",
+    "Description:Abp.Mailing.Smtp.Port": "Sunucunun SMTP portu.",
+    "Description:Abp.Mailing.Smtp.UserName": "Varsayılan kimlik kullanılmaması durumunda kullanılacak kullanıcı adı.",
+    "Description:Abp.Mailing.Smtp.Password": "Varsayılan kimlik kullanılmaması durumunda kullanılacak şifre.",
+    "Description:Abp.Mailing.Smtp.Domain": "Kimlik bilgilerinin doğrulanacağı sunucu/domain.",
+    "Description:Abp.Mailing.Smtp.EnableSsl": "Email gönderiminde SSL kullanılıp kullanılmayacağı.",
+    "Description:Abp.Mailing.Smtp.UseDefaultCredentials": "Varsayılan kimlik bilgilerinin kullanılıp kullanılmayacağı.",
+    "TextTemplate:StandardEmailTemplates.Layout": "Varsayılan e-posta layout şablonu",
+    "TextTemplate:StandardEmailTemplates.Message": "Basit bir mesaj göndermek için e-posta şablonu"
+  }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Layout/en.tpl b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Layout.tpl
similarity index 100%
rename from framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Layout/en.tpl
rename to framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Layout.tpl
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Message/en.tpl b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Message.tpl
similarity index 100%
rename from framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Message/en.tpl
rename to framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Message.tpl
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/StandardEmailTemplateDefinitionProvider.cs
similarity index 56%
rename from framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs
rename to framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/StandardEmailTemplateDefinitionProvider.cs
index 385e0ef178..8c20d8dd78 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/StandardEmailTemplateDefinitionProvider.cs
@@ -1,25 +1,27 @@
-using Volo.Abp.TextTemplating;
+using Volo.Abp.Emailing.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.TextTemplating;
 
 namespace Volo.Abp.Emailing.Templates
 {
-    public class DefaultEmailTemplateProvider : TemplateDefinitionProvider
+    public class StandardEmailTemplateDefinitionProvider : TemplateDefinitionProvider
     {
         public override void Define(ITemplateDefinitionContext context)
         {
             context.Add(
                 new TemplateDefinition(
                     StandardEmailTemplates.Layout,
-                    defaultCultureName: "en",
+                    displayName: LocalizableString.Create<EmailingResource>("TextTemplate:StandardEmailTemplates.Layout"),
                     isLayout: true
-                ).WithVirtualFilePath("/Volo/Abp/Emailing/Templates/Layout")
+                ).WithVirtualFilePath("/Volo/Abp/Emailing/Templates/Layout.tpl", true)
             );
 
             context.Add(
                 new TemplateDefinition(
                     StandardEmailTemplates.Message,
-                    defaultCultureName: "en",
+                    displayName: LocalizableString.Create<EmailingResource>("TextTemplate:StandardEmailTemplates.Message"),
                     layout: StandardEmailTemplates.Layout
-                ).WithVirtualFilePath("/Volo/Abp/Emailing/Templates/Message")
+                ).WithVirtualFilePath("/Volo/Abp/Emailing/Templates/Message.tpl", true)
             );
         }
     }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index b1bb2df421..7f914fb1a0 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -204,7 +204,7 @@ namespace Volo.Abp.EntityFrameworkCore
                 var currentValue = e.Entry.CurrentValues[property.Name];
                 if (currentValue != null)
                 {
-                    entity.SetProperty(property.Name, currentValue);
+                    entity.ExtraProperties[property.Name] = currentValue;
                 }
             }
         }
@@ -265,7 +265,11 @@ namespace Volo.Abp.EntityFrameworkCore
                 return;
             }
 
-            foreach (var property in objectExtension.GetProperties())
+            var efMappedProperties = ObjectExtensionManager.Instance
+                .GetProperties(entityType)
+                .Where(p => p.IsMappedToFieldForEfCore());
+
+            foreach (var property in efMappedProperties)
             {
                 if (!entity.HasProperty(property.Name))
                 {
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs
index 4199e29ec0..211359d789 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Http.Modeling
 {
@@ -29,8 +30,8 @@ namespace Volo.Abp.Http.Modeling
             {
                 Name = parameterInfo.Name,
                 TypeAsString = parameterInfo.ParameterType.GetFullNameWithAssemblyName(),
-                Type = parameterInfo.ParameterType != null ? ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType) : null,
-                TypeSimple = parameterInfo.ParameterType != null ? ModelingTypeHelper.GetSimplifiedName(parameterInfo.ParameterType) : null,
+                Type = parameterInfo.ParameterType != null ? TypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType) : null,
+                TypeSimple = parameterInfo.ParameterType != null ? TypeHelper.GetSimplifiedName(parameterInfo.ParameterType) : null,
                 IsOptional = parameterInfo.IsOptional,
                 DefaultValue = parameterInfo.HasDefaultValue ? parameterInfo.DefaultValue : null
             };
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModelingTypeHelper.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModelingTypeHelper.cs
deleted file mode 100644
index 2d4b2bac85..0000000000
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModelingTypeHelper.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-
-namespace Volo.Abp.Http.Modeling
-{
-    public static class ModelingTypeHelper
-    {
-        public static string GetFullNameHandlingNullableAndGenerics([NotNull] Type type)
-        {
-            Check.NotNull(type, nameof(type));
-
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                return type.GenericTypeArguments[0].FullName + "?";
-            }
-
-            if (type.IsGenericType)
-            {
-                var genericType = type.GetGenericTypeDefinition();
-                return $"{genericType.FullName.Left(genericType.FullName.IndexOf('`'))}<{type.GenericTypeArguments.Select(GetFullNameHandlingNullableAndGenerics).JoinAsString(",")}>";
-            }
-
-            return type.FullName;
-        }
-
-        public static string GetSimplifiedName([NotNull] Type type)
-        {
-            Check.NotNull(type, nameof(type));
-
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                return GetSimplifiedName(type.GenericTypeArguments[0]) + "?";
-            }
-
-            if (type.IsGenericType)
-            {
-                var genericType = type.GetGenericTypeDefinition();
-                return $"{genericType.FullName.Left(genericType.FullName.IndexOf('`'))}<{type.GenericTypeArguments.Select(GetSimplifiedName).JoinAsString(",")}>";
-            }
-
-            if (type == typeof(string))
-            {
-                return "string";
-            }
-            else if (type == typeof(int))
-            {
-                return "number";
-            }
-            else if (type == typeof(long))
-            {
-                return "number";
-            }
-            else if (type == typeof(bool))
-            {
-                return "boolean";
-            }
-            else if (type == typeof(char))
-            {
-                return "string";
-            }
-            else if (type == typeof(double))
-            {
-                return "number";
-            }
-            else if (type == typeof(float))
-            {
-                return "number";
-            }
-            else if (type == typeof(decimal))
-            {
-                return "number";
-            }
-            else if (type == typeof(DateTime))
-            {
-                return "string";
-            }
-            else if (type == typeof(DateTimeOffset))
-            {
-                return "string";
-            }
-            else if (type == typeof(TimeSpan))
-            {
-                return "string";
-            }
-            else if (type == typeof(Guid))
-            {
-                return "string";
-            }
-            else if (type == typeof(byte))
-            {
-                return "number";
-            }
-            else if (type == typeof(sbyte))
-            {
-                return "number";
-            }
-            else if (type == typeof(short))
-            {
-                return "number";
-            }
-            else if (type == typeof(ushort))
-            {
-                return "number";
-            }
-            else if (type == typeof(uint))
-            {
-                return "number";
-            }
-            else if (type == typeof(ulong))
-            {
-                return "number";
-            }
-            else if (type == typeof(IntPtr))
-            {
-                return "number";
-            }
-            else if (type == typeof(UIntPtr))
-            {
-                return "number";
-            }
-
-            return type.FullName;
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ParameterApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ParameterApiDescriptionModel.cs
index 0be791053c..0450861a41 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ParameterApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ParameterApiDescriptionModel.cs
@@ -1,4 +1,5 @@
 using System;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Http.Modeling
 {
@@ -34,8 +35,8 @@ namespace Volo.Abp.Http.Modeling
             {
                 Name = name,
                 NameOnMethod = nameOnMethod,
-                Type = type != null ? ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(type) : null,
-                TypeSimple = type != null ? ModelingTypeHelper.GetSimplifiedName(type) : null,
+                Type = type != null ? TypeHelper.GetFullNameHandlingNullableAndGenerics(type) : null,
+                TypeSimple = type != null ? TypeHelper.GetSimplifiedName(type) : null,
                 IsOptional = isOptional,
                 DefaultValue = defaultValue,
                 ConstraintTypes = constraintTypes,
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs
index ca8af7f22a..820d9a46f9 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs
@@ -21,18 +21,18 @@ namespace Volo.Abp.Http.Modeling
 
             if (TypeHelper.IsEnumerable(propertyInfo.PropertyType, out var itemType, includePrimitives: false))
             {
-                typeName = $"[{ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(itemType)}]";
-                simpleTypeName = $"[{ModelingTypeHelper.GetSimplifiedName(itemType)}]";
+                typeName = $"[{TypeHelper.GetFullNameHandlingNullableAndGenerics(itemType)}]";
+                simpleTypeName = $"[{TypeHelper.GetSimplifiedName(itemType)}]";
             }
             else if (TypeHelper.IsDictionary(propertyInfo.PropertyType, out var keyType, out var valueType))
             {
-                typeName = $"{{{ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(keyType)}:{ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(valueType)}}}";
-                simpleTypeName = $"{{{ModelingTypeHelper.GetSimplifiedName(keyType)}:{ModelingTypeHelper.GetSimplifiedName(valueType)}}}";
+                typeName = $"{{{TypeHelper.GetFullNameHandlingNullableAndGenerics(keyType)}:{TypeHelper.GetFullNameHandlingNullableAndGenerics(valueType)}}}";
+                simpleTypeName = $"{{{TypeHelper.GetSimplifiedName(keyType)}:{TypeHelper.GetSimplifiedName(valueType)}}}";
             }
             else
             {
-                typeName = ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(propertyInfo.PropertyType);
-                simpleTypeName = ModelingTypeHelper.GetSimplifiedName(propertyInfo.PropertyType);
+                typeName = TypeHelper.GetFullNameHandlingNullableAndGenerics(propertyInfo.PropertyType);
+                simpleTypeName = TypeHelper.GetSimplifiedName(propertyInfo.PropertyType);
             }
             
             return new PropertyApiDescriptionModel
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ReturnValueApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ReturnValueApiDescriptionModel.cs
index d6532be6d4..2e0862ccce 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ReturnValueApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ReturnValueApiDescriptionModel.cs
@@ -1,4 +1,5 @@
 using System;
+using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
 
 namespace Volo.Abp.Http.Modeling
@@ -21,8 +22,8 @@ namespace Volo.Abp.Http.Modeling
 
             return new ReturnValueApiDescriptionModel
             {
-                Type = ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(unwrappedType),
-                TypeSimple = ModelingTypeHelper.GetSimplifiedName(unwrappedType)
+                Type = TypeHelper.GetFullNameHandlingNullableAndGenerics(unwrappedType),
+                TypeSimple = TypeHelper.GetSimplifiedName(unwrappedType)
             };
         }
     }
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
index fcc4b034ea..161584279b 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Http.Modeling
 {
@@ -32,7 +33,7 @@ namespace Volo.Abp.Http.Modeling
             var typeModel = new TypeApiDescriptionModel
             {
                 IsEnum = type.IsEnum,
-                BaseType = baseType != null ? ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(baseType) : null
+                BaseType = baseType != null ? TypeHelper.GetFullNameHandlingNullableAndGenerics(baseType) : null
             };
 
             if (typeModel.IsEnum)
diff --git a/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs b/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs
new file mode 100644
index 0000000000..0ba8d0daed
--- /dev/null
+++ b/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/AbpStringLocalizerFactoryExtensions.cs
@@ -0,0 +1,11 @@
+namespace Microsoft.Extensions.Localization
+{
+    public static class AbpStringLocalizerFactoryExtensions
+    {
+        public static IStringLocalizer CreateDefaultOrNull(this IStringLocalizerFactory localizerFactory)
+        {
+            return (localizerFactory as IAbpStringLocalizerFactoryWithDefaultResourceSupport)
+                ?.CreateDefaultOrNull();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/IAbpStringLocalizerFactoryWithDefaultResourceSupport.cs b/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/IAbpStringLocalizerFactoryWithDefaultResourceSupport.cs
new file mode 100644
index 0000000000..b749e454a3
--- /dev/null
+++ b/framework/src/Volo.Abp.Localization.Abstractions/Microsoft/Extensions/Localization/IAbpStringLocalizerFactoryWithDefaultResourceSupport.cs
@@ -0,0 +1,10 @@
+using JetBrains.Annotations;
+
+namespace Microsoft.Extensions.Localization
+{
+    public interface IAbpStringLocalizerFactoryWithDefaultResourceSupport
+    {
+        [CanBeNull]
+        IStringLocalizer CreateDefaultOrNull();
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/HasNameWithLocalizableDisplayNameExtensions.cs b/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/HasNameWithLocalizableDisplayNameExtensions.cs
new file mode 100644
index 0000000000..4d42b73537
--- /dev/null
+++ b/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/HasNameWithLocalizableDisplayNameExtensions.cs
@@ -0,0 +1,36 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Localization;
+
+namespace Volo.Abp.Localization
+{
+    public static class HasNameWithLocalizableDisplayNameExtensions
+    {
+        [NotNull]
+        public static string GetLocalizedDisplayName(
+            [NotNull] this IHasNameWithLocalizableDisplayName source,
+            [NotNull] IStringLocalizerFactory stringLocalizerFactory,
+            [CanBeNull] string localizationNamePrefix = "DisplayName:")
+        {
+            if (source.DisplayName != null)
+            {
+                return source.DisplayName.Localize(stringLocalizerFactory);
+            }
+
+            var defaultStringLocalizer = stringLocalizerFactory.CreateDefaultOrNull();
+            if (defaultStringLocalizer == null)
+            {
+                return source.Name;
+            }
+
+            var localizedString = defaultStringLocalizer[$"{localizationNamePrefix}{source.Name}"];
+            if (!localizedString.ResourceNotFound || 
+                localizationNamePrefix.IsNullOrEmpty())
+            {
+                return localizedString;
+            }
+
+            return defaultStringLocalizer[source.Name];
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/IHasNameWithLocalizableDisplayName.cs b/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/IHasNameWithLocalizableDisplayName.cs
new file mode 100644
index 0000000000..8be0d7d2de
--- /dev/null
+++ b/framework/src/Volo.Abp.Localization.Abstractions/Volo/Abp/Localization/IHasNameWithLocalizableDisplayName.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Localization
+{
+    public interface IHasNameWithLocalizableDisplayName
+    {
+        [NotNull]
+        public string Name { get; }
+
+        [CanBeNull]
+        public ILocalizableString DisplayName { get; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationOptions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationOptions.cs
index ea5232bb04..aba376d773 100644
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationOptions.cs
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationOptions.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Volo.Abp.Collections;
 
 namespace Volo.Abp.Localization
@@ -7,6 +8,11 @@ namespace Volo.Abp.Localization
     {
         public LocalizationResourceDictionary Resources { get; }
 
+        /// <summary>
+        /// Used as the default resource when resource was not specified on a localization operation.
+        /// </summary>
+        public Type DefaultResourceType { get; set; }
+
         public ITypeList<ILocalizationResourceContributor> GlobalContributors { get; }
 
         public List<LanguageInfo> Languages { get; }
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs
index 103567248f..cd347d8437 100644
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs
@@ -9,13 +9,12 @@ using Microsoft.Extensions.Options;
 
 namespace Volo.Abp.Localization
 {
-    public class AbpStringLocalizerFactory : IStringLocalizerFactory
+    public class AbpStringLocalizerFactory : IStringLocalizerFactory, IAbpStringLocalizerFactoryWithDefaultResourceSupport
     {
-        private readonly ResourceManagerStringLocalizerFactory _innerFactory;
-        private readonly AbpLocalizationOptions _abpLocalizationOptions;
-        private readonly IServiceProvider _serviceProvider;
-
-        private readonly ConcurrentDictionary<Type, StringLocalizerCacheItem> _localizerCache;
+        protected internal AbpLocalizationOptions AbpLocalizationOptions { get; }
+        protected ResourceManagerStringLocalizerFactory InnerFactory { get; }
+        protected IServiceProvider ServiceProvider { get; }
+        protected ConcurrentDictionary<Type, StringLocalizerCacheItem> LocalizerCache { get; }
 
         //TODO: It's better to use decorator pattern for IStringLocalizerFactory instead of getting ResourceManagerStringLocalizerFactory as a dependency.
         public AbpStringLocalizerFactory(
@@ -23,29 +22,29 @@ namespace Volo.Abp.Localization
             IOptions<AbpLocalizationOptions> abpLocalizationOptions,
             IServiceProvider serviceProvider)
         {
-            _innerFactory = innerFactory;
-            _serviceProvider = serviceProvider;
-            _abpLocalizationOptions = abpLocalizationOptions.Value;
+            InnerFactory = innerFactory;
+            ServiceProvider = serviceProvider;
+            AbpLocalizationOptions = abpLocalizationOptions.Value;
 
-            _localizerCache = new ConcurrentDictionary<Type, StringLocalizerCacheItem>();
+            LocalizerCache = new ConcurrentDictionary<Type, StringLocalizerCacheItem>();
         }
 
         public virtual IStringLocalizer Create(Type resourceType)
         {
-            var resource = _abpLocalizationOptions.Resources.GetOrDefault(resourceType);
+            var resource = AbpLocalizationOptions.Resources.GetOrDefault(resourceType);
             if (resource == null)
             {
-                return _innerFactory.Create(resourceType);
+                return InnerFactory.Create(resourceType);
             }
 
-            if (_localizerCache.TryGetValue(resourceType, out var cacheItem))
+            if (LocalizerCache.TryGetValue(resourceType, out var cacheItem))
             {
                 return cacheItem.Localizer;
             }
 
-            lock (_localizerCache)
+            lock (LocalizerCache)
             {
-                return _localizerCache.GetOrAdd(
+                return LocalizerCache.GetOrAdd(
                     resourceType,
                     _ => CreateStringLocalizerCacheItem(resource)
                 ).Localizer;
@@ -54,12 +53,12 @@ namespace Volo.Abp.Localization
 
         private StringLocalizerCacheItem CreateStringLocalizerCacheItem(LocalizationResource resource)
         {
-            foreach (var globalContributor in _abpLocalizationOptions.GlobalContributors)
+            foreach (var globalContributor in AbpLocalizationOptions.GlobalContributors)
             {
                 resource.Contributors.Add((ILocalizationResourceContributor) Activator.CreateInstance(globalContributor));
             }
 
-            using (var scope = _serviceProvider.CreateScope())
+            using (var scope = ServiceProvider.CreateScope())
             {
                 var context = new LocalizationResourceInitializationContext(resource, scope.ServiceProvider);
 
@@ -81,7 +80,7 @@ namespace Volo.Abp.Localization
         {
             //TODO: Investigate when this is called?
 
-            return _innerFactory.Create(baseName, location);
+            return InnerFactory.Create(baseName, location);
         }
 
         internal static void Replace(IServiceCollection services)
@@ -90,7 +89,7 @@ namespace Volo.Abp.Localization
             services.AddSingleton<ResourceManagerStringLocalizerFactory>();
         }
 
-        private class StringLocalizerCacheItem
+        protected class StringLocalizerCacheItem
         {
             public AbpDictionaryBasedStringLocalizer Localizer { get; }
 
@@ -99,5 +98,15 @@ namespace Volo.Abp.Localization
                 Localizer = localizer;
             }
         }
+
+        public IStringLocalizer CreateDefaultOrNull()
+        {
+            if (AbpLocalizationOptions.DefaultResourceType == null)
+            {
+                return null;
+            }
+
+            return Create(AbpLocalizationOptions.DefaultResourceType);
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizableString.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizableString.cs
index 6698ba4645..40edff18e7 100644
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizableString.cs
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizableString.cs
@@ -1,18 +1,21 @@
 using System;
+using JetBrains.Annotations;
 using Microsoft.Extensions.Localization;
 
 namespace Volo.Abp.Localization
 {
     public class LocalizableString : ILocalizableString
     {
+        [CanBeNull]
         public Type ResourceType { get; }
 
+        [NotNull]
         public string Name { get; }
 
-        public LocalizableString(Type resourceType, string name)
+        public LocalizableString(Type resourceType, [NotNull] string name)
         {
+            Name = Check.NotNullOrEmpty(name, nameof(name));
             ResourceType = resourceType;
-            Name = name;
         }
 
         public LocalizedString Localize(IStringLocalizerFactory stringLocalizerFactory)
@@ -20,7 +23,7 @@ namespace Volo.Abp.Localization
             return stringLocalizerFactory.Create(ResourceType)[Name];
         }
 
-        public static LocalizableString Create<TResource>(string name)
+        public static LocalizableString Create<TResource>([NotNull] string name)
         {
             return new LocalizableString(typeof(TResource), name);
         }
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj b/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
index 43da943f8b..4b8542101a 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\configureawait.props" />
   <Import Project="..\..\..\common.props" />
@@ -15,7 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Validation.Abstractions\Volo.Abp.Validation.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/HasExtraPropertiesExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/HasExtraPropertiesExtensions.cs
index 2b75e5fc8f..ca9cc0a4c1 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/HasExtraPropertiesExtensions.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/HasExtraPropertiesExtensions.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Volo.Abp.DynamicProxy;
+using Volo.Abp.ObjectExtending;
 using Volo.Abp.Reflection;
 
 namespace Volo.Abp.Data
@@ -36,10 +38,20 @@ namespace Volo.Abp.Data
             throw new AbpException("GetProperty<TProperty> does not support non-primitive types. Use non-generic GetProperty method and handle type casting manually.");
         }
 
-        public static TSource SetProperty<TSource>(this TSource source, string name, object value)
+        public static TSource SetProperty<TSource>(
+            this TSource source, 
+            string name, 
+            object value,
+            bool validate = true)
             where TSource : IHasExtraProperties
         {
+            if (validate)
+            {
+                ExtensibleObjectValidator.CheckValue(source, name, value);
+            }
+
             source.ExtraProperties[name] = value;
+
             return source;
         }
 
@@ -49,5 +61,34 @@ namespace Volo.Abp.Data
             source.ExtraProperties.Remove(name);
             return source;
         }
+
+        public static TSource SetDefaultsForExtraProperties<TSource>(this TSource source, Type objectType = null)
+            where TSource : IHasExtraProperties
+        {
+            var properties = ObjectExtensionManager.Instance
+                .GetProperties(objectType ?? typeof(TSource));
+
+            foreach (var property in properties)
+            {
+                if (source.HasProperty(property.Name))
+                {
+                    continue;
+                }
+
+                source.ExtraProperties[property.Name] = TypeHelper.GetDefaultValue(property.Type);
+            }
+
+            return source;
+        }
+
+        public static void SetDefaultsForExtraProperties(object source, Type objectType)
+        {
+            if (!(source is IHasExtraProperties))
+            {
+                throw new ArgumentException($"Given {nameof(source)} object does not implement the {nameof(IHasExtraProperties)} interface!", nameof(source));
+            }
+
+            ((IHasExtraProperties) source).SetDefaultsForExtraProperties(objectType);
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
index 9392429fd3..310e1feb23 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/AbpObjectExtendingModule.cs
@@ -1,7 +1,13 @@
 using Volo.Abp.Modularity;
+using Volo.Abp.Validation;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.ObjectExtending
 {
+    [DependsOn(
+        typeof(AbpLocalizationAbstractionsModule),
+        typeof(AbpValidationAbstractionsModule)
+        )]
     public class AbpObjectExtendingModule : AbpModule
     {
 
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObject.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObject.cs
index c9c601fce9..d83efac53f 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObject.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObject.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Volo.Abp.DynamicProxy;
 
 namespace Volo.Abp.ObjectExtending
 {
@@ -11,8 +12,19 @@ namespace Volo.Abp.ObjectExtending
         public Dictionary<string, object> ExtraProperties { get; protected set; }
 
         public ExtensibleObject()
+            : this(true)
+        {
+
+        }
+
+        public ExtensibleObject(bool setDefaultsForExtraProperties)
         {
             ExtraProperties = new Dictionary<string, object>();
+
+            if (setDefaultsForExtraProperties)
+            {
+                this.SetDefaultsForExtraProperties(ProxyHelper.UnProxy(this).GetType());
+            }
         }
 
         public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectValidator.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectValidator.cs
index 07d6556d10..d3fabc8c8e 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectValidator.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ExtensibleObjectValidator.cs
@@ -4,12 +4,29 @@ using System.Linq;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 using Volo.Abp.DynamicProxy;
+using Volo.Abp.Validation;
 
 namespace Volo.Abp.ObjectExtending
 {
     public static class ExtensibleObjectValidator
     {
-        [NotNull]
+        public static void CheckValue(
+            [NotNull] IHasExtraProperties extensibleObject,
+            [NotNull] string propertyName,
+            [CanBeNull] object value)
+        {
+            var validationErrors = GetValidationErrors(
+                extensibleObject,
+                propertyName,
+                value
+            );
+
+            if (validationErrors.Any())
+            {
+                throw new AbpValidationException(validationErrors);
+            }
+        }
+
         public static bool IsValid(
             [NotNull] IHasExtraProperties extensibleObject,
             [CanBeNull] ValidationContext objectValidationContext = null)
@@ -20,13 +37,27 @@ namespace Volo.Abp.ObjectExtending
             ).Any();
         }
 
+        public static bool IsValid(
+            [NotNull] IHasExtraProperties extensibleObject,
+            [NotNull] string propertyName,
+            [CanBeNull] object value,
+            [CanBeNull] ValidationContext objectValidationContext = null)
+        {
+            return GetValidationErrors(
+                extensibleObject,
+                propertyName,
+                value,
+                objectValidationContext
+            ).Any();
+        }
+
         [NotNull]
         public static List<ValidationResult> GetValidationErrors(
             [NotNull] IHasExtraProperties extensibleObject,
             [CanBeNull] ValidationContext objectValidationContext = null)
         {
             var validationErrors = new List<ValidationResult>();
-            
+
             AddValidationErrors(
                 extensibleObject,
                 validationErrors,
@@ -36,6 +67,26 @@ namespace Volo.Abp.ObjectExtending
             return validationErrors;
         }
 
+        [NotNull]
+        public static List<ValidationResult> GetValidationErrors(
+            [NotNull] IHasExtraProperties extensibleObject,
+            [NotNull] string propertyName,
+            [CanBeNull] object value,
+            [CanBeNull] ValidationContext objectValidationContext = null)
+        {
+            var validationErrors = new List<ValidationResult>();
+
+            AddValidationErrors(
+                extensibleObject,
+                validationErrors,
+                propertyName,
+                value,
+                objectValidationContext
+            );
+
+            return validationErrors;
+        }
+
         public static void AddValidationErrors(
             [NotNull] IHasExtraProperties extensibleObject,
             [NotNull] List<ValidationResult> validationErrors,
@@ -78,10 +129,55 @@ namespace Volo.Abp.ObjectExtending
             );
         }
 
+        public static void AddValidationErrors(
+            [NotNull] IHasExtraProperties extensibleObject,
+            [NotNull] List<ValidationResult> validationErrors,
+            [NotNull] string propertyName,
+            [CanBeNull] object value,
+            [CanBeNull] ValidationContext objectValidationContext = null)
+        {
+            Check.NotNull(extensibleObject, nameof(extensibleObject));
+            Check.NotNull(validationErrors, nameof(validationErrors));
+            Check.NotNullOrWhiteSpace(propertyName, nameof(propertyName));
+
+            if (objectValidationContext == null)
+            {
+                objectValidationContext = new ValidationContext(
+                    extensibleObject,
+                    null,
+                    new Dictionary<object, object>()
+                );
+            }
+
+            var objectType = ProxyHelper.UnProxy(extensibleObject).GetType();
+
+            var objectExtensionInfo = ObjectExtensionManager.Instance
+                .GetOrNull(objectType);
+
+            if (objectExtensionInfo == null)
+            {
+                return;
+            }
+
+            var property = objectExtensionInfo.GetPropertyOrNull(propertyName);
+            if (property == null)
+            {
+                return;
+            }
+
+            AddPropertyValidationErrors(
+                extensibleObject,
+                validationErrors,
+                objectValidationContext,
+                property,
+                value
+            );
+        }
+
         private static void AddPropertyValidationErrors(
-            IHasExtraProperties extensibleObject, 
+            IHasExtraProperties extensibleObject,
             List<ValidationResult> validationErrors,
-            ValidationContext objectValidationContext, 
+            ValidationContext objectValidationContext,
             ObjectExtensionInfo objectExtensionInfo)
         {
             var properties = objectExtensionInfo.GetProperties();
@@ -92,38 +188,50 @@ namespace Volo.Abp.ObjectExtending
 
             foreach (var property in properties)
             {
-                AddPropertyValidationErrors(extensibleObject, validationErrors, objectValidationContext, property);
+                AddPropertyValidationErrors(
+                    extensibleObject,
+                    validationErrors,
+                    objectValidationContext,
+                    property,
+                    extensibleObject.GetProperty(property.Name)
+                );
             }
         }
 
         private static void AddPropertyValidationErrors(
-            IHasExtraProperties extensibleObject, 
+            IHasExtraProperties extensibleObject,
             List<ValidationResult> validationErrors,
-            ValidationContext objectValidationContext, 
-            ObjectExtensionPropertyInfo property)
+            ValidationContext objectValidationContext,
+            ObjectExtensionPropertyInfo property,
+            object value)
         {
             AddPropertyValidationAttributeErrors(
                 extensibleObject,
                 validationErrors,
                 objectValidationContext,
-                property
+                property,
+                value
             );
 
             ExecuteCustomPropertyValidationActions(
                 extensibleObject,
                 validationErrors,
                 objectValidationContext,
-                property
+                property,
+                value
             );
         }
 
         private static void AddPropertyValidationAttributeErrors(
-            IHasExtraProperties extensibleObject, 
+            IHasExtraProperties extensibleObject,
             List<ValidationResult> validationErrors,
-            ValidationContext objectValidationContext, 
-            ObjectExtensionPropertyInfo property)
+            ValidationContext objectValidationContext,
+            ObjectExtensionPropertyInfo property,
+            object value)
         {
-            if (!property.ValidationAttributes.Any())
+            var validationAttributes = property.GetValidationAttributes();
+
+            if (!validationAttributes.Any())
             {
                 return;
             }
@@ -134,10 +242,10 @@ namespace Volo.Abp.ObjectExtending
                 MemberName = property.Name
             };
 
-            foreach (var attribute in property.ValidationAttributes)
+            foreach (var attribute in validationAttributes)
             {
                 var result = attribute.GetValidationResult(
-                    extensibleObject.GetProperty(property.Name),
+                    value,
                     propertyValidationContext
                 );
 
@@ -152,7 +260,8 @@ namespace Volo.Abp.ObjectExtending
             IHasExtraProperties extensibleObject,
             List<ValidationResult> validationErrors,
             ValidationContext objectValidationContext,
-            ObjectExtensionPropertyInfo property)
+            ObjectExtensionPropertyInfo property,
+            object value)
         {
             if (!property.Validators.Any())
             {
@@ -164,7 +273,7 @@ namespace Volo.Abp.ObjectExtending
                 extensibleObject,
                 validationErrors,
                 objectValidationContext,
-                extensibleObject.GetProperty(property.Name)
+                value
             );
 
             foreach (var validator in property.Validators)
@@ -174,9 +283,9 @@ namespace Volo.Abp.ObjectExtending
         }
 
         private static void ExecuteCustomObjectValidationActions(
-            IHasExtraProperties extensibleObject, 
+            IHasExtraProperties extensibleObject,
             List<ValidationResult> validationErrors,
-            ValidationContext objectValidationContext, 
+            ValidationContext objectValidationContext,
             ObjectExtensionInfo objectExtensionInfo)
         {
             if (!objectExtensionInfo.Validators.Any())
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
new file mode 100644
index 0000000000..ce84cb19e5
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class EntityExtensionConfiguration
+    {
+        [NotNull]
+        protected ExtensionPropertyConfigurationDictionary Properties { get; }
+
+        [NotNull]
+        public List<Action<ObjectExtensionValidationContext>> Validators { get; }
+
+        public Dictionary<string, object> Configuration { get; }
+
+        public EntityExtensionConfiguration()
+        {
+            Properties = new ExtensionPropertyConfigurationDictionary();
+            Validators = new List<Action<ObjectExtensionValidationContext>>();
+            Configuration = new Dictionary<string, object>();
+        }
+
+        [NotNull]
+        public virtual EntityExtensionConfiguration AddOrUpdateProperty<TProperty>(
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ExtensionPropertyConfiguration> configureAction = null)
+        {
+            return AddOrUpdateProperty(
+                typeof(TProperty),
+                propertyName,
+                configureAction
+            );
+        }
+
+        [NotNull]
+        public virtual EntityExtensionConfiguration AddOrUpdateProperty(
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<ExtensionPropertyConfiguration> configureAction = null)
+        {
+            Check.NotNull(propertyType, nameof(propertyType));
+            Check.NotNull(propertyName, nameof(propertyName));
+
+            var propertyInfo = Properties.GetOrAdd(
+                propertyName,
+                () => new ExtensionPropertyConfiguration(this, propertyType, propertyName)
+            );
+
+            configureAction?.Invoke(propertyInfo);
+
+            return this;
+        }
+
+        [NotNull]
+        public virtual ImmutableList<ExtensionPropertyConfiguration> GetProperties()
+        {
+            return Properties.Values.ToImmutableList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfigurationDictionary.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfigurationDictionary.cs
new file mode 100644
index 0000000000..4cc43c2932
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfigurationDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class EntityExtensionConfigurationDictionary : Dictionary<string, EntityExtensionConfiguration>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiConfiguration.cs
new file mode 100644
index 0000000000..507c8636b4
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiConfiguration.cs
@@ -0,0 +1,23 @@
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyApiConfiguration
+    {
+        [NotNull]
+        public ExtensionPropertyApiGetConfiguration OnGet { get; }
+
+        [NotNull]
+        public ExtensionPropertyApiCreateConfiguration OnCreate { get; }
+
+        [NotNull]
+        public ExtensionPropertyApiUpdateConfiguration OnUpdate { get; }
+
+        public ExtensionPropertyApiConfiguration()
+        {
+            OnGet = new ExtensionPropertyApiGetConfiguration();
+            OnCreate = new ExtensionPropertyApiCreateConfiguration();
+            OnUpdate = new ExtensionPropertyApiUpdateConfiguration();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiCreateConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiCreateConfiguration.cs
new file mode 100644
index 0000000000..235390b9be
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiCreateConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyApiCreateConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiGetConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiGetConfiguration.cs
new file mode 100644
index 0000000000..caf7957a02
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiGetConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyApiGetConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiUpdateConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiUpdateConfiguration.cs
new file mode 100644
index 0000000000..897a261a83
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyApiUpdateConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyApiUpdateConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfiguration.cs
new file mode 100644
index 0000000000..0ff3941f4e
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfiguration.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyConfiguration : IHasNameWithLocalizableDisplayName
+    {
+        [NotNull]
+        public EntityExtensionConfiguration EntityExtensionConfiguration { get; }
+
+        [NotNull]
+        public string Name { get; }
+
+        [NotNull]
+        public Type Type { get; }
+
+        [NotNull]
+        public List<Attribute> Attributes { get; }
+
+        [NotNull]
+        public List<Action<ObjectExtensionPropertyValidationContext>> Validators { get; }
+
+        [CanBeNull]
+        public ILocalizableString DisplayName { get; set; }
+
+        [NotNull]
+        public Dictionary<string, object> Configuration { get; }
+        
+        /// <summary>
+        /// Single point to enable/disable this property for the clients (UI and API).
+        /// If this is false, the configuration made in the <see cref="UI"/> and the <see cref="Api"/>
+        /// properties are not used.
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailableToClients { get; set; } = true;
+
+        [NotNull]
+        public ExtensionPropertyEntityConfiguration Entity { get; }
+
+        [NotNull]
+        public ExtensionPropertyUiConfiguration UI { get; }
+        
+        [NotNull]
+        public ExtensionPropertyApiConfiguration Api { get; }
+
+        public ExtensionPropertyConfiguration(
+            [NotNull] EntityExtensionConfiguration entityExtensionConfiguration,
+            [NotNull] Type type,
+            [NotNull] string name)
+        {
+            EntityExtensionConfiguration = Check.NotNull(entityExtensionConfiguration, nameof(entityExtensionConfiguration));
+            Type = Check.NotNull(type, nameof(type));
+            Name = Check.NotNull(name, nameof(name));
+
+            Configuration = new Dictionary<string, object>();
+            Attributes = new List<Attribute>();
+            Validators = new List<Action<ObjectExtensionPropertyValidationContext>>();
+
+            Entity = new ExtensionPropertyEntityConfiguration();
+            UI = new ExtensionPropertyUiConfiguration();
+            Api = new ExtensionPropertyApiConfiguration();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfigurationDictionary.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfigurationDictionary.cs
new file mode 100644
index 0000000000..b21e659a38
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyConfigurationDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyConfigurationDictionary : Dictionary<string, ExtensionPropertyConfiguration>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyEntityConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyEntityConfiguration.cs
new file mode 100644
index 0000000000..3380d11658
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyEntityConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyEntityConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsAvailable { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiConfiguration.cs
new file mode 100644
index 0000000000..aa581228bd
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiConfiguration.cs
@@ -0,0 +1,23 @@
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyUiConfiguration
+    {
+        [NotNull]
+        public ExtensionPropertyUiTableConfiguration OnTable { get; }
+
+        [NotNull]
+        public ExtensionPropertyUiFormConfiguration OnCreateForm { get; }
+
+        [NotNull]
+        public ExtensionPropertyUiFormConfiguration OnEditForm { get; }
+
+        public ExtensionPropertyUiConfiguration()
+        {
+            OnTable = new ExtensionPropertyUiTableConfiguration();
+            OnCreateForm = new ExtensionPropertyUiFormConfiguration();
+            OnEditForm = new ExtensionPropertyUiFormConfiguration();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs
new file mode 100644
index 0000000000..77434d4c03
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiFormConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyUiFormConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsVisible { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiTableConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiTableConfiguration.cs
new file mode 100644
index 0000000000..4c95e1a02f
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ExtensionPropertyUiTableConfiguration.cs
@@ -0,0 +1,10 @@
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ExtensionPropertyUiTableConfiguration
+    {
+        /// <summary>
+        /// Default: true.
+        /// </summary>
+        public bool IsVisible { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfiguration.cs
new file mode 100644
index 0000000000..cc09d1bad9
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfiguration.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ModuleExtensionConfiguration
+    {
+        [NotNull]
+        public EntityExtensionConfigurationDictionary Entities { get; }
+
+        [NotNull]
+        public Dictionary<string, object> Configuration { get; }
+
+        public ModuleExtensionConfiguration()
+        {
+            Entities = new EntityExtensionConfigurationDictionary();
+            Configuration = new Dictionary<string, object>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionary.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionary.cs
new file mode 100644
index 0000000000..a5713ed62d
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public class ModuleExtensionConfigurationDictionary : Dictionary<string, ModuleExtensionConfiguration>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionaryExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionaryExtensions.cs
new file mode 100644
index 0000000000..5eab8e38b9
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationDictionaryExtensions.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public static class ModuleExtensionConfigurationDictionaryExtensions
+    {
+        public static ModuleExtensionConfigurationDictionary ConfigureModule<T>(
+            [NotNull] this ModuleExtensionConfigurationDictionary configurationDictionary,
+            [NotNull] string moduleName,
+            [NotNull] Action<T> configureAction)
+            where T : ModuleExtensionConfiguration, new()
+        {
+            Check.NotNull(moduleName, nameof(moduleName));
+            Check.NotNull(configureAction, nameof(configureAction));
+
+            configureAction(
+                (T)configurationDictionary.GetOrAdd(
+                    moduleName,
+                    () => new T()
+                )
+            );
+
+            return configurationDictionary;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationExtensions.cs
new file mode 100644
index 0000000000..9dbe3a743f
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public static class ModuleExtensionConfigurationExtensions
+    {
+        public static T ConfigureEntity<T>(
+            this T objectConfiguration,
+            string objectName,
+            Action<EntityExtensionConfiguration> configureAction)
+            where T : ModuleExtensionConfiguration
+        {
+            var configuration = objectConfiguration.Entities.GetOrAdd(
+                objectName,
+                () => new EntityExtensionConfiguration()
+            );
+
+            configureAction(configuration);
+
+            return objectConfiguration;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs
new file mode 100644
index 0000000000..1f1edd757e
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.ObjectExtending.Modularity
+{
+    public static class ModuleExtensionConfigurationHelper
+    {
+        public static void ApplyEntityConfigurationToEntity(
+            string moduleName,
+            string entityName,
+            Type entityType)
+        {
+            foreach (var propertyConfig in GetPropertyConfigurations(moduleName, entityName))
+            {
+                if (propertyConfig.Entity.IsAvailable &&
+                    entityType != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, new[] { entityType });
+                }
+            }
+        }
+
+        public static void ApplyEntityConfigurationToApi(
+            string moduleName,
+            string objectName,
+            Type[] getApiTypes = null,
+            Type[] createApiTypes = null,
+            Type[] updateApiTypes = null)
+        {
+            foreach (var propertyConfig in GetPropertyConfigurations(moduleName, objectName))
+            {
+                if (!propertyConfig.IsAvailableToClients)
+                {
+                    continue;
+                }
+
+                if (propertyConfig.Api.OnGet.IsAvailable &&
+                    getApiTypes != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, getApiTypes);
+                }
+
+                if (propertyConfig.Api.OnCreate.IsAvailable &&
+                    createApiTypes != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, createApiTypes);
+                }
+
+                if (propertyConfig.Api.OnUpdate.IsAvailable &&
+                    updateApiTypes != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, updateApiTypes);
+                }
+            }
+        }
+
+        public static void ApplyEntityConfigurationToUi(
+            string moduleName,
+            string entityName,
+            Type[] createFormTypes = null,
+            Type[] editFormTypes = null)
+        {
+            foreach (var propertyConfig in GetPropertyConfigurations(moduleName, entityName))
+            {
+                if (!propertyConfig.IsAvailableToClients)
+                {
+                    continue;
+                }
+
+                if (propertyConfig.UI.OnCreateForm.IsVisible &&
+                    createFormTypes != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, createFormTypes);
+                }
+
+                if (propertyConfig.UI.OnEditForm.IsVisible &&
+                    editFormTypes != null)
+                {
+                    ApplyPropertyConfigurationToTypes(propertyConfig, editFormTypes);
+                }
+            }
+        }
+
+        public static void ApplyEntityConfigurations(
+            string moduleName,
+            string entityName,
+            Type entityType = null,
+            Type[] createFormTypes = null,
+            Type[] editFormTypes = null,
+            Type[] getApiTypes = null,
+            Type[] createApiTypes = null,
+            Type[] updateApiTypes = null)
+        {
+            if (entityType != null)
+            {
+                ApplyEntityConfigurationToEntity(
+                    moduleName,
+                    entityName,
+                    entityType
+                );
+            }
+
+            ApplyEntityConfigurationToApi(
+                moduleName,
+                entityName,
+                getApiTypes: getApiTypes,
+                createApiTypes: createApiTypes,
+                updateApiTypes: updateApiTypes
+            );
+
+            ApplyEntityConfigurationToUi(
+                moduleName,
+                entityName,
+                createFormTypes: createFormTypes,
+                editFormTypes: editFormTypes
+            );
+        }
+
+        [NotNull]
+        public static IEnumerable<ExtensionPropertyConfiguration> GetPropertyConfigurations(
+            string moduleName,
+            string entityName)
+        {
+            var moduleConfig = ObjectExtensionManager.Instance.Modules().GetOrDefault(moduleName);
+            if (moduleConfig == null)
+            {
+                return Array.Empty<ExtensionPropertyConfiguration>();
+            }
+
+            var objectConfig = moduleConfig.Entities.GetOrDefault(entityName);
+            if (objectConfig == null)
+            {
+                return Array.Empty<ExtensionPropertyConfiguration>();
+            }
+
+            return objectConfig.GetProperties();
+        }
+
+        public static void ApplyPropertyConfigurationToTypes(
+            ExtensionPropertyConfiguration propertyConfig,
+            Type[] types)
+        {
+            ObjectExtensionManager.Instance
+                .AddOrUpdateProperty(
+                    types,
+                    propertyConfig.Type,
+                    propertyConfig.Name,
+                    property =>
+                    {
+                        property.Attributes.AddRange(propertyConfig.Attributes);
+                        property.DisplayName = propertyConfig.DisplayName;
+                        property.Validators.AddRange(propertyConfig.Validators);
+                    }
+                );
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ModuleObjectExtensionManagerExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ModuleObjectExtensionManagerExtensions.cs
new file mode 100644
index 0000000000..eeb7095068
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ModuleObjectExtensionManagerExtensions.cs
@@ -0,0 +1,21 @@
+using JetBrains.Annotations;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class ModuleObjectExtensionManagerExtensions
+    {
+        private const string ObjectExtensionManagerConfigurationKey = "_Modules";
+
+        public static ModuleExtensionConfigurationDictionary Modules(
+            [NotNull]this ObjectExtensionManager objectExtensionManager)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+
+            return objectExtensionManager.Configuration.GetOrAdd(
+                ObjectExtensionManagerConfigurationKey,
+                _ => new ModuleExtensionConfigurationDictionary()
+            ) as ModuleExtensionConfigurationDictionary;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManager.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManager.cs
index 9f97b45261..2b0ce8977d 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManager.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using JetBrains.Annotations;
@@ -10,11 +11,15 @@ namespace Volo.Abp.ObjectExtending
     {
         public static ObjectExtensionManager Instance { get; set; } = new ObjectExtensionManager();
 
-        protected Dictionary<Type, ObjectExtensionInfo> ObjectsExtensions { get; }
+        [NotNull]
+        public ConcurrentDictionary<object, object> Configuration { get; }
 
+        protected Dictionary<Type, ObjectExtensionInfo> ObjectsExtensions { get; }
+        
         protected internal ObjectExtensionManager()
         {
             ObjectsExtensions = new Dictionary<Type, ObjectExtensionInfo>();
+            Configuration = new ConcurrentDictionary<object, object>();
         }
 
         [NotNull]
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManagerExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManagerExtensions.cs
index 21d139913b..7870d18f37 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManagerExtensions.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionManagerExtensions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using JetBrains.Annotations;
 using Volo.Abp.Data;
 
@@ -79,5 +81,54 @@ namespace Volo.Abp.ObjectExtending
                     );
                 });
         }
+
+        public static ObjectExtensionPropertyInfo GetPropertyOrNull<TObject>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] string propertyName)
+        {
+            return objectExtensionManager.GetPropertyOrNull(
+                typeof(TObject),
+                propertyName
+            );
+        }
+
+        public static ObjectExtensionPropertyInfo GetPropertyOrNull(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type objectType,
+            [NotNull] string propertyName)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+            Check.NotNull(objectType, nameof(objectType));
+            Check.NotNull(propertyName, nameof(propertyName));
+
+            return objectExtensionManager
+                .GetOrNull(objectType)?
+                .GetPropertyOrNull(propertyName);
+        }
+
+        private static readonly ImmutableList<ObjectExtensionPropertyInfo> EmptyPropertyList 
+            = new List<ObjectExtensionPropertyInfo>().ToImmutableList();
+
+        public static ImmutableList<ObjectExtensionPropertyInfo> GetProperties<TObject>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager)
+        {
+            return objectExtensionManager.GetProperties(typeof(TObject));
+        }
+
+        public static ImmutableList<ObjectExtensionPropertyInfo> GetProperties(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type objectType)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+            Check.NotNull(objectType, nameof(objectType));
+
+            var extensionInfo = objectExtensionManager.GetOrNull(objectType);
+            if (extensionInfo == null)
+            {
+                return EmptyPropertyList;
+            }
+
+            return extensionInfo.GetProperties();
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
index e6dbbfd6ce..5d55325477 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.ObjectExtending
 {
-    public class ObjectExtensionPropertyInfo
+    public class ObjectExtensionPropertyInfo : IHasNameWithLocalizableDisplayName
     {
         [NotNull]
         public ObjectExtensionInfo ObjectExtension { get; }
@@ -17,11 +19,18 @@ namespace Volo.Abp.ObjectExtending
         public Type Type { get; }
 
         [NotNull]
+        [Obsolete("Add validation attributes to the Attributes list instead! ValidationAttributes property will be removed in future versions.")]
         public List<ValidationAttribute> ValidationAttributes { get; }
 
+        [NotNull]
+        public List<Attribute> Attributes { get; }
+
         [NotNull]
         public List<Action<ObjectExtensionPropertyValidationContext>> Validators { get; }
 
+        [CanBeNull]
+        public ILocalizableString DisplayName { get; set; }
+
         /// <summary>
         /// Indicates whether to check the other side of the object mapping
         /// if it explicitly defines the property. This property is used in;
@@ -40,8 +49,8 @@ namespace Volo.Abp.ObjectExtending
         public Dictionary<object, object> Configuration { get; }
 
         public ObjectExtensionPropertyInfo(
-            [NotNull] ObjectExtensionInfo objectExtension, 
-            [NotNull] Type type, 
+            [NotNull] ObjectExtensionInfo objectExtension,
+            [NotNull] Type type,
             [NotNull] string name)
         {
             ObjectExtension = Check.NotNull(objectExtension, nameof(objectExtension));
@@ -50,6 +59,7 @@ namespace Volo.Abp.ObjectExtending
 
             Configuration = new Dictionary<object, object>();
             ValidationAttributes = new List<ValidationAttribute>();
+            Attributes = new List<Attribute>();
             Validators = new List<Action<ObjectExtensionPropertyValidationContext>>();
         }
     }
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoExtensions.cs
new file mode 100644
index 0000000000..4eac846314
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoExtensions.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class ObjectExtensionPropertyInfoExtensions
+    {
+        public static ValidationAttribute[] GetValidationAttributes(this ObjectExtensionPropertyInfo propertyInfo)
+        {
+            return propertyInfo
+                .Attributes
+                .OfType<ValidationAttribute>()
+                .Union(propertyInfo.ValidationAttributes)
+                .ToArray();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyValidationContext.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyValidationContext.cs
index ab2a7ccb38..81b6edbed8 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyValidationContext.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyValidationContext.cs
@@ -40,6 +40,7 @@ namespace Volo.Abp.ObjectExtending
 
         /// <summary>
         /// Can be used to resolve services from the dependency injection container.
+        /// This can be null when SetProperty method is used on the object.
         /// </summary>
         [CanBeNull]
         public IServiceProvider ServiceProvider => ValidationContext;
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs
index db2ccf6f63..948c1712db 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs
@@ -5,7 +5,7 @@ using Volo.Abp.Localization;
 
 namespace Volo.Abp.TextTemplating
 {
-    public class TemplateDefinition
+    public class TemplateDefinition : IHasNameWithLocalizableDisplayName
     {
         public const int MaxNameLength = 128;
 
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs
index 0d17e9969c..b050d6d8c1 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs
@@ -8,10 +8,13 @@ namespace Volo.Abp.TextTemplating
     {
         public static TemplateDefinition WithVirtualFilePath(
             [NotNull] this TemplateDefinition templateDefinition,
-            [NotNull] string virtualPath)
+            [NotNull] string virtualPath,
+            bool isInlineLocalized)
         {
             Check.NotNull(templateDefinition, nameof(templateDefinition));
 
+            templateDefinition.IsInlineLocalized = isInlineLocalized;
+
             return templateDefinition.WithProperty(
                 VirtualFileTemplateContentContributor.VirtualPathPropertyName,
                 virtualPath
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionManager.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionManager.cs
index 11081f6dff..28909330fe 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionManager.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionManager.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.TextTemplating
 {
@@ -79,38 +78,9 @@ namespace Volo.Abp.TextTemplating
                 {
                     provider.PostDefine(context);
                 }
-
-                SetIsInlineLocalized(
-                    templates,
-                    scope.ServiceProvider
-                );
             }
 
             return templates;
         }
-
-        protected virtual void SetIsInlineLocalized(
-            Dictionary<string, TemplateDefinition> templates,
-            IServiceProvider serviceProvider)
-        {
-            var virtualFileProvider = serviceProvider.GetRequiredService<IVirtualFileProvider>();
-
-            foreach (var templateDefinition in templates.Values)
-            {
-                var virtualPath = templateDefinition.GetVirtualFilePathOrNull();
-                if (virtualPath == null)
-                {
-                    continue;
-                }
-
-                var fileInfo = virtualFileProvider.GetFileInfo(virtualPath);
-                if (!fileInfo.Exists)
-                {
-                    throw new AbpException("Could not find a file/folder at the location: " + virtualPath);
-                }
-
-                templateDefinition.IsInlineLocalized = !fileInfo.IsDirectory;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateRenderer.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateRenderer.cs
index f51e8447b0..86eb684f52 100644
--- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateRenderer.cs
+++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateRenderer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
 using Scriban;
 using Scriban.Runtime;
 using Volo.Abp.DependencyInjection;
@@ -136,9 +137,9 @@ namespace Volo.Abp.TextTemplating
                 scriptObject["model"] = model;
             }
 
-            if (templateDefinition.LocalizationResource != null)
+            var localizer = GetLocalizerOrNull(templateDefinition);
+            if (localizer != null)
             {
-                var localizer = _stringLocalizerFactory.Create(templateDefinition.LocalizationResource);
                 scriptObject.Import(
                     "L",
                     new Func<string, string>(
@@ -151,5 +152,15 @@ namespace Volo.Abp.TextTemplating
 
             return context;
         }
+
+        private IStringLocalizer GetLocalizerOrNull(TemplateDefinition templateDefinition)
+        {
+            if (templateDefinition.LocalizationResource != null)
+            {
+                return _stringLocalizerFactory.Create(templateDefinition.LocalizationResource);
+            }
+
+            return _stringLocalizerFactory.CreateDefaultOrNull();
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xml b/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xsd b/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/framework/src/Volo.Abp.Validation.Abstractions/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.csproj b/framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.csproj
new file mode 100644
index 0000000000..2ed6955187
--- /dev/null
+++ b/framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\configureawait.props" />
+  <Import Project="..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Volo.Abp.Validation.Abstractions</AssemblyName>
+    <PackageId>Volo.Abp.Validation.Abstractions</PackageId>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationAbstractionsModule.cs b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationAbstractionsModule.cs
new file mode 100644
index 0000000000..433ad86a4f
--- /dev/null
+++ b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationAbstractionsModule.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Validation
+{
+    public class AbpValidationAbstractionsModule : AbpModule
+    {
+
+    }
+}
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationException.cs b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs
similarity index 100%
rename from framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationException.cs
rename to framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/AbpValidationException.cs
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/IHasValidationErrors.cs b/framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/IHasValidationErrors.cs
similarity index 100%
rename from framework/src/Volo.Abp.Validation/Volo/Abp/Validation/IHasValidationErrors.cs
rename to framework/src/Volo.Abp.Validation.Abstractions/Volo/Abp/Validation/IHasValidationErrors.cs
diff --git a/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.csproj b/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.csproj
index edbcf2f04d..10daff842e 100644
--- a/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.csproj
+++ b/framework/src/Volo.Abp.Validation/Volo.Abp.Validation.csproj
@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Validation.Abstractions\Volo.Abp.Validation.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs
index 9da6766a5d..3fb027cba7 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs
@@ -9,6 +9,7 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.Validation
 {
     [DependsOn(
+        typeof(AbpValidationAbstractionsModule),
         typeof(AbpLocalizationModule)
         )]
     public class AbpValidationModule : AbpModule
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/cs.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/cs.json
index 2be5ff3b15..d202abe1eb 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/cs.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/cs.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "V poli {0} musí být řežezec nebo řada o minimální délce '{1}'.",
     "The {0} field is not a valid phone number.": "V poli {0} není platné telefonní číslo.",
     "The field {0} must be between {1} and {2}.": "Pole {0} musí být mezi {1} a {2}.",
-    "The field {0} must match the regular expression '{1}'.": "Pole {0} musí odpovídat regulérnímu výrazu '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "Pole {0} neodpovídá požadovanému formátu.",
     "The {0} field is required.": "Pole {0} je povinné.",
     "The field {0} must be a string with a maximum length of {1}.": "Pole {0} musí být řetězec o maximální délce {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "Pole {0} musí být řetězec o minimální délce {2} a maximální délce {1} znaků.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/en.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/en.json
index b6ff1bb26c..74c6670e55 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/en.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/en.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "The field {0} must be a string or array type with a minimum length of '{1}'.",
     "The {0} field is not a valid phone number.": "The {0} field is not a valid phone number.",
     "The field {0} must be between {1} and {2}.": "The field {0} must be between {1} and {2}.",
-    "The field {0} must match the regular expression '{1}'.": "The field {0} must match the regular expression '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "The field {0} does not match the requested format.",
     "The {0} field is required.": "The {0} field is required.",
     "The field {0} must be a string with a maximum length of {1}.": "The field {0} must be a string with a maximum length of {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/es.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/es.json
index 25ed44d7ad..1615d7db42 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/es.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/es.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "El campo {0} debe ser una cadena o un array con una longitud mínima de '{1}'.",
     "The {0} field is not a valid phone number.": "{0} no es un número de teléfono válido.",
     "The field {0} must be between {1} and {2}.": "El campo {0} debe ser entre {1} y {2}.",
-    "The field {0} must match the regular expression '{1}'.": "El campo {0} debe coincidir con la expresión regular '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "El campo {0} no coincide con el formato solicitado.",
     "The {0} field is required.": "La {0} campo es obligatorio.",
     "The field {0} must be a string with a maximum length of {1}.": "El campo {0} debe ser una cadena con una longitud máxima de {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "El campo {0} debe ser una cadena con una longitud mínima de {2} y una longitud máxima de {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pl-PL.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pl-PL.json
index 93145f0a3a..80dc72212d 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pl-PL.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pl-PL.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "Pole {0} musi być łańcuchem znaków lub talicą o minimalnej długości '{1}'.",
     "The {0} field is not a valid phone number.": "Pole {0} nie jest poprawnym numerem telefonu.",
     "The field {0} must be between {1} and {2}.": "Pole {0} musi być pomiędzy {1} i {2}.",
-    "The field {0} must match the regular expression '{1}'.": "Pole {0} musi pasować do wyrażenia regularnego '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "Pole {0} nie pasuje do żądanego formatu.",
     "The {0} field is required.": "Pole {0} jest wymagane.",
     "The field {0} must be a string with a maximum length of {1}.": "Pole {0} musi być łańcuchem znaków o maksymalnej długości {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "Pole {0} musi być łańcuchem znaków o minimalnej długości {2} i maksymalnej długości {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json
index b0852a3f5f..8d799a7730 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "O campo {0} deve ser uma palavra ou matriz com o tamanho mínimo de '{1}'.",
     "The {0} field is not a valid phone number.": "O campo {0} não é um telefone válido.",
     "The field {0} must be between {1} and {2}.": "O campo {0} deve estar entre {1} e {2}.",
-    "The field {0} must match the regular expression '{1}'.": "O campo {0} deve ser compatível com a expressão regular '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "O campo {0} não corresponde ao formato solicitado.",
     "The {0} field is required.": "O Campo {0} é obrigatório.",
     "The field {0} must be a string with a maximum length of {1}.": "O campo {0} deve ser uma palavra com o tamanho máximo de {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "O campo {0} deve ser uma palavra com o tamanho mínimo de {2} e tamanho máximo de {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/ru.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/ru.json
index 6272fdf534..d718dbbed8 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/ru.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/ru.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "Поле {0} должно иметь тип строки или массива с минимальной длиной '{1}'.",
     "The {0} field is not a valid phone number.": "Поле {0} не содержит действительный номер телефона.",
     "The field {0} must be between {1} and {2}.": "Поле {0} должно находиться между {1} и {2}.",
-    "The field {0} must match the regular expression '{1}'.": "Поле {0} должно соответствовать регулярному выражению '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "Поле {0} не соответствует запрошенному формату.",
     "The {0} field is required.": "Поле {0} необходимо заполнить.",
     "The field {0} must be a string with a maximum length of {1}.": "Поле {0} должно быть строкой с максимальной длиной {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "Поле {0} должно быть строкой с минимальной длиной {2} и максимальной длиной {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/tr.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/tr.json
index 447495e236..a70a3cd329 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/tr.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/tr.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "{0} alanı en az '{1}' uzunluğunda bir metin ya da dizi olmalıdır.",
     "The {0} field is not a valid phone number.": "{0} alanı geçerli bir telefon numarası olmalıdır.",
     "The field {0} must be between {1} and {2}.": "{0} değeri {1} ile {2} arasında olmalıdır.",
-    "The field {0} must match the regular expression '{1}'.": "{0} alanı şu düzenli ifadeye uymalıdır: '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "{0} alanı istenilen biçimde değil.",
     "The {0} field is required.": "{0} alanı zorunludur.",
     "The field {0} must be a string with a maximum length of {1}.": "{0} alanı en fazla {1} uzunluğunda bir metin olmalıdır.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "{0} alanı en az {2}, en fazla {1} uzunluğunda bir metin olmalıdır.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/vi.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/vi.json
index 2d9c0c55f5..9f8e3e30ee 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/vi.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/vi.json
@@ -9,7 +9,7 @@
     "The field {0} must be a string or array type with a maximum length of '{1}'.": "Trường {0} phải là một chuỗi hoặc một mảng với độ dài tối đa là '{1}'.",
     "The {0} field is not a valid phone number.": "Trường {0} không phải là một số điện thoại hợp lệ",
     "The field {0} must be between {1} and {2}.": "Trường {0} phải ở giữa {1} and {2}.",
-    "The field {0} must match the regular expression '{1}'.": "Trường {0} phải khớp với biểu thức chính quy '{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "Trường {0} không khớp với định dạng được yêu cầu.",
     "The {0} field is required.": "Trường {0} là bắt buộc.",
     "The field {0} must be a string with a maximum length of {1}.": "Trường {0} phải là một chuỗi với độ dài tối đa là {1}.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "Trường {0} phải là một chuỗi với độ dài tối thiểu {2} và tối đa là {1}.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json
index 282423a44a..88a6e93acf 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "字段{0}必须是最小长度为'{1}'的字符串或数组.",
     "The {0} field is not a valid phone number.": "字段{0}不是有效的手机号码.",
     "The field {0} must be between {1} and {2}.": "字段{0}值必须在{1}和{2}范围内.",
-    "The field {0} must match the regular expression '{1}'.": "字段{0}必须匹配正则表达式'{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "字段{0}与请求的格式不匹配。",
     "The {0} field is required.": "字段{0}不可为空.",
     "The field {0} must be a string with a maximum length of {1}.": "字段{0}必须是长度为{1}的字符串.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "字段{0}必须是最小长度为{2}并且最大长度{1}的字符串.",
diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hant.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hant.json
index 1e7e419625..2cd200151c 100644
--- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hant.json
+++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hant.json
@@ -10,7 +10,7 @@
     "The field {0} must be a string or array type with a minimum length of '{1}'.": "欄位{0}必須是最小長度為'{1}'的字串或陣列.",
     "The {0} field is not a valid phone number.": "欄位{0}不是有效的電話號碼.",
     "The field {0} must be between {1} and {2}.": "欄位{0}值必須在{1}和{2}範圍內.",
-    "The field {0} must match the regular expression '{1}'.": "欄位{0}必須匹配正規表示式'{1}'.",
+    "The field {0} must match the regular expression '{1}'.": "字段{0}与请求的格式不匹配。",
     "The {0} field is required.": "欄位{0}不可為空.",
     "The field {0} must be a string with a maximum length of {1}.": "欄位{0}必須是長度為{1}的字串.",
     "The field {0} must be a string with a minimum length of {2} and a maximum length of {1}.": "欄位{0}必須是最小長度為{2}並且最大長度{1}的字串.",
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper_Tests.cs
new file mode 100644
index 0000000000..4f96fae3f5
--- /dev/null
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ExtraPropertyBindingHelper_Tests.cs
@@ -0,0 +1,48 @@
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
+{
+    public class ExtraPropertyBindingHelper_Tests
+    {
+        [Fact]
+        public void ExtractExtraPropertyName_Tests()
+        {
+            ExtraPropertyBindingHelper.ExtractExtraPropertyName(
+                "MyObject.UserInfo.ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("SocialSecurityNumber");
+
+            ExtraPropertyBindingHelper.ExtractExtraPropertyName(
+                "UserInfo.ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("SocialSecurityNumber");
+
+            ExtraPropertyBindingHelper.ExtractExtraPropertyName(
+                "ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("SocialSecurityNumber");
+
+            ExtraPropertyBindingHelper.ExtractExtraPropertyName(
+                "SocialSecurityNumber"
+            ).ShouldBeNull();
+        }
+
+        [Fact]
+        public void ExtractContainerName_Tests()
+        {
+            ExtraPropertyBindingHelper.ExtractContainerName(
+                "MyObject.UserInfo.ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("MyObject.UserInfo");
+
+            ExtraPropertyBindingHelper.ExtractContainerName(
+                "UserInfo.ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("UserInfo");
+
+            ExtraPropertyBindingHelper.ExtractContainerName(
+                "ExtraProperties[SocialSecurityNumber]"
+            ).ShouldBe("");
+
+            ExtraPropertyBindingHelper.ExtractContainerName(
+                "SocialSecurityNumber"
+            ).ShouldBeNull();
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs b/framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs
index d0ee7db52d..4ec19bb84e 100644
--- a/framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs
+++ b/framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs
@@ -34,10 +34,10 @@ namespace AutoMapper
 
             personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
             personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
+            personDto.GetProperty<int>("ChildCount").ShouldBe(0); //Not defined in the source, but was set to the default value by ExtensibleTestPersonDto constructor
+            personDto.GetProperty("CityName").ShouldBeNull(); //Ignored, but was set to the default value by ExtensibleTestPersonDto constructor
             personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
-            personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
             personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
-            personDto.HasProperty("CityName").ShouldBeFalse(); //Ignored
         }
     }
 }
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
index e289779d2c..23eba093a6 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/TypeHelper_Tests.cs
@@ -66,6 +66,15 @@ namespace Volo.Abp.Reflection
             ).ShouldBeFalse();
         }
 
+        [Fact]
+        public void GetDefaultValue()
+        {
+            TypeHelper.GetDefaultValue(typeof(bool)).ShouldBe(false);
+            TypeHelper.GetDefaultValue(typeof(byte)).ShouldBe(0);
+            TypeHelper.GetDefaultValue(typeof(int)).ShouldBe(0);
+            TypeHelper.GetDefaultValue(typeof(string)).ShouldBeNull();
+        }
+
         public class MyDictionary : Dictionary<bool, TypeHelper_Tests>
         {
 
diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs
index 3eff9846f7..ba7091befa 100644
--- a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs
+++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs
@@ -23,7 +23,7 @@ namespace Volo.Abp.ObjectExtending
                     .AddOrUpdateProperty<ExtensibleTestPerson, string>("CityName")
                     .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("Name")
                     .AddOrUpdateProperty<ExtensibleTestPersonDto, int>("ChildCount")
-                    .AddOrUpdateProperty<ExtensibleTestPersonDto, int>("CityName");
+                    .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("CityName");
             });
         }
     }
diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObjectValidator_Tests.cs b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObjectValidator_Tests.cs
index 8c27844e22..c41ffead56 100644
--- a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObjectValidator_Tests.cs
+++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObjectValidator_Tests.cs
@@ -2,6 +2,7 @@
 using Shouldly;
 using Volo.Abp.Data;
 using Volo.Abp.Threading;
+using Volo.Abp.Validation;
 using Xunit;
 
 namespace Volo.Abp.ObjectExtending
@@ -19,19 +20,19 @@ namespace Volo.Abp.ObjectExtending
                     {
                         options.AddOrUpdateProperty<string>("Name", propertyInfo =>
                         {
-                            propertyInfo.ValidationAttributes.Add(new RequiredAttribute());
-                            propertyInfo.ValidationAttributes.Add(new StringLengthAttribute(64) { MinimumLength = 2 });
+                            propertyInfo.Attributes.Add(new RequiredAttribute());
+                            propertyInfo.Attributes.Add(new StringLengthAttribute(64) { MinimumLength = 2 });
                         });
 
                         options.AddOrUpdateProperty<string>("Address", propertyInfo =>
                         {
-                            propertyInfo.ValidationAttributes.Add(new StringLengthAttribute(255));
+                            propertyInfo.Attributes.Add(new StringLengthAttribute(255));
                         });
 
                         options.AddOrUpdateProperty<byte>("Age", propertyInfo =>
                         {
-                            propertyInfo.ValidationAttributes.Add(new RequiredAttribute());
-                            propertyInfo.ValidationAttributes.Add(new RangeAttribute(18, 99));
+                            propertyInfo.Attributes.Add(new RequiredAttribute());
+                            propertyInfo.Attributes.Add(new RangeAttribute(18, 99));
                         });
 
                         options.AddOrUpdateProperty<bool>("IsMarried", propertyInfo =>
@@ -55,7 +56,7 @@ namespace Volo.Abp.ObjectExtending
                                         context.ValidationErrors.Add(
                                             new ValidationResult(
                                                 "If you specify a password, then please correctly repeat it!",
-                                                new[] {"Password", "PasswordRepeat"}
+                                                new[] { "Password", "PasswordRepeat" }
                                             )
                                         );
                                     }
@@ -84,14 +85,9 @@ namespace Volo.Abp.ObjectExtending
         {
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Name", "John"},
-                            {"Age", "42"},
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Name", "John", validate: false)
+                        .SetProperty("Age", 42, validate: false)
                 ).Count.ShouldBe(0); //All Valid
         }
 
@@ -105,65 +101,50 @@ namespace Volo.Abp.ObjectExtending
 
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Address", new string('x', 256) }
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Address", new string('x', 256), validate: false)
                 ).Count.ShouldBe(3); // Name, Age & Address
 
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Age", "42" }
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Age", 42, validate: false)
                 ).Count.ShouldBe(1); // Name
 
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Address", new string('x', 256) },
-                            {"Age", "100" }
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Address", new string('x', 256), validate: false)
+                        .SetProperty("Age", 100, validate: false)
                 ).Count.ShouldBe(3); // Name, Age & Address
 
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Name", "John"},
-                            {"Age", "42"},
-                            {"Password", "123"},
-                            {"PasswordRepeat", "1256"}
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Name", "John", validate: false)
+                        .SetProperty("Age", 42, validate: false)
+                        .SetProperty("Password", "123", validate: false)
+                        .SetProperty("PasswordRepeat", "1256", validate: false)
                 ).Count.ShouldBe(1); // PasswordRepeat != Password
 
             ExtensibleObjectValidator
                 .GetValidationErrors(
-                    new ExtensiblePersonObject
-                    {
-                        ExtraProperties =
-                        {
-                            {"Name", "BadValue"},
-                            {"Age", "42"},
-                        }
-                    }
+                    new ExtensiblePersonObject()
+                        .SetProperty("Name", "BadValue", validate: false)
+                        .SetProperty("Age", 42, validate: false)
                 ).Count.ShouldBe(1); //Name is 'BadValue'!
         }
 
+        [Fact]
+        public void Should_Check_Validation_On_SetProperty()
+        {
+            Assert.Throws<AbpValidationException>(() =>
+            {
+                new ExtensiblePersonObject()
+                    .SetProperty("Address", new string('x', 256));
+            });
+        }
+
         private class ExtensiblePersonObject : ExtensibleObject
         {
 
diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObject_Tests.cs b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObject_Tests.cs
new file mode 100644
index 0000000000..fdd7f600f6
--- /dev/null
+++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/ExtensibleObject_Tests.cs
@@ -0,0 +1,37 @@
+using Shouldly;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending.TestObjects;
+using Xunit;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class ExtensibleObject_Tests : AbpObjectExtendingTestBase
+    {
+        [Fact]
+        public void Should_Set_Default_Values_For_Defined_Properties_On_Create()
+        {
+            var person = new ExtensibleTestPerson();
+
+            person.HasProperty("Name").ShouldBeTrue();
+            person.HasProperty("Age").ShouldBeTrue();
+            person.HasProperty("NoPairCheck").ShouldBeTrue();
+            person.HasProperty("CityName").ShouldBeTrue();
+
+            person.GetProperty<string>("Name").ShouldBeNull();
+            person.GetProperty<int>("Age").ShouldBe(0);
+            person.GetProperty<string>("NoPairCheck").ShouldBeNull();
+            person.GetProperty<string>("CityName").ShouldBeNull();
+        }
+
+        [Fact]
+        public void Should_Not_Set_Default_Values_For_Defined_Properties_If_Requested()
+        {
+            var person = new ExtensibleTestPerson(false);
+
+            person.HasProperty("Name").ShouldBeFalse();
+            person.HasProperty("Age").ShouldBeFalse();
+            person.HasProperty("NoPairCheck").ShouldBeFalse();
+            person.HasProperty("CityName").ShouldBeFalse();
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/HasExtraPropertiesObjectExtendingExtensions_Tests.cs b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/HasExtraPropertiesObjectExtendingExtensions_Tests.cs
index e871aeb056..5d019daf48 100644
--- a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/HasExtraPropertiesObjectExtendingExtensions_Tests.cs
+++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/HasExtraPropertiesObjectExtendingExtensions_Tests.cs
@@ -34,7 +34,7 @@ namespace Volo.Abp.ObjectExtending
             _personDto.GetProperty<string>("NoPairCheck").ShouldBe("test-value"); //CheckPairDefinitionOnMapping = false
             _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
             _personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
-            _personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            _personDto.GetProperty<int>("ChildCount").ShouldBe(0); //Not defined in the source, but was set to the default in the constructor
             _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
         }
 
@@ -46,9 +46,9 @@ namespace Volo.Abp.ObjectExtending
             _personDto.GetProperty<string>("Name").ShouldBe("John"); //Defined in both classes
             _personDto.GetProperty<string>("NoPairCheck").ShouldBe("test-value"); //CheckPairDefinitionOnMapping = false
             _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
-            _personDto.HasProperty("CityName").ShouldBeFalse(); //Ignored!
+            _personDto.GetProperty<string>("CityName").ShouldBeNull(); //Ignored, but was set to the default in the constructor
             _personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
-            _personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            _personDto.GetProperty<int>("ChildCount").ShouldBe(0); //Not defined in the source, but was set to the default in the constructor
             _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
         }
 
@@ -61,7 +61,7 @@ namespace Volo.Abp.ObjectExtending
             _personDto.GetProperty<string>("CityName").ShouldBe("Adana"); //Defined in both classes
             _personDto.GetProperty<int>("Age").ShouldBe(42); //Defined in source
             _personDto.GetProperty<string>("ExistingDtoProperty").ShouldBe("existing-value"); //Should not clear existing values
-            _personDto.HasProperty("ChildCount").ShouldBeFalse(); //Not defined in the source
+            _personDto.GetProperty<int>("ChildCount").ShouldBe(0); //Not defined in the source, but was set to the default in the constructor
             _personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
         }
 
diff --git a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPerson.cs b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPerson.cs
index bd24209212..25bce6e45a 100644
--- a/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPerson.cs
+++ b/framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPerson.cs
@@ -2,6 +2,15 @@
 {
     public class ExtensibleTestPerson : ExtensibleObject
     {
+        public ExtensibleTestPerson()
+        {
 
+        }
+
+        public ExtensibleTestPerson(bool setDefaultsForExtraProperties)
+            : base(setDefaultsForExtraProperties)
+        {
+
+        }
     }
 }
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 05df1378b2..af6386e9f7 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
@@ -10,7 +10,7 @@ namespace Volo.Abp.TextTemplating
                 new TemplateDefinition(
                     TestTemplates.WelcomeEmail,
                     defaultCultureName: "en"
-                ).WithVirtualFilePath("/SampleTemplates/WelcomeEmail")
+                ).WithVirtualFilePath("/SampleTemplates/WelcomeEmail", false)
             );
 
             context.Add(
@@ -18,14 +18,14 @@ namespace Volo.Abp.TextTemplating
                     TestTemplates.ForgotPasswordEmail,
                     localizationResource: typeof(TestLocalizationSource),
                     layout: TestTemplates.TestTemplateLayout1
-                ).WithVirtualFilePath("/SampleTemplates/ForgotPasswordEmail.tpl")
+                ).WithVirtualFilePath("/SampleTemplates/ForgotPasswordEmail.tpl", true)
             );
 
             context.Add(
                 new TemplateDefinition(
                     TestTemplates.TestTemplateLayout1,
                     isLayout: true
-                ).WithVirtualFilePath("/SampleTemplates/TestTemplateLayout1.tpl")
+                ).WithVirtualFilePath("/SampleTemplates/TestTemplateLayout1.tpl", true)
             );
         }
     }
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfiguration.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfiguration.cs
new file mode 100644
index 0000000000..24c54e4b55
--- /dev/null
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfiguration.cs
@@ -0,0 +1,35 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class AuditLoggingModuleExtensionConfiguration : ModuleExtensionConfiguration
+    {
+        public AuditLoggingModuleExtensionConfiguration ConfigureAuditLog(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                AuditLoggingModuleExtensionConsts.EntityNames.AuditLog,
+                configureAction
+            );
+        }
+
+        public AuditLoggingModuleExtensionConfiguration ConfigureAuditLogAction(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                AuditLoggingModuleExtensionConsts.EntityNames.AuditLogAction,
+                configureAction
+            );
+        }
+
+        public AuditLoggingModuleExtensionConfiguration ConfigureEntityChange(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                AuditLoggingModuleExtensionConsts.EntityNames.EntityChange,
+                configureAction
+            );
+        }
+    }
+}
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfigurationDictionaryExtensions.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfigurationDictionaryExtensions.cs
new file mode 100644
index 0000000000..3de08783e1
--- /dev/null
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConfigurationDictionaryExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class AuditLoggingModuleExtensionConfigurationDictionaryExtensions
+    {
+        public static ModuleExtensionConfigurationDictionary ConfigureAuditLogging(
+            this ModuleExtensionConfigurationDictionary modules,
+            Action<AuditLoggingModuleExtensionConfiguration> configureAction)
+        {
+            return modules.ConfigureModule(
+                AuditLoggingModuleExtensionConsts.ModuleName,
+                configureAction
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConsts.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConsts.cs
new file mode 100644
index 0000000000..ec8be4914b
--- /dev/null
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/ObjectExtending/AuditLoggingModuleExtensionConsts.cs
@@ -0,0 +1,16 @@
+namespace Volo.Abp.ObjectExtending
+{
+    public static class AuditLoggingModuleExtensionConsts
+    {
+        public const string ModuleName = "AuditLogging";
+
+        public static class EntityNames
+        {
+            public const string AuditLog = "AuditLog";
+            
+            public const string AuditLogAction = "AuditLogAction";
+            
+            public const string EntityChange = "EntityChange";
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AbpAuditLoggingDomainModule.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AbpAuditLoggingDomainModule.cs
index 376dea99f3..b2d2505004 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AbpAuditLoggingDomainModule.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AbpAuditLoggingDomainModule.cs
@@ -1,6 +1,8 @@
 using Volo.Abp.Auditing;
 using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectExtending.Modularity;
 
 namespace Volo.Abp.AuditLogging
 {
@@ -9,6 +11,25 @@ namespace Volo.Abp.AuditLogging
     [DependsOn(typeof(AbpAuditLoggingDomainSharedModule))]
     public class AbpAuditLoggingDomainModule : AbpModule
     {
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                AuditLoggingModuleExtensionConsts.ModuleName,
+                AuditLoggingModuleExtensionConsts.EntityNames.AuditLog,
+                typeof(AuditLog)
+            );
 
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                AuditLoggingModuleExtensionConsts.ModuleName,
+                AuditLoggingModuleExtensionConsts.EntityNames.AuditLogAction,
+                typeof(AuditLogAction)
+            );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                AuditLoggingModuleExtensionConsts.ModuleName,
+                AuditLoggingModuleExtensionConsts.EntityNames.EntityChange,
+                typeof(EntityChange)
+            );
+        }
     }
 }
diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
index 00fa553902..432857686f 100644
--- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
@@ -4,10 +4,12 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
+using Volo.Blogging.Bundling;
 using Volo.Blogging.Localization;
 
 namespace Volo.Blogging
@@ -51,6 +53,17 @@ namespace Volo.Blogging
                 options.AddProfile<AbpBloggingWebAutoMapperProfile>(validate: true);
             });
 
+            Configure<AbpBundleContributorOptions>(options =>
+            {
+                options
+                    .Extensions<PrismjsStyleBundleContributor>()
+                    .Add<PrismjsStyleBundleContributorBloggingExtension>();
+
+                options
+                    .Extensions<PrismjsScriptBundleContributor>()
+                    .Add<PrismjsScriptBundleContributorBloggingExtension>();
+            });
+
             Configure<RazorPagesOptions>(options =>
             {
                 var urlOptions = context.Services
diff --git a/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsScriptBundleContributorBloggingExtension.cs b/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsScriptBundleContributorBloggingExtension.cs
new file mode 100644
index 0000000000..f3b2589598
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsScriptBundleContributorBloggingExtension.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Blogging.Bundling
+{
+    public class PrismjsScriptBundleContributorBloggingExtension : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.js");
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/show-language/prism-show-language.js");
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard.js");
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.js");
+            context.Files.AddIfNotContains("/libs/prismjs/components/prism-csharp.js");
+        }
+    }
+}
diff --git a/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsStyleBundleContributorBloggingExtension.cs b/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsStyleBundleContributorBloggingExtension.cs
new file mode 100644
index 0000000000..8bd3b1fafa
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Bundling/PrismjsStyleBundleContributorBloggingExtension.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Blogging.Bundling
+{
+    public class PrismjsStyleBundleContributorBloggingExtension : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.css");
+            context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css");
+        }
+    }
+}
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs
index 1b525a95b3..d45a334de7 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using CommonMark;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Blogging.Localization;
+using Markdig;
 
 namespace Volo.Blogging.Pages.Blog
 {
@@ -32,7 +32,7 @@ namespace Volo.Blogging.Pages.Blog
 
         public string GetShortContent(string content) 
         {
-            var html = RenderMarkdownToString(content);
+            var html = RenderMarkdownToHtmlAsString(content);
             var plainText = Regex.Replace(html, "<[^>]*>", "");
 
             if (string.IsNullOrWhiteSpace(plainText))
@@ -65,26 +65,37 @@ namespace Volo.Blogging.Pages.Blog
             {
                 return new HtmlString("");
             }
-            
-            byte[] bytes = Encoding.Default.GetBytes(content);
-            var utf8Content = Encoding.UTF8.GetString(bytes);
 
-            var html = CommonMarkConverter.Convert(utf8Content);
+            var html = RenderMarkdownToHtmlAsString(content);
+
+            html = ReplaceCodeBlocksLanguage(
+                html,
+                "language-C#",
+                "language-csharp"
+            );
 
             return new HtmlString(html);
         }
 
-        public string RenderMarkdownToString(string content)
+        protected string ReplaceCodeBlocksLanguage(string content, string currentLanguage, string newLanguage)
+        {
+            return Regex.Replace(content, "<code class=\"" + currentLanguage + "\">", "<code class=\"" + newLanguage + "\">", RegexOptions.IgnoreCase);
+        }
+
+        public string RenderMarkdownToHtmlAsString(string content)
         {
             if (content.IsNullOrWhiteSpace())
             {
                 return "";
             }
 
-            byte[] bytes = Encoding.Default.GetBytes(content);
-            var utf8Content = Encoding.UTF8.GetString(bytes);
-
-            return CommonMarkConverter.Convert(utf8Content);
+            return Markdig.Markdown.ToHtml(Encoding.UTF8.GetString(Encoding.Default.GetBytes(content)),
+                new MarkdownPipelineBuilder()
+                    .UseAutoLinks()
+                    .UseBootstrap()
+                    .UseGridTables()
+                    .UsePipeTables()
+                    .Build());
         }
 
         public LocalizedHtmlString ConvertDatetimeToTimeAgo(DateTime dt)
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
index 7bed3d0d68..e674ae1c3d 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
@@ -6,6 +6,7 @@
 @using Volo.Blogging
 @using Volo.Blogging.Pages.Blog.Posts
 @using Volo.Blogging.Areas.Blog.Helpers.TagHelpers
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs
 @inject IAuthorizationService Authorization
 @model DetailModel
 @{
@@ -15,11 +16,13 @@
 }
 @section scripts {
     <abp-script-bundle name="@typeof(DetailModel).FullName">
+        <abp-script type="@typeof(PrismjsScriptBundleContributor)" />
         <abp-script src="/Pages/Blogs/Posts/detail.js" />
     </abp-script-bundle>
 }
 @section styles {
     <abp-style-bundle name="@typeof(DetailModel).FullName">
+        <abp-script type="@typeof(PrismjsStyleBundleContributor)" />
         <abp-style src="/Pages/Blogs/Shared/Styles/blog.css" />
     </abp-style-bundle>
 }
@@ -28,7 +31,7 @@
     <abp-input asp-for="FocusCommentId" class="m-0" />
     <div class="container">
         <div class="row">
-            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+            <div class="col-12 col-md-8 col-lg-7 mx-auto">
                 <section class="hero-section">
                     <div class="hero-articles">
                         <div class="hero-content">
@@ -85,9 +88,9 @@
                 </section>
             </div>
         </div>
-        
+
         <div class="row">
-            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+            <div class="col-12 col-md-8 col-lg-7 mx-auto">
                 <section class="post-content">
                     <p>
                         @Html.Raw(RenderMarkdownToHtml(Model.Post.Content))
@@ -95,9 +98,9 @@
                 </section>
             </div>
         </div>
-    
+
         <div class="row">
-            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+            <div class="col-12 col-md-8 col-lg-7 mx-auto">
                 <hr />
                 <div class="mb-2 mt-1">
                     @(L["ShareOn"].Value + " :")
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
index 9817c4f092..ddf9168351 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
@@ -22,7 +22,7 @@
 <div id="edit-post-container">
     <div class="container py-5">
         <div class="row">
-            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+            <div class="col-12 col-md-8 col-lg-7 mx-auto">
                 <div class="card">
                     <div class="card-body"> 
                         <form method="post" id="edit-post-form">
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
index 9139fe5ce1..858e19abd0 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
@@ -22,7 +22,7 @@
 <div id="qa-new-post-container">
     <div class="container py-5">
         <div class="row">
-            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+            <div class="col-12 col-md-8 col-lg-7 mx-auto">
                 <div class="card">
                     <div class="card-body">
                         <form method="post" id="new-post-form">
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
index e28934dd5f..ce5b426174 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
@@ -105,8 +105,8 @@ input, select, textarea, .form-control, .btn {
 .font-125 {
     font-size: 1.125em;
 }
-pre { 
-    background: #eee;
+pre {
+    background: #131323;
     padding: 25px 30px;
     margin: 1em 0 2em 0;
 }
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
index 802e2d1828..6dd22c8057 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
@@ -1,7 +1,7 @@
 div.vs-blog {
   position: relative;
   background: white;
-  padding: 30px;
+  padding: 10px;
   font-family: 'Open Sans', Helvetica, Arial, sans-serif;
   font-size: 16px; }
   div.vs-blog a, div.vs-blog a:hover {
@@ -74,7 +74,7 @@
   div.vs-blog .font-125 {
     font-size: 1.125em; }
   div.vs-blog pre {
-    background: #eee;
+    background: #131323;
     padding: 25px 30px;
     margin: 1em 0 2em 0; }
   div.vs-blog .vs-blog-title {
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
index 7c5eaa4f7a..5a34293f8d 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
@@ -1 +1 @@
-div.vs-blog{position:relative;background:#fff;padding:30px;font-family:'Open Sans',Helvetica,Arial,sans-serif;font-size:16px;}div.vs-blog a,div.vs-blog a:hover{text-decoration:none;color:#000;}div.vs-blog p{color:#444;}div.vs-blog p a{text-decoration:underline;}div.vs-blog h1,div.vs-blog h2,div.vs-blog h3,div.vs-blog h4,div.vs-blog h5,div.vs-blog h6,div.vs-blog .tab-title{font-family:Helvetica,Arial,sans-serif;font-weight:700;}div.vs-blog h1{font-size:2em;margin:1rem 0 1.5rem;line-height:1.25;}div.vs-blog h2,div.vs-blog .tab-title{font-size:1.5em;margin:1.5rem 0 .75rem;}div.vs-blog h3{font-size:1.25em;margin:1.5rem 0 .75rem;}div.vs-blog h4{font-size:1.125em;margin:1.5rem 0 .75rem;}div.vs-blog h5{font-size:1em;}div.vs-blog h6{font-size:1em;}div.vs-blog .lead{font-size:1.1rem;font-weight:300;}div.vs-blog img{max-width:100%;}div.vs-blog input,div.vs-blog select,div.vs-blog textarea,div.vs-blog .form-control,div.vs-blog .btn{border-radius:0;border-width:1px 1px 2px 1px;}div.vs-blog .navbar-toggler{background:#0ff;}div.vs-blog .no-border{border:0;}div.vs-blog .btn-rounded{border-radius:30px;}div.vs-blog .list-group .list-group-item{position:relative;display:block;padding:30px 0 30px;background:none;border-radius:0;border:0;}div.vs-blog .list-group .list-group-item:hover{background:none;}div.vs-blog .list-group .list-group-item+.list-group-item{border-top:1px solid #f5f5f5;padding:35px 0 30px;}div.vs-blog .list-group .list-group-item h3{margin-top:0;}div.vs-blog .list-group.small-list .list-group-item{padding:10px 0;}div.vs-blog .list-group.small-list .list-group-item+.list-group-item{padding:10px 0;}div.vs-blog .font-75{font-size:.75em;}div.vs-blog .font-85{font-size:.85em;}div.vs-blog .font-92{font-size:.92em;}div.vs-blog .font-100{font-size:1em;}div.vs-blog .font-125{font-size:1.125em;}div.vs-blog pre{background:#eee;padding:25px 30px;margin:1em 0 2em 0;}div.vs-blog .vs-blog-title{padding-bottom:15px;margin-bottom:25px;border-bottom:1px solid #ddd;}div.vs-blog .vs-blog-title h1,div.vs-blog .vs-blog-title h2,div.vs-blog .vs-blog-title h3,div.vs-blog .vs-blog-title h4,div.vs-blog .vs-blog-title h5,div.vs-blog .vs-blog-title h6{margin:0;padding:0;}div.vs-blog .vs-footer{padding-top:15px;margin-top:25px;border-top:1px solid #ddd;}div.vs-blog .vs-seperator{padding:0 4px;opacity:.3;}div.vs-blog .hero-section{padding:0;}div.vs-blog .hero-section .hero-articles{position:relative;overflow:hidden;}div.vs-blog .hero-section .hero-articles .hero-content h2{margin-top:.5rem;font-size:1.75em;font-weight:bold;line-height:1.25;}div.vs-blog .hero-section .hero-articles .tags .tag{background:rgba(208,208,208,.3);color:#fff !important;}div.vs-blog .hero-section .hero-articles .tags .tag:hover{background:#fff;color:#000 !important;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos{color:#000;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(255,255,255,.2);}div.vs-blog .hero-section .hero-articles .article-owner .article-infos img.article-avatar{display:inline-block;border-radius:50%;}div.vs-blog .hero-section .hero-articles .img-container img{width:100%;}div.vs-blog .hero-section .hero-articles:hover .img-container::after{opacity:1;}div.vs-blog .article-owner .article-infos{color:#000;}div.vs-blog .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .article-owner .article-infos img.article-avatar{width:48px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .user-card h5 span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .card-articles .card-content{padding:10px 0 10px;}div.vs-blog .card-articles .card-content h3{margin:10px 0;}div.vs-blog .card-articles .card-content h3 a{font-weight:700;}div.vs-blog .card-articles .article-owner{text-align:left;}div.vs-blog .card-articles .article-owner .article-infos{color:#000;}div.vs-blog .card-articles .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .card-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .card-articles .article-owner .article-infos img.article-avatar{width:30px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .article-owner{font-size:.72em;}div.vs-blog .user-link-icons{position:absolute;right:18px;top:15px;z-index:3;}div.vs-blog .user-link-icons a{display:inline-block;color:#eee;margin-left:12px;font-size:1.25em;}div.vs-blog .user-link-icons a:hover{color:#fff;}div.vs-blog .tags{margin:2rem 0;padding:0 0 1.25rem 0;}div.vs-blog .tags .tag{display:inline-block;padding:4px 12px;background:rgba(208,208,208,.3);border-radius:4px;margin:0 2px 3px 0;color:#b1b1b1 !important;font-size:.85em;line-height:1.6em;text-transform:uppercase;transition:.25s;text-decoration:none;}div.vs-blog .tags .tag:hover{background:#000;color:#fff !important;}div.vs-blog .hero-section .tags{margin:1rem 0;padding:0 0 .5rem 0;}div.vs-blog .list-group-item .tags{margin:1rem 0 0;padding:0 0;}div.vs-blog .popular-tags a{display:block;font-size:.9em;}div.vs-blog .popular-tags a span{float:right;opacity:.3;font-size:.9em;}div.vs-blog .img-container{position:relative;overflow:hidden;border-radius:4px;background:#dcdcdc;}div.vs-blog .post-detail h1{padding:0 0;line-height:1.25em;font-size:3.5em;}div.vs-blog .post-detail .article-owner{text-align:center;position:relative;z-index:12;}div.vs-blog .post-detail .article-owner .article-infos{color:#000;}div.vs-blog .post-detail .article-owner .article-infos a{color:#000;color:rgba(0,0,0,.8);}div.vs-blog .post-detail .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .post-detail .article-owner .article-infos img.article-avatar{width:64px;margin:-20px 10px 0 0;display:inline-block;border-radius:50%;border:3px solid #fff;}div.vs-blog .post-detail .post-content{font-size:1.125em;}div.vs-blog .post-detail .post-content .post-img-container{margin:50px -80px 20px;overflow:hidden;border-radius:4px;}div.vs-blog .post-detail .post-content .lead{font-size:1.125em;color:#111;}div.vs-blog .media{font-size:.95em;}div.vs-blog .media .media{font-size:.95em;}div.vs-blog .read-more-btn{display:inline-block;font-size:.9em;margin:0 0 1em 0;background:#eee;color:#00f;padding:.25em 1em;border-radius:20px;}div.vs-blog .comment-area{background:#f5f5f5;margin:1.5rem 0;padding:10px;}div.vs-blog .comment-area .comment-owner{margin-bottom:4px;margin-top:8px;}div.vs-blog .comment-area .comment-owner span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .comment-area .media{background:#fff;margin:1px;border-radius:4px;}div.vs-blog .comment-area>.media{padding:30px;border-bottom:1px solid #f1f1f1;}div.vs-blog .comment-area>.media .media{padding:20px 0 0;}div.vs-blog .comment-area .comment-buttons{padding:4px 0;font-size:.96em;}div.vs-blog .comment-area .comment-buttons .seperator{color:#ddd;margin:0 8px;}div.vs-blog .comment-area .comment-buttons .count{color:#fff;background:#ddd;margin-left:5px;padding:1px 3px;font-size:10px;border-radius:3px;}div.vs-blog .comment-area .comment-buttons .count.count-up{background:#999;}div.vs-blog .comment-area .comment-buttons a{opacity:.65;margin-right:10px;}div.vs-blog .comment-area .comment-buttons a:hover{opacity:1;}div.vs-blog .comment-area p{margin-bottom:6px;}div.vs-blog .comment-area .comment-avatar{width:64px;}div.vs-blog .comment-area .answer-avatar{width:64px;}div.vs-blog>.form-group{margin:0 !important;}
\ No newline at end of file
+div.vs-blog{position:relative;background:#fff;padding:10px;font-family:'Open Sans',Helvetica,Arial,sans-serif;font-size:16px;}div.vs-blog a,div.vs-blog a:hover{text-decoration:none;color:#000;}div.vs-blog p{color:#444;}div.vs-blog p a{text-decoration:underline;}div.vs-blog h1,div.vs-blog h2,div.vs-blog h3,div.vs-blog h4,div.vs-blog h5,div.vs-blog h6,div.vs-blog .tab-title{font-family:Helvetica,Arial,sans-serif;font-weight:700;}div.vs-blog h1{font-size:2em;margin:1rem 0 1.5rem;line-height:1.25;}div.vs-blog h2,div.vs-blog .tab-title{font-size:1.5em;margin:1.5rem 0 .75rem;}div.vs-blog h3{font-size:1.25em;margin:1.5rem 0 .75rem;}div.vs-blog h4{font-size:1.125em;margin:1.5rem 0 .75rem;}div.vs-blog h5{font-size:1em;}div.vs-blog h6{font-size:1em;}div.vs-blog .lead{font-size:1.1rem;font-weight:300;}div.vs-blog img{max-width:100%;}div.vs-blog input,div.vs-blog select,div.vs-blog textarea,div.vs-blog .form-control,div.vs-blog .btn{border-radius:0;border-width:1px 1px 2px 1px;}div.vs-blog .navbar-toggler{background:#0ff;}div.vs-blog .no-border{border:0;}div.vs-blog .btn-rounded{border-radius:30px;}div.vs-blog .list-group .list-group-item{position:relative;display:block;padding:30px 0 30px;background:none;border-radius:0;border:0;}div.vs-blog .list-group .list-group-item:hover{background:none;}div.vs-blog .list-group .list-group-item+.list-group-item{border-top:1px solid #f5f5f5;padding:35px 0 30px;}div.vs-blog .list-group .list-group-item h3{margin-top:0;}div.vs-blog .list-group.small-list .list-group-item{padding:10px 0;}div.vs-blog .list-group.small-list .list-group-item+.list-group-item{padding:10px 0;}div.vs-blog .font-75{font-size:.75em;}div.vs-blog .font-85{font-size:.85em;}div.vs-blog .font-92{font-size:.92em;}div.vs-blog .font-100{font-size:1em;}div.vs-blog .font-125{font-size:1.125em;}div.vs-blog pre{background:#131323;padding:25px 30px;margin:1em 0 2em 0;}div.vs-blog .vs-blog-title{padding-bottom:15px;margin-bottom:25px;border-bottom:1px solid #ddd;}div.vs-blog .vs-blog-title h1,div.vs-blog .vs-blog-title h2,div.vs-blog .vs-blog-title h3,div.vs-blog .vs-blog-title h4,div.vs-blog .vs-blog-title h5,div.vs-blog .vs-blog-title h6{margin:0;padding:0;}div.vs-blog .vs-footer{padding-top:15px;margin-top:25px;border-top:1px solid #ddd;}div.vs-blog .vs-seperator{padding:0 4px;opacity:.3;}div.vs-blog .hero-section{padding:0;}div.vs-blog .hero-section .hero-articles{position:relative;overflow:hidden;}div.vs-blog .hero-section .hero-articles .hero-content h2{margin-top:.5rem;font-size:1.75em;font-weight:bold;line-height:1.25;}div.vs-blog .hero-section .hero-articles .tags .tag{background:rgba(208,208,208,.3);color:#fff !important;}div.vs-blog .hero-section .hero-articles .tags .tag:hover{background:#fff;color:#000 !important;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos{color:#000;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(255,255,255,.2);}div.vs-blog .hero-section .hero-articles .article-owner .article-infos img.article-avatar{display:inline-block;border-radius:50%;}div.vs-blog .hero-section .hero-articles .img-container img{width:100%;}div.vs-blog .hero-section .hero-articles:hover .img-container::after{opacity:1;}div.vs-blog .article-owner .article-infos{color:#000;}div.vs-blog .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .article-owner .article-infos img.article-avatar{width:48px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .user-card h5 span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .card-articles .card-content{padding:10px 0 10px;}div.vs-blog .card-articles .card-content h3{margin:10px 0;}div.vs-blog .card-articles .card-content h3 a{font-weight:700;}div.vs-blog .card-articles .article-owner{text-align:left;}div.vs-blog .card-articles .article-owner .article-infos{color:#000;}div.vs-blog .card-articles .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .card-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .card-articles .article-owner .article-infos img.article-avatar{width:30px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .article-owner{font-size:.72em;}div.vs-blog .user-link-icons{position:absolute;right:18px;top:15px;z-index:3;}div.vs-blog .user-link-icons a{display:inline-block;color:#eee;margin-left:12px;font-size:1.25em;}div.vs-blog .user-link-icons a:hover{color:#fff;}div.vs-blog .tags{margin:2rem 0;padding:0 0 1.25rem 0;}div.vs-blog .tags .tag{display:inline-block;padding:4px 12px;background:rgba(208,208,208,.3);border-radius:4px;margin:0 2px 3px 0;color:#b1b1b1 !important;font-size:.85em;line-height:1.6em;text-transform:uppercase;transition:.25s;text-decoration:none;}div.vs-blog .tags .tag:hover{background:#000;color:#fff !important;}div.vs-blog .hero-section .tags{margin:1rem 0;padding:0 0 .5rem 0;}div.vs-blog .list-group-item .tags{margin:1rem 0 0;padding:0 0;}div.vs-blog .popular-tags a{display:block;font-size:.9em;}div.vs-blog .popular-tags a span{float:right;opacity:.3;font-size:.9em;}div.vs-blog .img-container{position:relative;overflow:hidden;border-radius:4px;background:#dcdcdc;}div.vs-blog .post-detail h1{padding:0 0;line-height:1.25em;font-size:3.5em;}div.vs-blog .post-detail .article-owner{text-align:center;position:relative;z-index:12;}div.vs-blog .post-detail .article-owner .article-infos{color:#000;}div.vs-blog .post-detail .article-owner .article-infos a{color:#000;color:rgba(0,0,0,.8);}div.vs-blog .post-detail .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .post-detail .article-owner .article-infos img.article-avatar{width:64px;margin:-20px 10px 0 0;display:inline-block;border-radius:50%;border:3px solid #fff;}div.vs-blog .post-detail .post-content{font-size:1.125em;}div.vs-blog .post-detail .post-content .post-img-container{margin:50px -80px 20px;overflow:hidden;border-radius:4px;}div.vs-blog .post-detail .post-content .lead{font-size:1.125em;color:#111;}div.vs-blog .media{font-size:.95em;}div.vs-blog .media .media{font-size:.95em;}div.vs-blog .read-more-btn{display:inline-block;font-size:.9em;margin:0 0 1em 0;background:#eee;color:#00f;padding:.25em 1em;border-radius:20px;}div.vs-blog .comment-area{background:#f5f5f5;margin:1.5rem 0;padding:10px;}div.vs-blog .comment-area .comment-owner{margin-bottom:4px;margin-top:8px;}div.vs-blog .comment-area .comment-owner span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .comment-area .media{background:#fff;margin:1px;border-radius:4px;}div.vs-blog .comment-area>.media{padding:30px;border-bottom:1px solid #f1f1f1;}div.vs-blog .comment-area>.media .media{padding:20px 0 0;}div.vs-blog .comment-area .comment-buttons{padding:4px 0;font-size:.96em;}div.vs-blog .comment-area .comment-buttons .seperator{color:#ddd;margin:0 8px;}div.vs-blog .comment-area .comment-buttons .count{color:#fff;background:#ddd;margin-left:5px;padding:1px 3px;font-size:10px;border-radius:3px;}div.vs-blog .comment-area .comment-buttons .count.count-up{background:#999;}div.vs-blog .comment-area .comment-buttons a{opacity:.65;margin-right:10px;}div.vs-blog .comment-area .comment-buttons a:hover{opacity:1;}div.vs-blog .comment-area p{margin-bottom:6px;}div.vs-blog .comment-area .comment-avatar{width:64px;}div.vs-blog .comment-area .answer-avatar{width:64px;}div.vs-blog>.form-group{margin:0 !important;}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
index 5fe7843e93..85f80babce 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
@@ -1,7 +1,7 @@
 div.vs-blog {
     position: relative;
     background: white;
-    padding: 30px;
+    padding: 10px;
     font-family: 'Open Sans', Helvetica, Arial, sans-serif;
     font-size: 16px;   
     @import "bootstrap-overwrite.scss"; 
diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
index 7313becddb..19d156f10b 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
+++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\..\configureawait.props" />
   <Import Project="..\..\..\..\common.props" />
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\Volo.Blogging.HttpApi\Volo.Blogging.HttpApi.csproj" />
-    <PackageReference Include="CommonMark.NET" Version="0.15.1" />
+    <PackageReference Include="Markdig.Signed" Version="0.18.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs
new file mode 100644
index 0000000000..3892fb00f6
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs
@@ -0,0 +1,35 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class IdentityModuleExtensionConfiguration : ModuleExtensionConfiguration
+    {
+        public IdentityModuleExtensionConfiguration ConfigureUser(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityModuleExtensionConsts.EntityNames.User,
+                configureAction
+            );
+        }
+
+        public IdentityModuleExtensionConfiguration ConfigureRole(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityModuleExtensionConsts.EntityNames.Role,
+                configureAction
+            );
+        }
+
+        public IdentityModuleExtensionConfiguration ConfigureClaimType(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityModuleExtensionConsts.EntityNames.ClaimType,
+                configureAction
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationDictionaryExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationDictionaryExtensions.cs
new file mode 100644
index 0000000000..40fbb3b594
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationDictionaryExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class IdentityModuleExtensionConfigurationDictionaryExtensions
+    {
+        public static ModuleExtensionConfigurationDictionary ConfigureIdentity(
+            this ModuleExtensionConfigurationDictionary modules,
+            Action<IdentityModuleExtensionConfiguration> configureAction)
+        {
+            return modules.ConfigureModule(
+                IdentityModuleExtensionConsts.ModuleName,
+                configureAction
+            );
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs
new file mode 100644
index 0000000000..6d2b4c0653
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs
@@ -0,0 +1,16 @@
+namespace Volo.Abp.ObjectExtending
+{
+    public static class IdentityModuleExtensionConsts
+    {
+        public const string ModuleName = "Identity";
+
+        public static class EntityNames
+        {
+            public const string User = "User";
+
+            public const string Role = "Role";
+
+            public const string ClaimType = "ClaimType";
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index 12af875bab..f757c56f1e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -6,6 +6,8 @@ using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectExtending.Modularity;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity
@@ -45,6 +47,27 @@ namespace Volo.Abp.Identity
             AddAbpIdentityOptionsFactory(context.Services);
         }
 
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityModuleExtensionConsts.ModuleName,
+                IdentityModuleExtensionConsts.EntityNames.User,
+                typeof(IdentityUser)
+            );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityModuleExtensionConsts.ModuleName,
+                IdentityModuleExtensionConsts.EntityNames.Role,
+                typeof(IdentityRole)
+            );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityModuleExtensionConsts.ModuleName,
+                IdentityModuleExtensionConsts.EntityNames.ClaimType,
+                typeof(IdentityClaimType)
+            );
+        }
+
         private static void AddAbpIdentityOptionsFactory(IServiceCollection services)
         {
             services.Replace(ServiceDescriptor.Transient<IOptionsFactory<IdentityOptions>, AbpIdentityOptionsFactory>());
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfiguration.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfiguration.cs
new file mode 100644
index 0000000000..78a26900c9
--- /dev/null
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfiguration.cs
@@ -0,0 +1,35 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public class IdentityServerModuleExtensionConfiguration : ModuleExtensionConfiguration
+    {
+        public IdentityServerModuleExtensionConfiguration ConfigureClient(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityServerModuleExtensionConsts.EntityNames.Client,
+                configureAction
+            );
+        }
+
+        public IdentityServerModuleExtensionConfiguration ConfigureApiResource(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityServerModuleExtensionConsts.EntityNames.ApiResource,
+                configureAction
+            );
+        }
+
+        public IdentityServerModuleExtensionConfiguration ConfigureIdentityResource(
+            Action<EntityExtensionConfiguration> configureAction)
+        {
+            return this.ConfigureEntity(
+                IdentityServerModuleExtensionConsts.EntityNames.IdentityResource,
+                configureAction
+            );
+        }
+    }
+}
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfigurationDictionaryExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfigurationDictionaryExtensions.cs
new file mode 100644
index 0000000000..a943ca1839
--- /dev/null
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConfigurationDictionaryExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Volo.Abp.ObjectExtending.Modularity;
+
+namespace Volo.Abp.ObjectExtending
+{
+    public static class IdentityServerModuleExtensionConfigurationDictionaryExtensions
+    {
+        public static ModuleExtensionConfigurationDictionary ConfigureIdentityServer(
+            this ModuleExtensionConfigurationDictionary modules,
+            Action<IdentityServerModuleExtensionConfiguration> configureAction)
+        {
+            return modules.ConfigureModule(
+                IdentityServerModuleExtensionConsts.ModuleName,
+                configureAction
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConsts.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConsts.cs
new file mode 100644
index 0000000000..8623b8830a
--- /dev/null
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/ObjectExtending/IdentityServerModuleExtensionConsts.cs
@@ -0,0 +1,16 @@
+namespace Volo.Abp.ObjectExtending
+{
+    public static class IdentityServerModuleExtensionConsts
+    {
+        public const string ModuleName = "IdentityServer";
+
+        public static class EntityNames
+        {
+            public const string Client = "Client";
+
+            public const string IdentityResource = "IdentityResource";
+
+            public const string ApiResource = "ApiResource";
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
index ef1969fe24..95c8eec537 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
@@ -11,10 +11,11 @@ using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
 using Volo.Abp.IdentityServer.Devices;
-using Volo.Abp.IdentityServer.Grants;
 using Volo.Abp.IdentityServer.IdentityResources;
 using Volo.Abp.IdentityServer.Tokens;
 using Volo.Abp.Modularity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectExtending.Modularity;
 using Volo.Abp.Security;
 using Volo.Abp.Validation;
 
@@ -95,6 +96,27 @@ namespace Volo.Abp.IdentityServer
             }
         }
 
+        public override void PostConfigureServices(ServiceConfigurationContext context)
+        {
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityServerModuleExtensionConsts.ModuleName,
+                IdentityServerModuleExtensionConsts.EntityNames.Client,
+                typeof(Client)
+            );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityServerModuleExtensionConsts.ModuleName,
+                IdentityServerModuleExtensionConsts.EntityNames.IdentityResource,
+                typeof(IdentityResource)
+            );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                IdentityServerModuleExtensionConsts.ModuleName,
+                IdentityServerModuleExtensionConsts.EntityNames.ApiResource,
+                typeof(ApiResource)
+            );
+        }
+
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var options = context.ServiceProvider.GetRequiredService<IOptions<TokenCleanupOptions>>().Value;
diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
index b12b517156..0e89732e56 100644
--- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts
@@ -1,10 +1,11 @@
 import { Injectable, NgZone, Optional, SkipSelf } from '@angular/core';
 import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { Store } from '@ngxs/store';
+import { Store, Actions, ofActionSuccessful } from '@ngxs/store';
 import { noop, Observable } from 'rxjs';
 import { ConfigState } from '../states/config.state';
 import { registerLocale } from '../utils/initial-utils';
 import { Config } from '../models/config';
+import { SetLanguage } from '../actions/session.actions';
 
 type ShouldReuseRoute = (future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot) => boolean;
 
@@ -18,6 +19,7 @@ export class LocalizationService {
   }
 
   constructor(
+    private actions: Actions,
     private store: Store,
     private router: Router,
     private ngZone: NgZone,
@@ -26,6 +28,14 @@ export class LocalizationService {
     otherInstance: LocalizationService,
   ) {
     if (otherInstance) throw new Error('LocalizationService should have only one instance.');
+
+    this.listenToSetLanguage();
+  }
+
+  private listenToSetLanguage() {
+    this.actions
+      .pipe(ofActionSuccessful(SetLanguage))
+      .subscribe(({ payload }) => this.registerLocale(payload));
   }
 
   setRouteReuse(reuse: ShouldReuseRoute) {
diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
index 01a181229f..af706586bb 100644
--- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts
@@ -1,7 +1,8 @@
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Action, createSelector, Selector, State, StateContext, Store } from '@ngxs/store';
-import { of } from 'rxjs';
-import { switchMap, tap } from 'rxjs/operators';
+import { of, throwError } from 'rxjs';
+import { catchError, switchMap, tap } from 'rxjs/operators';
 import snq from 'snq';
 import {
   AddRoute,
@@ -9,10 +10,11 @@ import {
   PatchRouteByName,
   SetEnvironment,
 } from '../actions/config.actions';
+import { RestOccurError } from '../actions/rest.actions';
 import { SetLanguage } from '../actions/session.actions';
+import { ApplicationConfiguration } from '../models/application-configuration';
 import { ABP } from '../models/common';
 import { Config } from '../models/config';
-import { ApplicationConfigurationService } from '../services/application-configuration.service';
 import { organizeRoutes } from '../utils/route-utils';
 import { SessionState } from './session.state';
 
@@ -195,31 +197,37 @@ export class ConfigState {
     return selector;
   }
 
-  constructor(
-    private appConfigurationService: ApplicationConfigurationService,
-    private store: Store,
-  ) {}
+  constructor(private http: HttpClient, private store: Store) {}
 
   @Action(GetAppConfiguration)
   addData({ patchState, dispatch }: StateContext<Config.State>) {
-    return this.appConfigurationService.getConfiguration().pipe(
-      tap(configuration =>
-        patchState({
-          ...configuration,
+    const apiName = this.store.selectSnapshot(ConfigState.getDeep('environment.application.name'));
+    const api = this.store.selectSnapshot(ConfigState.getApiUrl(apiName));
+    return this.http
+      .get<ApplicationConfiguration.Response>(`${api}/api/abp/application-configuration`)
+      .pipe(
+        tap(configuration =>
+          patchState({
+            ...configuration,
+          }),
+        ),
+        switchMap(configuration => {
+          let defaultLang: string =
+            configuration.setting.values['Abp.Localization.DefaultLanguage'];
+
+          if (defaultLang.includes(';')) {
+            defaultLang = defaultLang.split(';')[0];
+          }
+
+          return this.store.selectSnapshot(SessionState.getLanguage)
+            ? of(null)
+            : dispatch(new SetLanguage(defaultLang));
         }),
-      ),
-      switchMap(configuration => {
-        let defaultLang: string = configuration.setting.values['Abp.Localization.DefaultLanguage'];
-
-        if (defaultLang.includes(';')) {
-          defaultLang = defaultLang.split(';')[0];
-        }
-
-        return this.store.selectSnapshot(SessionState.getLanguage)
-          ? of(null)
-          : dispatch(new SetLanguage(defaultLang));
-      }),
-    );
+        catchError(err => {
+          dispatch(new RestOccurError(new HttpErrorResponse({ status: 0, error: err })));
+          return throwError(err);
+        }),
+      );
   }
 
   @Action(PatchRouteByName)
diff --git a/npm/ng-packs/packages/core/src/lib/states/session.state.ts b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
index 9342bacd62..6acbf1d60d 100644
--- a/npm/ng-packs/packages/core/src/lib/states/session.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
@@ -1,26 +1,24 @@
+import { Injectable } from '@angular/core';
 import {
   Action,
+  Actions,
+  ofActionSuccessful,
   Selector,
   State,
   StateContext,
   Store,
-  NgxsOnInit,
-  Actions,
-  ofActionSuccessful,
 } from '@ngxs/store';
-import { from, fromEvent } from 'rxjs';
-import { switchMap, take } from 'rxjs/operators';
+import { OAuthService } from 'angular-oauth2-oidc';
+import { fromEvent } from 'rxjs';
+import { take } from 'rxjs/operators';
 import { GetAppConfiguration } from '../actions/config.actions';
 import {
-  SetLanguage,
-  SetTenant,
   ModifyOpenedTabCount,
+  SetLanguage,
   SetRemember,
+  SetTenant,
 } from '../actions/session.actions';
 import { ABP, Session } from '../models';
-import { LocalizationService } from '../services/localization.service';
-import { OAuthService } from 'angular-oauth2-oidc';
-import { Injectable } from '@angular/core';
 
 @State<Session.State>({
   name: 'SessionState',
@@ -43,12 +41,7 @@ export class SessionState {
     return sessionDetail;
   }
 
-  constructor(
-    private localizationService: LocalizationService,
-    private oAuthService: OAuthService,
-    private store: Store,
-    private actions: Actions,
-  ) {
+  constructor(private oAuthService: OAuthService, private store: Store, private actions: Actions) {
     actions
       .pipe(ofActionSuccessful(GetAppConfiguration))
       .pipe(take(1))
@@ -81,9 +74,7 @@ export class SessionState {
       language: payload,
     });
 
-    return dispatch(new GetAppConfiguration()).pipe(
-      switchMap(() => from(this.localizationService.registerLocale(payload))),
-    );
+    return dispatch(new GetAppConfiguration());
   }
 
   @Action(SetTenant)
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/projection.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/projection.strategy.ts
index e7a62383a2..bc7c9201fd 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/projection.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/projection.strategy.ts
@@ -95,7 +95,10 @@ export class TemplateProjectionStrategy<T extends TemplateRef<any>> extends Proj
 }
 
 export const PROJECTION_STRATEGY = {
-  AppendComponentToBody<T extends Type<unknown>>(component: T, context?: InferredInstanceOf<T>) {
+  AppendComponentToBody<T extends Type<unknown>>(
+    component: T,
+    context?: Partial<InferredInstanceOf<T>>,
+  ) {
     return new RootComponentProjectionStrategy<T>(
       component,
       context && CONTEXT_STRATEGY.Component(context),
@@ -104,7 +107,7 @@ export const PROJECTION_STRATEGY = {
   AppendComponentToContainer<T extends Type<unknown>>(
     component: T,
     containerRef: ViewContainerRef,
-    context?: InferredInstanceOf<T>,
+    context?: Partial<InferredInstanceOf<T>>,
   ) {
     return new ComponentProjectionStrategy<T>(
       component,
@@ -115,7 +118,7 @@ export const PROJECTION_STRATEGY = {
   AppendTemplateToContainer<T extends TemplateRef<unknown>>(
     templateRef: T,
     containerRef: ViewContainerRef,
-    context?: InferredContextOf<T>,
+    context?: Partial<InferredContextOf<T>>,
   ) {
     return new TemplateProjectionStrategy<T>(
       templateRef,
@@ -126,7 +129,7 @@ export const PROJECTION_STRATEGY = {
   PrependComponentToContainer<T extends Type<unknown>>(
     component: T,
     containerRef: ViewContainerRef,
-    context?: InferredInstanceOf<T>,
+    context?: Partial<InferredInstanceOf<T>>,
   ) {
     return new ComponentProjectionStrategy<T>(
       component,
@@ -137,7 +140,7 @@ export const PROJECTION_STRATEGY = {
   PrependTemplateToContainer<T extends TemplateRef<unknown>>(
     templateRef: T,
     containerRef: ViewContainerRef,
-    context?: InferredContextOf<T>,
+    context?: Partial<InferredContextOf<T>>,
   ) {
     return new TemplateProjectionStrategy<T>(
       templateRef,
@@ -148,7 +151,7 @@ export const PROJECTION_STRATEGY = {
   ProjectComponentToContainer<T extends Type<unknown>>(
     component: T,
     containerRef: ViewContainerRef,
-    context?: InferredInstanceOf<T>,
+    context?: Partial<InferredInstanceOf<T>>,
   ) {
     return new ComponentProjectionStrategy<T>(
       component,
@@ -159,7 +162,7 @@ export const PROJECTION_STRATEGY = {
   ProjectTemplateToContainer<T extends TemplateRef<unknown>>(
     templateRef: T,
     containerRef: ViewContainerRef,
-    context?: InferredContextOf<T>,
+    context?: Partial<InferredContextOf<T>>,
   ) {
     return new TemplateProjectionStrategy<T>(
       templateRef,
diff --git a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
index 1ff9ad817e..ae98855913 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts
@@ -7,6 +7,7 @@ import { ABP } from '../models';
 import { Config } from '../models/config';
 import { ApplicationConfigurationService, ConfigStateService } from '../services';
 import { ConfigState } from '../states';
+import { HttpClient } from '@angular/common/http';
 
 export const CONFIG_STATE_DATA = {
   environment: {
@@ -136,19 +137,17 @@ describe('ConfigState', () => {
   let store: SpyObject<Store>;
   let service: ConfigStateService;
   let state: ConfigState;
-  let appConfigService: SpyObject<ApplicationConfigurationService>;
 
   const createService = createServiceFactory({
     service: ConfigStateService,
-    mocks: [ApplicationConfigurationService, Store],
+    mocks: [ApplicationConfigurationService, Store, HttpClient],
   });
 
   beforeEach(() => {
     spectator = createService();
     store = spectator.get(Store);
     service = spectator.service;
-    appConfigService = spectator.get(ApplicationConfigurationService);
-    state = new ConfigState(spectator.get(ApplicationConfigurationService), store);
+    state = new ConfigState(spectator.get(HttpClient), store);
   });
 
   describe('#getAll', () => {
@@ -283,7 +282,7 @@ describe('ConfigState', () => {
   });
 
   describe('#GetAppConfiguration', () => {
-    it('should call the getConfiguration of ApplicationConfigurationService and patch the state', done => {
+    it('should call the app-configuration API and patch the state', done => {
       let patchStateArg;
       let dispatchArg;
 
@@ -299,7 +298,8 @@ describe('ConfigState', () => {
         dispatchArg = a;
         return of(a);
       });
-      appConfigService.getConfiguration.andReturn(res$);
+      const httpClient = spectator.get(HttpClient);
+      httpClient.get.andReturn(res$);
 
       state.addData({ patchState, dispatch } as any).subscribe();
 
diff --git a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
index 0a123b6a4f..e1a678a19f 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
@@ -7,6 +7,7 @@ import { eLayoutType } from '../enums';
 import { ABP } from '../models';
 import { ConfigState, ReplaceableComponentsState } from '../states';
 import { ApplicationConfigurationService } from '../services';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'abp-layout-application',
@@ -92,7 +93,7 @@ describe('DynamicLayoutComponent', () => {
     component: RouterOutletComponent,
     stubsEnabled: false,
     declarations: [DummyComponent, DynamicLayoutComponent],
-    mocks: [ApplicationConfigurationService],
+    mocks: [ApplicationConfigurationService, HttpClient],
     imports: [
       RouterModule,
       DummyLayoutModule,
diff --git a/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
index bfd8948318..5600e3aa39 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts
@@ -1,7 +1,7 @@
 import { Router } from '@angular/router';
 import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest';
-import { Store } from '@ngxs/store';
-import { Observable, of } from 'rxjs';
+import { Store, Actions } from '@ngxs/store';
+import { Observable, of, Subject } from 'rxjs';
 import { LocalizationService } from '../services/localization.service';
 
 describe('LocalizationService', () => {
@@ -13,6 +13,7 @@ describe('LocalizationService', () => {
     service: LocalizationService,
     entryComponents: [],
     mocks: [Store, Router],
+    providers: [{ provide: Actions, useValue: new Subject() }],
   });
 
   beforeEach(() => {
@@ -74,7 +75,7 @@ describe('LocalizationService', () => {
 
     it('should throw an error message when service have an otherInstance', async () => {
       try {
-        const instance = new LocalizationService(null, null, null, {} as any);
+        const instance = new LocalizationService(new Subject(), null, null, null, {} as any);
       } catch (error) {
         expect((error as Error).message).toBe('LocalizationService should have only one instance.');
       }
diff --git a/npm/ng-packs/packages/core/src/lib/tests/session.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/session.state.spec.ts
index cdf616e5d2..8a7953dd16 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/session.state.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/session.state.spec.ts
@@ -25,7 +25,7 @@ describe('SessionState', () => {
 
   beforeEach(() => {
     spectator = createService();
-    state = new SessionState(spectator.get(LocalizationService), null, null, new Subject());
+    state = new SessionState(null, null, new Subject());
   });
 
   describe('#getLanguage', () => {
@@ -49,13 +49,11 @@ describe('SessionState', () => {
         dispatchedData = action;
         return of({});
       });
-      const spy = jest.spyOn(spectator.get(LocalizationService), 'registerLocale');
 
       state.setLanguage({ patchState, dispatch } as any, { payload: 'en' }).subscribe();
 
       expect(patchedData).toEqual({ language: 'en' });
       expect(dispatchedData instanceof GetAppConfiguration).toBeTruthy();
-      expect(spy).toHaveBeenCalledWith('en');
     });
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
index a40d72adf4..8987cda2f9 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
@@ -1,8 +1,8 @@
-<div class="confirmation" *ngIf="visible">
+<div class="confirmation" *ngIf="confirmation$ | async as data">
   <div class="confirmation-backdrop"></div>
   <div class="confirmation-dialog">
     <div class="icon-container" [ngClass]="data.severity" *ngIf="data.severity">
-      <i class="fa icon" [ngClass]="iconClass"></i>
+      <i class="fa icon" [ngClass]="getIconClass(data)"></i>
     </div>
     <div class="content">
       <h1
@@ -20,14 +20,14 @@
       <button
         id="cancel"
         class="confirmation-button confirmation-button--reject"
-        [innerHTML]="data.options?.cancelText || 'AbpUi::Cancel'"
+        [innerHTML]="data.options?.cancelText || 'AbpUi::Cancel' | abpLocalization"
         *ngIf="!data?.options?.hideCancelBtn"
         (click)="close(reject)"
       ></button>
       <button
         id="confirm"
         class="confirmation-button confirmation-button--approve"
-        [innerHTML]="data.options?.yesText || 'AbpUi::Yes'"
+        [innerHTML]="data.options?.yesText || 'AbpUi::Yes' | abpLocalization"
         *ngIf="!data?.options?.hideYesBtn"
         (click)="close(confirm)"
       ></button>
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
index a73382678a..13462612e6 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
+import { ReplaySubject } from 'rxjs';
 import { Confirmation } from '../../models/confirmation';
-import { ConfirmationService } from '../../services/confirmation.service';
 
 @Component({
   selector: 'abp-confirmation',
@@ -12,12 +12,16 @@ export class ConfirmationComponent {
   reject = Confirmation.Status.reject;
   dismiss = Confirmation.Status.dismiss;
 
-  visible = false;
+  confirmation$: ReplaySubject<Confirmation.DialogData>;
 
-  data: Confirmation.DialogData;
+  clear: (status: Confirmation.Status) => void;
 
-  get iconClass(): string {
-    switch (this.data.severity) {
+  close(status: Confirmation.Status) {
+    this.clear(status);
+  }
+
+  getIconClass({ severity }: Confirmation.DialogData): string {
+    switch (severity) {
       case 'info':
         return 'fa-info-circle';
       case 'success':
@@ -30,15 +34,4 @@ export class ConfirmationComponent {
         return 'fa-question-circle';
     }
   }
-
-  constructor(private confirmationService: ConfirmationService) {
-    this.confirmationService.confirmation$.subscribe(confirmation => {
-      this.data = confirmation;
-      this.visible = !!confirmation;
-    });
-  }
-
-  close(status: Confirmation.Status) {
-    this.confirmationService.clear(status);
-  }
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
index 124dcc5185..28d66123a9 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Toaster } from '../../models/toaster';
 import { toastInOut } from '../../animations/toast.animations';
-import { ToasterService } from '../../services/toaster.service';
+import { Toaster } from '../../models/toaster';
+import { ReplaySubject } from 'rxjs';
 
 @Component({
   selector: 'abp-toast-container',
@@ -10,6 +10,8 @@ import { ToasterService } from '../../services/toaster.service';
   animations: [toastInOut],
 })
 export class ToastContainerComponent implements OnInit {
+  toasts$: ReplaySubject<Toaster.Toast[]>;
+
   toasts = [] as Toaster.Toast[];
 
   @Input()
@@ -27,10 +29,8 @@ export class ToastContainerComponent implements OnInit {
   @Input()
   toastKey: string;
 
-  constructor(private toastService: ToasterService) {}
-
   ngOnInit() {
-    this.toastService.toasts$.subscribe(toasts => {
+    this.toasts$.subscribe(toasts => {
       this.toasts = this.toastKey
         ? toasts.filter(t => {
             return t.options && t.options.containerKey !== this.toastKey;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts
index bfd5b32230..2672a93a2a 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts
@@ -1,9 +1,9 @@
-import { Injectable, ComponentRef } from '@angular/core';
-import { Confirmation } from '../models/confirmation';
-import { fromEvent, Observable, Subject, ReplaySubject } from 'rxjs';
-import { takeUntil, debounceTime, filter } from 'rxjs/operators';
 import { Config, ContentProjectionService, PROJECTION_STRATEGY } from '@abp/ng.core';
+import { ComponentRef, Injectable } from '@angular/core';
+import { fromEvent, Observable, ReplaySubject, Subject } from 'rxjs';
+import { debounceTime, filter, takeUntil } from 'rxjs/operators';
 import { ConfirmationComponent } from '../components/confirmation/confirmation.component';
+import { Confirmation } from '../models/confirmation';
 
 @Injectable({ providedIn: 'root' })
 export class ConfirmationService {
@@ -12,14 +12,22 @@ export class ConfirmationService {
 
   private containerComponentRef: ComponentRef<ConfirmationComponent>;
 
+  clear = (status: Confirmation.Status = Confirmation.Status.dismiss) => {
+    this.confirmation$.next();
+    this.status$.next(status);
+  };
+
   constructor(private contentProjectionService: ContentProjectionService) {}
 
   private setContainer() {
-    setTimeout(() => {
-      this.containerComponentRef = this.contentProjectionService.projectContent(
-        PROJECTION_STRATEGY.AppendComponentToBody(ConfirmationComponent),
-      );
+    this.containerComponentRef = this.contentProjectionService.projectContent(
+      PROJECTION_STRATEGY.AppendComponentToBody(ConfirmationComponent, {
+        confirmation$: this.confirmation$,
+        clear: this.clear,
+      }),
+    );
 
+    setTimeout(() => {
       this.containerComponentRef.changeDetectorRef.detectChanges();
     }, 0);
   }
@@ -75,11 +83,6 @@ export class ConfirmationService {
     return this.status$;
   }
 
-  clear(status: Confirmation.Status = Confirmation.Status.dismiss) {
-    this.confirmation$.next();
-    this.status$.next(status);
-  }
-
   private listenToEscape() {
     fromEvent(document, 'keyup')
       .pipe(
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
index 4d178c0ad2..295647309d 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts
@@ -21,7 +21,7 @@ export class ToasterService {
 
   private setContainer() {
     this.containerComponentRef = this.contentProjectionService.projectContent(
-      PROJECTION_STRATEGY.AppendComponentToBody(ToastContainerComponent),
+      PROJECTION_STRATEGY.AppendComponentToBody(ToastContainerComponent, { toasts$: this.toasts$ }),
     );
 
     this.containerComponentRef.changeDetectorRef.detectChanges();
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index 5d53ed2124..8134a44be4 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -92,8 +92,6 @@ export function appendScript(injector: Injector) {
   ],
 })
 export class ThemeSharedModule {
-  constructor(private errorHandler: ErrorHandler) {}
-
   static forRoot(options = {} as RootParams): ModuleWithProviders {
     return {
       ngModule: ThemeSharedModule,
@@ -104,6 +102,12 @@ export class ThemeSharedModule {
           deps: [THEME_SHARED_APPEND_CONTENT],
           useFactory: noop,
         },
+        {
+          provide: APP_INITIALIZER,
+          multi: true,
+          deps: [ErrorHandler],
+          useFactory: noop,
+        },
         { provide: HTTP_ERROR_CONFIG, useValue: options.httpErrorConfig },
         {
           provide: 'HTTP_ERROR_CONFIG',
diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json
index dbb0c09673..735dfdc5d5 100644
--- a/npm/packs/blogging/package.json
+++ b/npm/packs/blogging/package.json
@@ -7,7 +7,8 @@
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.shared": "^2.6.2",
     "@abp/owl.carousel": "^2.6.2",
-    "@abp/tui-editor": "^2.6.2"
+    "@abp/tui-editor": "^2.6.2",
+    "@abp/prismjs": "^2.6.2"
   },
   "gitHead": "eb4a0e507f492e275865b72caeb02ce28d69ae56"
 }
diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js
index 730db8bc97..fa42828306 100644
--- a/npm/packs/core/src/abp.js
+++ b/npm/packs/core/src/abp.js
@@ -76,10 +76,17 @@ var abp = abp || {};
     abp.localization.values = {};
 
     abp.localization.localize = function (key, sourceName) {
+        if (sourceName === '_') { //A convention to suppress the localization
+            return key;
+        }
+
         sourceName = sourceName || abp.localization.defaultResourceName;
+        if (!sourceName) {
+            abp.log.warn('Localization source name is not specified and the defaultResourceName was not defined!');
+            return key;
+        }
 
         var source = abp.localization.values[sourceName];
-
         if (!source) {
             abp.log.warn('Could not find localization source: ' + sourceName);
             return key;
@@ -97,6 +104,29 @@ var abp = abp || {};
         return abp.utils.formatString.apply(this, copiedArguments);
     };
 
+    abp.localization.isLocalized = function (key, sourceName) {
+        if (sourceName === '_') { //A convention to suppress the localization
+            return true;
+        }
+
+        sourceName = sourceName || abp.localization.defaultResourceName;
+        if (!sourceName) {
+            return false;
+        }
+
+        var source = abp.localization.values[sourceName];
+        if (!source) {
+            return false;
+        }
+
+        var value = source[key];
+        if (value === undefined) {
+            return false;
+        }
+
+        return true;
+    };
+
     abp.localization.getResource = function (name) {
         return function () {
             var copiedArguments = Array.prototype.slice.call(arguments, 0);
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index 9c77b05eef..6dfe0041aa 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -107,6 +107,7 @@ $projects = (
     "framework/src/Volo.Abp.UI",
     "framework/src/Volo.Abp.UI.Navigation",
     "framework/src/Volo.Abp.Uow",
+    "framework/src/Volo.Abp.Validation.Abstractions",
     "framework/src/Volo.Abp.Validation",
     "framework/src/Volo.Abp.VirtualFileSystem",
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
index f20fb70a7e..d10c63986d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs
@@ -39,6 +39,8 @@ namespace MyCompanyName.MyProjectName
                     .Add<MyProjectNameResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/MyProjectName");
+                
+                options.DefaultResourceType = typeof(MyProjectNameResource);
             });
         }
     }