diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
index 911782697b..9d05c9e34b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
@@ -17,6 +17,7 @@
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.Contracts\Volo.Abp.AspNetCore.Mvc.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
     <ProjectReference Include="..\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
index 3f1ed47435..6c306073c5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Caching;
 using Volo.Abp.Http.Client;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
@@ -8,7 +9,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
     [DependsOn(
         typeof(AbpHttpClientModule),
         typeof(AbpAspNetCoreMvcContractsModule),
-        typeof(AbpCachingModule)
+        typeof(AbpCachingModule),
+        typeof(AbpLocalizationModule)
         )]
     public class AbpAspNetCoreMvcClientModule : AbpModule
     {
@@ -21,6 +23,11 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
                 RemoteServiceName,
                 asDefaultServices: false
             );
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.GlobalContributors.Add<RemoteLocalizationContributor>();
+            });
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
index f7df64b257..4ceb8bdd1c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using Microsoft.AspNetCore.Http;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
@@ -45,7 +46,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
                 async () => await Proxy.Service.GetAsync(),
                 () => new DistributedCacheEntryOptions
                 {
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(5)
+                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(60) //TODO: Should be configurable. Default value should be higher (5 mins would be good).
                 }
             );
 
@@ -59,7 +60,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 
         protected virtual string CreateCacheKey()
         {
-            return $"ApplicationConfiguration_{CurrentUser.Id?.ToString("N") ?? "Anonymous"}";
+            return $"ApplicationConfiguration_{CurrentUser.Id?.ToString("N") ?? "Anonymous"}_{CultureInfo.CurrentUICulture.Name}";
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClientExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClientExtensions.cs
new file mode 100644
index 0000000000..601a2d1088
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClientExtensions.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public static class CachedApplicationConfigurationClientExtensions
+    {
+        public static ApplicationConfigurationDto Get(this ICachedApplicationConfigurationClient client)
+        {
+            return AsyncHelper.RunSync(client.GetAsync);
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
new file mode 100644
index 0000000000..d994a84335
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public class RemoteLocalizationContributor : ILocalizationResourceContributor
+    {
+        private LocalizationResource _resource;
+        private ICachedApplicationConfigurationClient _applicationConfigurationClient;
+        private ILogger<RemoteLocalizationContributor> _logger;
+
+        public void Initialize(LocalizationResourceInitializationContext context)
+        {
+            _resource = context.Resource;
+            _applicationConfigurationClient = context.ServiceProvider.GetRequiredService<ICachedApplicationConfigurationClient>();
+            _logger = context.ServiceProvider.GetService<ILogger<RemoteLocalizationContributor>>()
+                      ?? NullLogger<RemoteLocalizationContributor>.Instance;
+        }
+
+        public LocalizedString GetOrNull(string cultureName, string name)
+        {
+            var resource = GetResourceOrNull();
+            if (resource == null)
+            {
+                return null;
+            }
+
+            var value = resource.GetOrDefault(name);
+            if (value == null)
+            {
+                return null;
+            }
+
+            return new LocalizedString(name, value);
+        }
+
+        public void Fill(string cultureName, Dictionary<string, LocalizedString> dictionary)
+        {
+            var resource = GetResourceOrNull();
+            if (resource == null)
+            {
+                return;
+            }
+
+            foreach (var keyValue in resource)
+            {
+                dictionary[keyValue.Key] = new LocalizedString(keyValue.Key, keyValue.Value);
+            }
+        }
+
+        private Dictionary<string, string> GetResourceOrNull()
+        {
+            var resource =  _applicationConfigurationClient
+                .Get()
+                .Localization.Values
+                .GetOrDefault(_resource.ResourceName);
+
+            if (resource == null)
+            {
+                _logger.LogWarning($"Could not find the localization resource {_resource.ResourceName} on the remote server!");
+            }
+
+            return resource;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
new file mode 100644
index 0000000000..db3ea6e9a6
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public class RemoteSettingProvider : ISettingProvider, ITransientDependency
+    {
+        protected ICachedApplicationConfigurationClient ConfigurationClient { get; }
+
+        public RemoteSettingProvider(ICachedApplicationConfigurationClient configurationClient)
+        {
+            ConfigurationClient = configurationClient;
+        }
+        
+        public async Task<string> GetOrNullAsync(string name)
+        {
+            var configuration = await ConfigurationClient.GetAsync();
+            return configuration.Setting.Values.GetOrDefault(name);
+        }
+
+        public async Task<List<SettingValue>> GetAllAsync()
+        {
+            var configuration = await ConfigurationClient.GetAsync();
+            return configuration
+                .Setting.Values
+                .Select(s => new SettingValue(s.Key, s.Value))
+                .ToList();
+        }
+    }
+}
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 ecafcb3274..6f41399c29 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
@@ -9,6 +9,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 
         public ApplicationAuthConfigurationDto Auth { get; set; }
 
+        public ApplicationSettingConfigurationDto Setting { get; set; }
+
         public CurrentUserDto CurrentUser { get; set; }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs
new file mode 100644
index 0000000000..40cbd89fd1
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
+{
+    [Serializable]
+    public class ApplicationSettingConfigurationDto
+    {
+        public Dictionary<string, string> Values { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
index 8b01781602..c21e374442 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownButtonTagHelperService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using System.Text.Encodings.Web;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
@@ -22,22 +23,25 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             _serviceProvider = serviceProvider;
         }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            var buttonsAsHtml = GetButtonsAsHtml(context, output);
+            var content = await output.GetChildContentAsync();
+
+            var buttonsAsHtml = GetButtonsAsHtml(context, output, content);
 
             output.PreElement.SetHtmlContent(buttonsAsHtml);
 
             output.TagName = "div";
             output.TagMode = TagMode.StartTagAndEndTag;
+            output.Content.SetContent("");
             output.Attributes.Clear();
         }
 
-        protected virtual string GetButtonsAsHtml(TagHelperContext context, TagHelperOutput output)
+        protected virtual string GetButtonsAsHtml(TagHelperContext context, TagHelperOutput output, TagHelperContent content)
         {
             var buttonBuilder = new StringBuilder("");
 
-            var mainButton = GetMainButton(context, output);
+            var mainButton = GetMainButton(context, output, content);
 
             buttonBuilder.AppendLine(mainButton);
 
@@ -51,10 +55,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             return buttonBuilder.ToString();
         }
 
-        protected virtual string GetMainButton(TagHelperContext context, TagHelperOutput output)
+        protected virtual string GetMainButton(TagHelperContext context, TagHelperOutput output, TagHelperContent content)
         {
             var abpButtonTagHelper = _serviceProvider.GetRequiredService<AbpButtonTagHelper>();
-
+            
             abpButtonTagHelper.Icon = TagHelper.Icon;
             abpButtonTagHelper.Text = TagHelper.Text;
             abpButtonTagHelper.IconType = TagHelper.IconType;
@@ -64,6 +68,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
 
             var buttonTag = GetInnerTagHelper(attributes, context, abpButtonTagHelper, "button", TagMode.StartTagAndEndTag);
 
+            buttonTag.PreContent.SetHtmlContent(content.GetContent());
+
             if ((TagHelper.NavLink ?? false) || (TagHelper.Link ?? false))
             {
                 var linkTag = ConvertButtonToLink(buttonTag);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownTagHelperService.cs
index 945221ff2d..8f37fca5ee 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Dropdown/AbpDropdownTagHelperService.cs
@@ -8,6 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = "div";
+            output.Attributes.AddClass("dropdown");
             output.Attributes.AddClass("btn-group");
 
             SetDirection(context, output);
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 bc48d7b1d8..e90120f517 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
@@ -45,7 +45,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 output.TagMode = TagMode.StartTagAndEndTag;
                 output.TagName = "div";
                 LeaveOnlyGroupAttributes(context, output);
-                output.Attributes.AddClass(isCheckbox ? "form-check" : "form-group");
+                output.Attributes.AddClass(isCheckbox ? "custom-checkbox" : "form-group");
+                output.Attributes.AddClass(isCheckbox ? "custom-control" : "");
                 output.Attributes.AddClass(isCheckbox ? "mb-2" : "");
                 output.Content.SetHtmlContent(output.Content.GetContent() + innerHtml);
             }
@@ -54,7 +55,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         protected virtual string GetFormInputGroupAsHtml(TagHelperContext context, TagHelperOutput output, out bool isCheckbox)
         {
             var inputTag = GetInputTagHelperOutput(context, output, out isCheckbox);
-
+            
             var inputHtml = RenderTagHelperOutput(inputTag, _encoder);
             var label = GetLabelAsHtml(context, output, inputTag, isCheckbox);
             var info = GetInfoAsHtml(context, output, inputTag, isCheckbox);
@@ -92,7 +93,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml, bool isCheckbox)
         {
-            return "<div class=\"" + (isCheckbox ? "form-check" : "form-group") + "\">" +
+            return "<div class=\"" + (isCheckbox ? "custom-checkbox custom-control" : "form-group") + "\">" +
                    Environment.NewLine + innerHtml + Environment.NewLine +
                    "</div>";
         }
@@ -141,7 +142,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             if (isCheckbox)
             {
-                className = "form-check-input";
+                className = "custom-control-input";
             }
 
             inputTagHelperOutput.Attributes.AddClass(className + " " + GetSize(context, output));
@@ -226,7 +227,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return GetLabelAsHtmlUsingTagHelper(context, output, isCheckbox) + GetRequiredSymbol(context, output, inputTag);
             }
 
-            var checkboxClass = isCheckbox ? "class=\"form-check-label\" " : "";
+            var checkboxClass = isCheckbox ? "class=\"custom-control-label\" " : "";
 
             return "<label " + checkboxClass + GetIdAttributeAsString(inputTag) + ">"
                    + TagHelper.Label +
@@ -294,7 +295,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             if (isCheckbox)
             {
-                attributeList.AddClass("form-check-label");
+                attributeList.AddClass("custom-control-label");
             }
 
             return RenderTagHelper(attributeList, context, labelTagHelper, _encoder, "label", TagMode.StartTagAndEndTag, true);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
index 2df060e2e5..6ffcb5409b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@@ -255,11 +255,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             switch (TagHelper.Size)
             {
                 case AbpFormControlSize.Small:
-                    return "form-control-sm";
+                    return "custom-select-sm";
                 case AbpFormControlSize.Medium:
-                    return "form-control-md";
+                    return "custom-select-md";
                 case AbpFormControlSize.Large:
-                    return "form-control-lg";
+                    return "custom-select-lg";
             }
 
             return "";
@@ -277,6 +277,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 attrList.Add(tagHelperAttribute);
             }
 
+            attrList.AddClass("custom-select");
+
             return attrList;
         }
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs
index 78b9d407a5..8fd16f5864 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs
@@ -60,7 +60,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages
 
         public ICurrentTenant CurrentTenant { get; set; }
 
-        public ISettingManager SettingManager { get; set; }
+        public ISettingProvider SettingProvider { get; set; }
 
         public IModelStateValidator ModelValidator { get; set; }
 
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 a91cdebc35..086fbf1d72 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
@@ -4,10 +4,12 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
 using Volo.Abp.Localization;
+using Volo.Abp.Settings;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
@@ -19,18 +21,24 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
         private readonly IAuthorizationService _authorizationService;
         private readonly ICurrentUser _currentUser;
+        private readonly ISettingProvider _settingProvider;
+        private readonly ISettingDefinitionManager _settingDefinitionManager;
 
         public AbpApplicationConfigurationAppService(
             IOptions<AbpLocalizationOptions> localizationOptions,
             IServiceProvider serviceProvider,
             IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
             IAuthorizationService authorizationService,
-            ICurrentUser currentUser)
+            ICurrentUser currentUser, 
+            ISettingProvider settingProvider, 
+            SettingDefinitionManager settingDefinitionManager)
         {
             _serviceProvider = serviceProvider;
             _abpAuthorizationPolicyProvider = abpAuthorizationPolicyProvider;
             _authorizationService = authorizationService;
             _currentUser = currentUser;
+            _settingProvider = settingProvider;
+            _settingDefinitionManager = settingDefinitionManager;
             _localizationOptions = localizationOptions.Value;
         }
 
@@ -40,9 +48,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 
             return new ApplicationConfigurationDto
             {
-                Auth = await GetAuthConfig(),
+                Auth = await GetAuthConfigAsync(),
                 Localization = GetLocalizationConfig(),
-                CurrentUser = GetCurrentUser()
+                CurrentUser = GetCurrentUser(),
+                Setting = await GetSettingConfigAsync()
             };
         }
 
@@ -57,7 +66,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             };
         }
 
-        protected virtual async Task<ApplicationAuthConfigurationDto> GetAuthConfig()
+        protected virtual async Task<ApplicationAuthConfigurationDto> GetAuthConfigAsync()
         {
             var authConfig = new ApplicationAuthConfigurationDto();
 
@@ -97,5 +106,25 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 
             return localizationConfig;
         }
+
+        private async Task<ApplicationSettingConfigurationDto> GetSettingConfigAsync()
+        {
+            var result = new ApplicationSettingConfigurationDto
+            {
+                Values = new Dictionary<string, string>()
+            };
+
+            foreach (var settingDefinition in _settingDefinitionManager.GetAll())
+            {
+                if (!settingDefinition.IsVisibleToClients)
+                {
+                    continue;
+                }
+
+                result.Values[settingDefinition.Name] = await _settingProvider.GetOrNullAsync(settingDefinition.Name);
+            }
+
+            return result;
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
index 7441e78130..4d7efb1d9d 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -48,10 +48,10 @@ namespace Microsoft.AspNetCore.Builder
             using (var scope = app.ApplicationServices.CreateScope())
             {
                 var languageProvider = scope.ServiceProvider.GetRequiredService<ILanguageProvider>();
-                var settingManager = scope.ServiceProvider.GetRequiredService<ISettingManager>();
+                languages = languageProvider.GetLanguages();
 
-                languages = AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync());
-                defaultLanguage = settingManager.GetOrNull(LocalizationSettingNames.DefaultLanguage);
+                var settingProvider = scope.ServiceProvider.GetRequiredService<ISettingProvider>();
+                defaultLanguage = settingProvider.GetOrNull(LocalizationSettingNames.DefaultLanguage);
             }
 
             if (!languages.Any())
diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinition.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinition.cs
index 66c3c78143..bb23757de5 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinition.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinition.cs
@@ -18,6 +18,10 @@ namespace Volo.Abp.Authorization.Permissions
         /// </summary>
         public PermissionDefinition Parent { get; private set; }
 
+        /// <summary>
+        /// A list of allowed providers to get/set value of this permission.
+        /// An empty list indicates that all providers are allowed.
+        /// </summary>
         public List<string> Providers { get; }
 
         public ILocalizableString DisplayName
diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
index ebe2bf0de3..708633b715 100644
--- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
+++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
@@ -103,6 +103,7 @@ namespace Volo.Abp.Caching
                     Logger.LogException(ex, LogLevel.Warning);
                     return null;
                 }
+
                 throw;
             }
             
@@ -194,13 +195,13 @@ namespace Volo.Abp.Caching
             }
         }
 
-        public virtual Task SetAsync(string key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, CancellationToken token = default)
+        public virtual async Task SetAsync(string key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, CancellationToken token = default)
         {
             hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
 
             try
             {
-                return Cache.SetAsync(
+                await Cache.SetAsync(
                     NormalizeKey(key),
                     ObjectSerializer.Serialize(value),
                     options ?? DefaultCacheOptions,
@@ -212,8 +213,9 @@ namespace Volo.Abp.Caching
                 if ((bool)hideErrors)
                 {
                     Logger.LogException(ex, LogLevel.Warning);
-                    return Task.CompletedTask;
+                    return;
                 }
+
                 throw;
             }
         }
@@ -238,21 +240,22 @@ namespace Volo.Abp.Caching
             }
         }
 
-        public virtual Task RefreshAsync(string key, bool? hideErrors = null, CancellationToken token = default)
+        public virtual async Task RefreshAsync(string key, bool? hideErrors = null, CancellationToken token = default)
         {
             hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
 
             try
             {
-                return Cache.RefreshAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
+                await Cache.RefreshAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
             }
             catch (Exception ex)
             {
                 if ((bool)hideErrors)
                 {
                     Logger.LogException(ex, LogLevel.Warning);
-                    return Task.CompletedTask;
+                    return;
                 }
+
                 throw;
             }
         }
@@ -276,21 +279,22 @@ namespace Volo.Abp.Caching
             }
         }
 
-        public virtual Task RemoveAsync(string key, bool? hideErrors = null, CancellationToken token = default)
+        public virtual async Task RemoveAsync(string key, bool? hideErrors = null, CancellationToken token = default)
         {
             hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
 
             try
             {
-                return Cache.RemoveAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
+                await Cache.RemoveAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
             }
             catch (Exception ex)
             {
                 if ((bool)hideErrors)
                 {
                     Logger.LogException(ex, LogLevel.Warning);
-                    return Task.CompletedTask;
+                    return;
                 }
+
                 throw;
             }
         }
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj b/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj
index 9a9ce24d6d..57f909667b 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo.Abp.Ddd.Application.csproj
@@ -20,6 +20,7 @@
     <ProjectReference Include="..\Volo.Abp.Http.Abstractions\Volo.Abp.Http.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Settings\Volo.Abp.Settings.csproj" />
     <ProjectReference Include="..\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs
index 838050c067..84b609b99f 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
 using Volo.Abp.Domain;
@@ -8,17 +7,21 @@ using Volo.Abp.Http.Modeling;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Security;
+using Volo.Abp.Settings;
 using Volo.Abp.Uow;
 using Volo.Abp.Validation;
 
 namespace Volo.Abp.Application
 {
-    [DependsOn(typeof(AbpDddDomainModule))]
-    [DependsOn(typeof(AbpSecurityModule))]
-    [DependsOn(typeof(AbpObjectMappingModule))]
-    [DependsOn(typeof(AbpValidationModule))]
-    [DependsOn(typeof(AbpAuthorizationModule))]
-    [DependsOn(typeof(AbpHttpAbstractionsModule))]
+    [DependsOn(
+        typeof(AbpDddDomainModule),
+        typeof(AbpSecurityModule),
+        typeof(AbpObjectMappingModule),
+        typeof(AbpValidationModule),
+        typeof(AbpAuthorizationModule),
+        typeof(AbpHttpAbstractionsModule),
+        typeof(AbpSettingsModule)
+        )]
     public class AbpDddApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs
index 0e4b13cada..63a749e259 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs
@@ -45,7 +45,7 @@ namespace Volo.Abp.Application.Services
 
         public ICurrentUser CurrentUser { get; set; }
 
-        public ISettingManager SettingManager { get; set; }
+        public ISettingProvider SettingProvider { get; set; }
 
         public IClock Clock { get; set; }
 
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs
index 4a23ecae9a..7648ddc910 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.BackgroundJobs;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Emailing.Templates;
 using Volo.Abp.Emailing.Templates.Virtual;
 using Volo.Abp.Localization;
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderConfiguration.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderConfiguration.cs
index 3293692cfb..3034481471 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderConfiguration.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderConfiguration.cs
@@ -11,16 +11,16 @@ namespace Volo.Abp.Emailing
     {
         public virtual string DefaultFromAddress => GetNotEmptySettingValue(EmailSettingNames.DefaultFromAddress);
 
-        public virtual string DefaultFromDisplayName => SettingManager.GetOrNull(EmailSettingNames.DefaultFromDisplayName);
+        public virtual string DefaultFromDisplayName => SettingProvider.GetOrNull(EmailSettingNames.DefaultFromDisplayName);
 
-        protected readonly ISettingManager SettingManager;
+        protected readonly ISettingProvider SettingProvider;
 
         /// <summary>
         /// Creates a new <see cref="EmailSenderConfiguration"/>.
         /// </summary>
-        protected EmailSenderConfiguration(ISettingManager settingManager)
+        protected EmailSenderConfiguration(ISettingProvider settingProvider)
         {
-            SettingManager = settingManager;
+            SettingProvider = settingProvider;
         }
 
         /// <summary>
@@ -30,7 +30,7 @@ namespace Volo.Abp.Emailing
         /// <returns>Value of the setting</returns>
         protected string GetNotEmptySettingValue(string name)
         {
-            var value = SettingManager.GetOrNull(name);
+            var value = SettingProvider.GetOrNull(name);
 
             if (value.IsNullOrEmpty())
             {
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSenderConfiguration.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSenderConfiguration.cs
index b114cc43dd..678d2cc4f2 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSenderConfiguration.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Smtp/SmtpEmailSenderConfiguration.cs
@@ -18,14 +18,14 @@ namespace Volo.Abp.Emailing.Smtp
 
         public virtual string Password => GetNotEmptySettingValue(EmailSettingNames.Smtp.Password);
 
-        public virtual string Domain => SettingManager.GetOrNull(EmailSettingNames.Smtp.Domain);
+        public virtual string Domain => SettingProvider.GetOrNull(EmailSettingNames.Smtp.Domain);
 
-        public virtual bool EnableSsl => SettingManager.GetOrNull(EmailSettingNames.Smtp.EnableSsl).To<bool>();
+        public virtual bool EnableSsl => SettingProvider.GetOrNull(EmailSettingNames.Smtp.EnableSsl).To<bool>();
 
-        public virtual bool UseDefaultCredentials => SettingManager.GetOrNull(EmailSettingNames.Smtp.UseDefaultCredentials).To<bool>();
+        public virtual bool UseDefaultCredentials => SettingProvider.GetOrNull(EmailSettingNames.Smtp.UseDefaultCredentials).To<bool>();
 
-        public SmtpEmailSenderConfiguration(ISettingManager settingManager)
-            : base(settingManager)
+        public SmtpEmailSenderConfiguration(ISettingProvider settingProvider)
+            : base(settingProvider)
         {
 
         }
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs
index 5c7ffe6508..951292ac66 100644
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.Localization
     {
         public static IReadOnlyList<LanguageInfo> GetLanguages(this ILanguageProvider languageProvider)
         {
-            return AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync());
+            return AsyncHelper.RunSync(languageProvider.GetLanguagesAsync);
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
index d4aab94125..05291caa45 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
+++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
@@ -17,7 +17,6 @@
     <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
     <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Settings\Volo.Abp.Settings.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs
index 05fc338c67..58de6cdb99 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs
+++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyAbstractionsModule.cs
@@ -1,20 +1,13 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Data;
+using Volo.Abp.Data;
 using Volo.Abp.Modularity;
-using Volo.Abp.Settings;
 
 namespace Volo.Abp.MultiTenancy
 {
-    [DependsOn(typeof(AbpDataModule))]
-    [DependsOn(typeof(AbpSettingsModule))]
-    public class AbpMultiTenancyAbstractionsModule : AbpModule //TODO: Rename to AbpMultiTenancyModule
+    [DependsOn(
+        typeof(AbpDataModule)
+        )]
+    public class AbpMultiTenancyAbstractionsModule : AbpModule //TODO: Rename to AbpMultiTenancyModule?
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<SettingOptions>(options =>
-            {
-                options.ValueProviders.Add<TenantSettingValueProvider>();
-            });
-        }
+
     }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantSettingValueProvider.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantSettingValueProvider.cs
deleted file mode 100644
index 542af56fe2..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantSettingValueProvider.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Settings;
-
-namespace Volo.Abp.MultiTenancy
-{
-    public class TenantSettingValueProvider : SettingValueProvider
-    {
-        public const string ProviderName = "Tenant";
-
-        public override string Name => ProviderName;
-
-        protected ICurrentTenant CurrentTenant { get; }
-
-        public TenantSettingValueProvider(ISettingStore settingStore, ICurrentTenant currentTenant)
-            : base(settingStore)
-        {
-            CurrentTenant = currentTenant;
-        }
-
-        public override async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
-        {
-            return await SettingStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
-        }
-
-        public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
-        {
-            return SettingStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
-        }
-
-        public override Task ClearAsync(SettingDefinition setting, string providerKey)
-        {
-            return SettingStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
-        }
-
-        private string NormalizeProviderKey(string providerKey)
-        {
-            if (providerKey == null && CurrentTenant.Id.HasValue)
-            {
-                return CurrentTenant.Id.Value.ToString();
-            }
-
-            return providerKey;
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj b/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
index 42ab46d477..b7e3530ba0 100644
--- a/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
+++ b/framework/src/Volo.Abp.Settings/Volo.Abp.Settings.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
index da871946ae..8c711e12c2 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs
@@ -1,15 +1,27 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Security;
+using Volo.Abp.Users;
 
 namespace Volo.Abp.Settings
 {
     [DependsOn(
         typeof(AbpLocalizationAbstractionsModule),
-        typeof(AbpSecurityModule)
+        typeof(AbpSecurityModule),
+        typeof(AbpMultiTenancyAbstractionsModule)
         )]
     public class AbpSettingsModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<SettingOptions>(options =>
+            {
+                options.ValueProviders.Add<DefaultValueSettingValueProvider>();
+                options.ValueProviders.Add<GlobalSettingValueProvider>();
+                options.ValueProviders.Add<TenantSettingValueProvider>();
+                options.ValueProviders.Add<UserSettingValueProvider>();
+            });
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/DefaultValueSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/DefaultValueSettingValueProvider.cs
index 4a3bb7a29a..f6e1229cee 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/DefaultValueSettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/DefaultValueSettingValueProvider.cs
@@ -14,21 +14,9 @@ namespace Volo.Abp.Settings
 
         }
 
-        public override Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public override Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             return Task.FromResult(setting.DefaultValue);
         }
-
-        public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
-        {
-            setting.DefaultValue = value;
-            return Task.CompletedTask;
-        }
-
-        public override Task ClearAsync(SettingDefinition setting, string providerKey)
-        {
-            setting.DefaultValue = null;
-            return Task.CompletedTask;
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingValueProvider.cs
index 78a38cc703..c8d2e38542 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingValueProvider.cs
@@ -13,19 +13,9 @@ namespace Volo.Abp.Settings
         {
         }
 
-        public override Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public override Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             return SettingStore.GetOrNullAsync(setting.Name, Name, null);
         }
-
-        public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
-        {
-            return SettingStore.SetAsync(setting.Name, value, Name, null);
-        }
-
-        public override Task ClearAsync(SettingDefinition setting, string providerKey)
-        {
-            return SettingStore.DeleteAsync(setting.Name, Name, null);
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingDefinitionManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingDefinitionManager.cs
index 176f5b314c..3ff30c575a 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingDefinitionManager.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingDefinitionManager.cs
@@ -9,5 +9,7 @@ namespace Volo.Abp.Settings
         SettingDefinition Get([NotNull] string name);
 
         IReadOnlyList<SettingDefinition> GetAll();
+
+        SettingDefinition GetOrNull(string name);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingProvider.cs
new file mode 100644
index 0000000000..608cf49105
--- /dev/null
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingProvider.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Settings
+{
+    public interface ISettingProvider
+    {
+        Task<string> GetOrNullAsync([NotNull]string name);
+
+        Task<List<SettingValue>> GetAllAsync();
+    }
+}
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingStore.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingStore.cs
index 40ee68f462..69e6319a2f 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingStore.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingStore.cs
@@ -1,17 +1,14 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 
 namespace Volo.Abp.Settings
 {
     public interface ISettingStore
     {
-        Task<string> GetOrNullAsync([NotNull] string name, [CanBeNull] string providerName, [CanBeNull] string providerKey);
-
-        Task SetAsync([NotNull] string name, [NotNull] string value, [CanBeNull] string providerName, [CanBeNull] string providerKey);
-
-        Task<List<SettingValue>> GetListAsync([CanBeNull] string providerName, [CanBeNull] string providerKey);
-
-        Task DeleteAsync([NotNull] string name, [CanBeNull]string providerName, [CanBeNull]string providerKey);
+        Task<string> GetOrNullAsync(
+            [NotNull] string name,
+            [CanBeNull] string providerName,
+            [CanBeNull] string providerKey
+        );
     }
 }
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingValueProvider.cs
index 3063a7cb15..ab63f47d17 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingValueProvider.cs
@@ -7,12 +7,6 @@ namespace Volo.Abp.Settings
     {
         string Name { get; }
 
-        //TODO: There is a bug here, because we are checking the same providerKey in all providers in a fallback system!
-
-        Task<string> GetOrNullAsync([NotNull] SettingDefinition setting, [CanBeNull] string providerKey);
-
-        Task SetAsync([NotNull] SettingDefinition setting, [NotNull] string value, [CanBeNull] string providerKey);
-
-        Task ClearAsync([NotNull] SettingDefinition setting, [CanBeNull] string providerKey);
+        Task<string> GetOrNullAsync([NotNull] SettingDefinition setting);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinition.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinition.cs
index cbbf810f84..9f02389248 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinition.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinition.cs
@@ -36,6 +36,12 @@ namespace Volo.Abp.Settings
         /// </summary>
         public bool IsVisibleToClients { get; set; }
 
+        /// <summary>
+        /// A list of allowed providers to get/set value of this setting.
+        /// An empty list indicates that all providers are allowed.
+        /// </summary>
+        public List<string> Providers { get; }
+
         /// <summary>
         /// Is this setting inherited from parent scopes.
         /// Default: True.
@@ -72,6 +78,31 @@ namespace Volo.Abp.Settings
             IsEncrypted = isEncrypted;
 
             Properties = new Dictionary<string, object>();
+            Providers = new List<string>();
+        }
+
+        /// <summary>
+        /// Sets a property in the <see cref="Properties"/> dictionary.
+        /// This is a shortcut for nested calls on this object.
+        /// </summary>
+        public virtual SettingDefinition WithProperty(string key, object value)
+        {
+            Properties[key] = value;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets a property in the <see cref="Properties"/> dictionary.
+        /// This is a shortcut for nested calls on this object.
+        /// </summary>
+        public virtual SettingDefinition WithProviders(params string[] providers)
+        {
+            if (!providers.IsNullOrEmpty())
+            {
+                Providers.AddRange(providers);
+            }
+
+            return this;
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerExtensions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerExtensions.cs
deleted file mode 100644
index d9f4f3950b..0000000000
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerExtensions.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-
-namespace Volo.Abp.Settings
-{
-    public static class SettingManagerExtensions
-    {
-        public static async Task<bool> IsTrueAsync([NotNull] this ISettingManager settingManager, [NotNull] string name)
-        {
-            Check.NotNull(settingManager, nameof(settingManager));
-            Check.NotNull(name, nameof(name));
-
-            return string.Equals(
-                await settingManager.GetOrNullAsync(name),
-                "true",
-                StringComparison.OrdinalIgnoreCase
-            );
-        }
-
-        public static async Task<T> GetAsync<T>([NotNull] this ISettingManager settingManager, [NotNull] string name, T defaultValue = default) 
-            where T : struct
-        {
-            Check.NotNull(settingManager, nameof(settingManager));
-            Check.NotNull(name, nameof(name));
-
-            var value = await settingManager.GetOrNullAsync(name);
-            return value?.To<T>() ?? defaultValue;
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerSyncExtensions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerSyncExtensions.cs
deleted file mode 100644
index e5d31bd16c..0000000000
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManagerSyncExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
-using Volo.Abp.Threading;
-
-namespace Volo.Abp.Settings
-{
-    public static class SettingManagerSyncExtensions
-    {
-        public static string GetOrNull([NotNull] this ISettingManager settingManager, [NotNull] string name)
-        {
-            Check.NotNull(settingManager, nameof(settingManager));
-
-            return AsyncHelper.RunSync(() => settingManager.GetOrNullAsync(name));
-        }
-
-        public static List<SettingValue> GetAll([NotNull] this ISettingManager settingManager)
-        {
-            Check.NotNull(settingManager, nameof(settingManager));
-
-            return AsyncHelper.RunSync(settingManager.GetAllAsync);
-        }
-
-        public static T Get<T>([NotNull] this ISettingManager settingManager, [NotNull] string name, T defaultValue = default)
-            where T : struct
-        {
-            return AsyncHelper.RunSync(() => settingManager.GetAsync(name, defaultValue));
-        }
-
-        public static bool IsTrue([NotNull] this ISettingManager settingManager, [NotNull] string name)
-        {
-            return AsyncHelper.RunSync(() => settingManager.IsTrueAsync(name));
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs
index 66b4fa6c05..d916f1a95d 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs
@@ -11,11 +11,7 @@ namespace Volo.Abp.Settings
         public SettingOptions()
         {
             DefinitionProviders = new TypeList<ISettingDefinitionProvider>();
-            ValueProviders = new TypeList<ISettingValueProvider>
-            {
-                typeof(DefaultValueSettingValueProvider),
-                typeof(GlobalSettingValueProvider)
-            };
+            ValueProviders = new TypeList<ISettingValueProvider>();
         }
     }
 }
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs
new file mode 100644
index 0000000000..63abadae12
--- /dev/null
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Settings
+{
+    public class SettingProvider : ISettingProvider, ITransientDependency
+    {
+        protected ISettingDefinitionManager SettingDefinitionManager { get; }
+        protected Lazy<List<ISettingValueProvider>> Providers { get; }
+        protected ISettingEncryptionService SettingEncryptionService { get; }
+        protected SettingOptions Options { get; }
+
+        public SettingProvider(
+            IOptions<SettingOptions> options,
+            IServiceProvider serviceProvider,
+            ISettingDefinitionManager settingDefinitionManager, 
+            ISettingEncryptionService settingEncryptionService)
+        {
+            SettingDefinitionManager = settingDefinitionManager;
+            SettingEncryptionService = settingEncryptionService;
+
+            Options = options.Value;
+
+            Providers = new Lazy<List<ISettingValueProvider>>(
+                () => Options
+                    .ValueProviders
+                    .Select(c => serviceProvider.GetRequiredService(c) as ISettingValueProvider)
+                    .ToList(),
+                true
+            );
+        }
+
+        public virtual async Task<string> GetOrNullAsync(string name)
+        {
+            var setting = SettingDefinitionManager.Get(name);
+            var providers = Enumerable
+                .Reverse(Providers.Value);
+
+            if (setting.Providers.Any())
+            {
+                providers = providers.Where(p => setting.Providers.Contains(p.Name));
+            }
+
+            //TODO: How to implement setting.IsInherited?
+
+            var value = await GetOrNullValueFromProvidersAsync(providers, setting);
+            if (setting.IsEncrypted)
+            {
+                value = SettingEncryptionService.Decrypt(setting, value);
+            }
+
+            return value;
+        }
+
+        public virtual async Task<List<SettingValue>> GetAllAsync()
+        {
+            var settingValues = new Dictionary<string, SettingValue>();
+            var settingDefinitions = SettingDefinitionManager.GetAll();
+
+            foreach (var provider in Providers.Value)
+            {
+                foreach (var setting in settingDefinitions)
+                {
+                    var value = await provider.GetOrNullAsync(setting);
+                    if (value != null)
+                    {
+                        if (setting.IsEncrypted)
+                        {
+                            value = SettingEncryptionService.Decrypt(setting, value);
+                        }
+
+                        settingValues[setting.Name] = new SettingValue(setting.Name, value);
+                    }
+                }
+            }
+
+            return settingValues.Values.ToList();
+        }
+
+        protected virtual async Task<string> GetOrNullValueFromProvidersAsync(
+            IEnumerable<ISettingValueProvider> providers,
+            SettingDefinition setting)
+        {
+            foreach (var provider in providers)
+            {
+                var value = await provider.GetOrNullAsync(setting);
+                if (value != null)
+                {
+                    return value;
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs
new file mode 100644
index 0000000000..d3f372baca
--- /dev/null
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.Settings
+{
+    public static class SettingProviderExtensions
+    {
+        public static async Task<bool> IsTrueAsync([NotNull] this ISettingProvider settingProvider, [NotNull] string name)
+        {
+            Check.NotNull(settingProvider, nameof(settingProvider));
+            Check.NotNull(name, nameof(name));
+
+            return string.Equals(
+                await settingProvider.GetOrNullAsync(name),
+                "true",
+                StringComparison.OrdinalIgnoreCase
+            );
+        }
+
+        public static async Task<T> GetAsync<T>([NotNull] this ISettingProvider settingProvider, [NotNull] string name, T defaultValue = default)
+            where T : struct
+        {
+            Check.NotNull(settingProvider, nameof(settingProvider));
+            Check.NotNull(name, nameof(name));
+
+            var value = await settingProvider.GetOrNullAsync(name);
+            return value?.To<T>() ?? defaultValue;
+        }
+
+        public static string GetOrNull([NotNull] this ISettingProvider settingProvider, [NotNull] string name)
+        {
+            Check.NotNull(settingProvider, nameof(settingProvider));
+            return AsyncHelper.RunSync(() => settingProvider.GetOrNullAsync(name));
+        }
+
+        public static List<SettingValue> GetAll([NotNull] this ISettingProvider settingProvider)
+        {
+            Check.NotNull(settingProvider, nameof(settingProvider));
+            return AsyncHelper.RunSync(settingProvider.GetAllAsync);
+        }
+
+        public static T Get<T>([NotNull] this ISettingProvider settingProvider, [NotNull] string name, T defaultValue = default)
+            where T : struct
+        {
+            return AsyncHelper.RunSync(() => settingProvider.GetAsync(name, defaultValue));
+        }
+
+        public static bool IsTrue([NotNull] this ISettingProvider settingProvider, [NotNull] string name)
+        {
+            return AsyncHelper.RunSync(() => settingProvider.IsTrueAsync(name));
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValue.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValue.cs
index 99b2de33f1..d7f48081dd 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValue.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValue.cs
@@ -1,5 +1,8 @@
-namespace Volo.Abp.Settings
+using System;
+
+namespace Volo.Abp.Settings
 {
+    [Serializable]
     public class SettingValue : NameValue
     {
         /// <summary>
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProvider.cs
index dcd98945e4..5173f80540 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProvider.cs
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProvider.cs
@@ -14,10 +14,6 @@ namespace Volo.Abp.Settings
             SettingStore = settingStore;
         }
 
-        public abstract Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey);
-
-        public abstract Task SetAsync(SettingDefinition setting, string value, string providerKey);
-
-        public abstract Task ClearAsync(SettingDefinition setting, string providerKey);
+        public abstract Task<string> GetOrNullAsync(SettingDefinition setting);
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs
new file mode 100644
index 0000000000..7d8177a8e9
--- /dev/null
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/TenantSettingValueProvider.cs
@@ -0,0 +1,25 @@
+using System.Threading.Tasks;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.Settings
+{
+    public class TenantSettingValueProvider : SettingValueProvider
+    {
+        public const string ProviderName = "Tenant";
+
+        public override string Name => ProviderName;
+
+        protected ICurrentTenant CurrentTenant { get; }
+        
+        public TenantSettingValueProvider(ISettingStore settingStore, ICurrentTenant currentTenant)
+            : base(settingStore)
+        {
+            CurrentTenant = currentTenant;
+        }
+
+        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
+        {
+            return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentTenant.Id?.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs
new file mode 100644
index 0000000000..4a98dcee62
--- /dev/null
+++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/UserSettingValueProvider.cs
@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using Volo.Abp.Users;
+
+namespace Volo.Abp.Settings
+{
+    public class UserSettingValueProvider : SettingValueProvider
+    {
+        public const string ProviderName = "User";
+
+        public override string Name => ProviderName;
+
+        protected ICurrentUser CurrentUser { get; }
+
+        public UserSettingValueProvider(ISettingStore settingStore, ICurrentUser currentUser)
+            : base(settingStore)
+        {
+            CurrentUser = currentUser;
+        }
+
+        public override async Task<string> GetOrNullAsync(SettingDefinition setting)
+        {
+            if (CurrentUser.Id == null)
+            {
+                return null;
+            }
+
+            return await SettingStore.GetOrNullAsync(setting.Name, Name, CurrentUser.Id.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingManager_Tests.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingManager_Tests.cs
deleted file mode 100644
index 82231b8318..0000000000
--- a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingManager_Tests.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Threading.Tasks;
-using Shouldly;
-using Xunit;
-
-namespace Volo.Abp.Settings
-{
-    public class SettingManager_Tests : AbpIntegratedTest<AbpSettingsTestModule>
-    {
-        private readonly ISettingManager _settingManager;
-
-        public SettingManager_Tests()
-        {
-            _settingManager = GetRequiredService<ISettingManager>();
-        }
-
-        [Fact]
-        public async Task Should_Get_Null_If_No_Value_Provided_And_No_Default_Value()
-        {
-            (await _settingManager.GetOrNullAsync(TestSettingNames.TestSettingWithoutDefaultValue))
-                .ShouldBeNull();
-        }
-
-        [Fact]
-        public async Task Should_Get_Default_Value_If_No_Value_Provided_And_There_Is_A_Default_Value()
-        {
-            (await _settingManager.GetOrNullAsync(TestSettingNames.TestSettingWithDefaultValue))
-                .ShouldBe("default-value");
-        }
-
-        [Theory]
-        [InlineData(null)]
-        [InlineData("")]
-        [InlineData("abc")]
-        [InlineData("This is a relatively long text... This is a relatively long text... This is a relatively long text... ")]
-        public async Task Should_Set_And_Get_Encrypted_Values(string plainValue)
-        {
-            (await _settingManager.GetOrNullAsync(TestSettingNames.TestSettingEncrypted))
-                .ShouldBeNull();
-
-            await _settingManager.SetAsync(
-                TestSettingNames.TestSettingEncrypted,
-                plainValue,
-                TestSettingValueProvider.ProviderName,
-                null
-            );
-
-            (await _settingManager.GetOrNullAsync(TestSettingNames.TestSettingEncrypted))
-                .ShouldBe(plainValue);
-        }
-
-        //TODO: Needs more tests with more advanced scenarios.
-    }
-}
diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingProvider_Tests.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingProvider_Tests.cs
new file mode 100644
index 0000000000..6b95b0f755
--- /dev/null
+++ b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingProvider_Tests.cs
@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using Shouldly;
+using Xunit;
+
+namespace Volo.Abp.Settings
+{
+    public class SettingProvider_Tests : AbpIntegratedTest<AbpSettingsTestModule>
+    {
+        private readonly ISettingProvider _settingProvider;
+
+        public SettingProvider_Tests()
+        {
+            _settingProvider = GetRequiredService<ISettingProvider>();
+        }
+
+        [Fact]
+        public async Task Should_Get_Null_If_No_Value_Provided_And_No_Default_Value()
+        {
+            (await _settingProvider.GetOrNullAsync(TestSettingNames.TestSettingWithoutDefaultValue))
+                .ShouldBeNull();
+        }
+
+        [Fact]
+        public async Task Should_Get_Default_Value_If_No_Value_Provided_And_There_Is_A_Default_Value()
+        {
+            (await _settingProvider.GetOrNullAsync(TestSettingNames.TestSettingWithDefaultValue))
+                .ShouldBe("default-value");
+        }
+    }
+}
diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/TestSettingValueProvider.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/TestSettingValueProvider.cs
index e8f5cbc559..2dbe1e5729 100644
--- a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/TestSettingValueProvider.cs
+++ b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/TestSettingValueProvider.cs
@@ -17,21 +17,9 @@ namespace Volo.Abp.Settings
             _values = new Dictionary<string, string>();
         }
 
-        public Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public Task<string> GetOrNullAsync(SettingDefinition setting)
         {
             return Task.FromResult(_values.GetOrDefault(setting.Name));
         }
-
-        public Task SetAsync(SettingDefinition setting, string value, string providerKey)
-        {
-            _values[setting.Name] = value;
-            return Task.CompletedTask;
-        }
-
-        public Task ClearAsync(SettingDefinition setting, string providerKey)
-        {
-            _values.Remove(setting.Name);
-            return Task.CompletedTask;
-        }
     }
 }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
index 69268afed3..8c54ce8005 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -2,7 +2,7 @@
 @using Volo.Abp.Account.Web.Settings
 @model Volo.Abp.Account.Web.Pages.Account.LoginModel
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
-@inject Volo.Abp.Settings.ISettingManager SettingManager
+@inject Volo.Abp.Settings.ISettingProvider SettingProvider
 @if (Model.EnableLocalLogin)
 {
     <form method="post">
@@ -29,7 +29,7 @@
     </form>
 
     <div style="padding-top: 20px">
-        @if (string.Equals(await SettingManager.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase))
+        @if (string.Equals(await SettingProvider.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase))
         {
             <a href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})">@L["Register"]</a>
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
index 67a1934eba..d5ffdefd88 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -48,7 +48,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         protected virtual async Task CheckSelfRegistrationAsync()
         {
-            if (!await SettingManager.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
+            if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
             {
                 throw new UserFriendlyException(L["SelfRegistrationDisabledMessage"]);
             }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
index 5152738794..a47734cd0c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
@@ -28,12 +28,12 @@ namespace Volo.Abp.Identity
         {
             var user = await _userManager.GetByIdAsync(CurrentUser.GetId());
 
-            if (await SettingManager.IsTrueAsync(IdentitySettingNames.User.IsUserNameUpdateEnabled))
+            if (await SettingProvider.IsTrueAsync(IdentitySettingNames.User.IsUserNameUpdateEnabled))
             {
                 (await _userManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
             }
 
-            if (await SettingManager.IsTrueAsync(IdentitySettingNames.User.IsEmailUpdateEnabled))
+            if (await SettingProvider.IsTrueAsync(IdentitySettingNames.User.IsEmailUpdateEnabled))
             {
                 (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
             }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
index 2d7948e20d..733c9195c6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj
@@ -23,6 +23,8 @@
     <ProjectReference Include="..\..\..\users\src\Volo.Abp.Users.Domain\Volo.Abp.Users.Domain.csproj" />
 
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
+
+    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Domain\Volo.Abp.SettingManagement.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
index 2dce5cdfee..f35f84b027 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
@@ -10,15 +10,15 @@ namespace Volo.Abp.Identity
 {
     public class AbpIdentityOptionsFactory : AbpOptionsFactory<IdentityOptions>
     {
-        private readonly ISettingManager _settingManager;
+        private readonly ISettingProvider _settingProvider;
 
         public AbpIdentityOptionsFactory(
             IEnumerable<IConfigureOptions<IdentityOptions>> setups,
             IEnumerable<IPostConfigureOptions<IdentityOptions>> postConfigures,
-            ISettingManager settingManager)
+            ISettingProvider settingProvider)
             : base(setups, postConfigures)
         {
-            _settingManager = settingManager;
+            _settingProvider = settingProvider;
         }
 
         public override IdentityOptions Create(string name)
@@ -32,19 +32,20 @@ namespace Volo.Abp.Identity
 
         protected virtual void OverrideOptions(IdentityOptions options)
         {
-            options.Password.RequiredLength = _settingManager.Get(IdentitySettingNames.Password.RequiredLength, options.Password.RequiredLength);
-            options.Password.RequiredUniqueChars = _settingManager.Get(IdentitySettingNames.Password.RequiredUniqueChars, options.Password.RequiredUniqueChars);
-            options.Password.RequireNonAlphanumeric = _settingManager.Get(IdentitySettingNames.Password.RequireNonAlphanumeric, options.Password.RequireNonAlphanumeric);
-            options.Password.RequireLowercase = _settingManager.Get(IdentitySettingNames.Password.RequireLowercase, options.Password.RequireLowercase);
-            options.Password.RequireUppercase = _settingManager.Get(IdentitySettingNames.Password.RequireUppercase, options.Password.RequireUppercase);
-            options.Password.RequireDigit = _settingManager.Get(IdentitySettingNames.Password.RequireDigit, options.Password.RequireDigit);
-
-            options.Lockout.AllowedForNewUsers = _settingManager.Get(IdentitySettingNames.Lockout.AllowedForNewUsers, options.Lockout.AllowedForNewUsers);
-            options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromSeconds(_settingManager.Get(IdentitySettingNames.Lockout.LockoutDuration, options.Lockout.DefaultLockoutTimeSpan.TotalSeconds.To<int>()));
-            options.Lockout.MaxFailedAccessAttempts = _settingManager.Get(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, options.Lockout.MaxFailedAccessAttempts);
-
-            options.SignIn.RequireConfirmedEmail = _settingManager.Get(IdentitySettingNames.SignIn.RequireConfirmedEmail, options.SignIn.RequireConfirmedEmail);
-            options.SignIn.RequireConfirmedPhoneNumber = _settingManager.Get(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, options.SignIn.RequireConfirmedPhoneNumber);
+            
+            options.Password.RequiredLength = _settingProvider.Get(IdentitySettingNames.Password.RequiredLength, options.Password.RequiredLength);
+            options.Password.RequiredUniqueChars = _settingProvider.Get(IdentitySettingNames.Password.RequiredUniqueChars, options.Password.RequiredUniqueChars);
+            options.Password.RequireNonAlphanumeric = _settingProvider.Get(IdentitySettingNames.Password.RequireNonAlphanumeric, options.Password.RequireNonAlphanumeric);
+            options.Password.RequireLowercase = _settingProvider.Get(IdentitySettingNames.Password.RequireLowercase, options.Password.RequireLowercase);
+            options.Password.RequireUppercase = _settingProvider.Get(IdentitySettingNames.Password.RequireUppercase, options.Password.RequireUppercase);
+            options.Password.RequireDigit = _settingProvider.Get(IdentitySettingNames.Password.RequireDigit, options.Password.RequireDigit);
+
+            options.Lockout.AllowedForNewUsers = _settingProvider.Get(IdentitySettingNames.Lockout.AllowedForNewUsers, options.Lockout.AllowedForNewUsers);
+            options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromSeconds(_settingProvider.Get(IdentitySettingNames.Lockout.LockoutDuration, options.Lockout.DefaultLockoutTimeSpan.TotalSeconds.To<int>()));
+            options.Lockout.MaxFailedAccessAttempts = _settingProvider.Get(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, options.Lockout.MaxFailedAccessAttempts);
+
+            options.SignIn.RequireConfirmedEmail = _settingProvider.Get(IdentitySettingNames.SignIn.RequireConfirmedEmail, options.SignIn.RequireConfirmedEmail);
+            options.SignIn.RequireConfirmedPhoneNumber = _settingProvider.Get(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, options.SignIn.RequireConfirmedPhoneNumber);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityOptions_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityOptions_Tests.cs
index f65ac22021..e48e2171b9 100644
--- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityOptions_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityOptions_Tests.cs
@@ -13,13 +13,13 @@ namespace Volo.Abp.Identity
 {
     public class IdentityOptions_Tests : AbpIdentityDomainTestBase
     {
-        private ISettingManager _settingManager;
+        private ISettingProvider _settingProvider;
 
         protected override void AfterAddApplication(IServiceCollection services)
         {
-            _settingManager = Substitute.For<ISettingManager>();
-            _settingManager.GetOrNullAsync(Arg.Any<string>()).Returns((string) null);
-            services.Replace(ServiceDescriptor.Singleton(_settingManager));
+            _settingProvider = Substitute.For<ISettingProvider>();
+            _settingProvider.GetOrNullAsync(Arg.Any<string>()).Returns((string) null);
+            services.Replace(ServiceDescriptor.Singleton(_settingProvider));
         }
 
         [Fact]
@@ -38,7 +38,7 @@ namespace Volo.Abp.Identity
                 options.Password.RequiredUniqueChars.ShouldBe(1); //Default value
             }
 
-            _settingManager.GetOrNullAsync(IdentitySettingNames.Password.RequiredLength).Returns(Task.FromResult("42"));
+            _settingProvider.GetOrNullAsync(IdentitySettingNames.Password.RequiredLength).Returns(Task.FromResult("42"));
 
             using (var scope2 = ServiceProvider.CreateScope())
             {
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/AbpIdentityServerMongoDbModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/AbpIdentityServerMongoDbModule.cs
index 7aa5bdecb8..1076d19ecf 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/AbpIdentityServerMongoDbModule.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/AbpIdentityServerMongoDbModule.cs
@@ -31,7 +31,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 options.AddRepository<ApiResource, MongoApiResourceRepository>();
                 options.AddRepository<IdentityResource, MongoIdentityResourceRepository>();
                 options.AddRepository<Client, MongoClientRepository>();
-                options.AddRepository<PersistedGrant, MongoPersistedGrantRepository>();
+                options.AddRepository<PersistedGrant, MongoPersistentGrantRepository>();
             });
         }
     }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
index b85d3d3e06..6a3248b9db 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
@@ -10,9 +10,9 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.IdentityServer.MongoDB
 {
-    public class MongoPersistedGrantRepository : MongoDbRepository<IAbpIdentityServerMongoDbContext, PersistedGrant, Guid>, IPersistentGrantRepository
+    public class MongoPersistentGrantRepository : MongoDbRepository<IAbpIdentityServerMongoDbContext, PersistedGrant, Guid>, IPersistentGrantRepository
     {
-        public MongoPersistedGrantRepository(IMongoDbContextProvider<IAbpIdentityServerMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        public MongoPersistentGrantRepository(IMongoDbContextProvider<IAbpIdentityServerMongoDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj
index 81362ed9a1..d922ef7357 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
index f4c1c07e21..d7bafccea8 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
@@ -1,9 +1,21 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Localization;
 
 namespace Volo.Abp.PermissionManagement
 {
+    [DependsOn(
+        typeof(AbpLocalizationModule)
+        )]
     public class AbpPermissionManagementDomainSharedModule : AbpModule
     {
-        
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<AbpPermissionManagementResource>("en");
+            });
+        }
     }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/AbpPermissionManagementResource.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/AbpPermissionManagementResource.cs
new file mode 100644
index 0000000000..7b54011d84
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/AbpPermissionManagementResource.cs
@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.PermissionManagement.Localization
+{
+    [LocalizationResourceName("AbpPermissionManagement")]
+    public class AbpPermissionManagementResource
+    {
+        
+    }
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionManagementProvider.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionManagementProvider.cs
index b765b1360a..9ee60b0a93 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionManagementProvider.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionManagementProvider.cs
@@ -5,7 +5,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.PermissionManagement
 {
-    public interface IPermissionManagementProvider : ISingletonDependency
+    public interface IPermissionManagementProvider : ISingletonDependency //TODO: Consider to remove this pre-assumption
     {
         string Name { get; }
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
index 2e29ab9c29..674f5daa88 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
@@ -5,6 +5,7 @@ namespace Volo.Abp.PermissionManagement
 {
     public class PermissionManagementOptions
     {
+        //TODO: rename to Providers
         public ITypeList<IPermissionManagementProvider> ManagementProviders { get; }
 
         public Dictionary<string, string> ProviderPolicies { get; }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs
index 37c331b40d..e42f2523ac 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs
@@ -1,11 +1,13 @@
-using Microsoft.Extensions.DependencyInjection;
+using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.HttpApi;
-using Volo.Abp.PermissionManagement.Web.Localization.Resources.AbpPermissionManagement;
+using Volo.Abp.PermissionManagement.Localization;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.PermissionManagement.Web
@@ -33,8 +35,11 @@ namespace Volo.Abp.PermissionManagement.Web
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Add<AbpPermissionManagementResource>("en")
-                    .AddVirtualJson("/Localization/Resources/AbpPermissionManagement");
+                    .Get<AbpPermissionManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource),
+                        typeof(AbpUiResource)
+                     ).AddVirtualJson("/Localization/Resources/AbpPermissionManagement");
             });
 
             Configure<AbpAutoMapperOptions>(options =>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/AbpPermissionManagementResource.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/AbpPermissionManagementResource.cs
deleted file mode 100644
index 648423ce5a..0000000000
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/AbpPermissionManagementResource.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Localization.Resources.AbpUi;
-using Volo.Abp.Localization;
-using Volo.Abp.Localization.Resources.AbpValidation;
-
-namespace Volo.Abp.PermissionManagement.Web.Localization.Resources.AbpPermissionManagement
-{
-    [InheritResource(
-        typeof(AbpValidationResource), 
-        typeof(AbpUiResource))]
-    [LocalizationResourceName("AbpPermissionManagement")]
-    public class AbpPermissionManagementResource
-    {
-        
-    }
-}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index 010676bdf8..a2bc020495 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -1,7 +1,7 @@
 @page
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-@using Volo.Abp.PermissionManagement.Web.Localization.Resources.AbpPermissionManagement
+@using Volo.Abp.PermissionManagement.Localization
 @using Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
 @model PermissionManagementModal
 @inject IHtmlLocalizer<AbpPermissionManagementResource> L
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs
index 0ddc49b076..237b226b07 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs
@@ -13,6 +13,15 @@ namespace Volo.Abp.SettingManagement
         )]
     public class AbpSettingManagementDomainModule : AbpModule
     {
-        
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<SettingManagementOptions>(options =>
+            {
+                options.Providers.Add<DefaultValueSettingManagementProvider>();
+                options.Providers.Add<GlobalSettingManagementProvider>();
+                options.Providers.Add<TenantSettingManagementProvider>();
+                options.Providers.Add<UserSettingManagementProvider>();
+            });
+        }
     }
 }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs
new file mode 100644
index 0000000000..3bb4ae2655
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs
@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class DefaultValueSettingManagementProvider : ISettingManagementProvider, ISingletonDependency
+    {
+        public string Name => DefaultValueSettingValueProvider.ProviderName;
+
+        public Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        {
+            return Task.FromResult(setting.DefaultValue);
+        }
+
+        public Task SetAsync(SettingDefinition setting, string value, string providerKey)
+        {
+            throw new AbpException($"Can not set default value of a setting. It is only possible while defining the setting in a {typeof(ISettingDefinitionProvider)} implementation.");
+        }
+
+        public Task ClearAsync(SettingDefinition setting, string providerKey)
+        {
+            throw new AbpException($"Can not clear default value of a setting. It is only possible while defining the setting in a {typeof(ISettingDefinitionProvider)} implementation.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagerExtensions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagerExtensions.cs
new file mode 100644
index 0000000000..20ad176ecc
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagerExtensions.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public static class DefaultValueSettingManagerExtensions
+    {
+        public static Task<string> GetOrNullDefaultAsync(this ISettingManager settingManager, [NotNull] string name, bool fallback = true)
+        {
+            return settingManager.GetOrNullAsync(name, DefaultValueSettingValueProvider.ProviderName, null, fallback);
+        }
+
+        public static Task<List<SettingValue>> GetAllDefaultAsync(this ISettingManager settingManager, bool fallback = true)
+        {
+            return settingManager.GetAllAsync(DefaultValueSettingValueProvider.ProviderName, null, fallback);
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagementProvider.cs
new file mode 100644
index 0000000000..85201eb39a
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagementProvider.cs
@@ -0,0 +1,21 @@
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class GlobalSettingManagementProvider : SettingManagementProvider, ITransientDependency
+    {
+        public override string Name => GlobalSettingValueProvider.ProviderName;
+
+        public GlobalSettingManagementProvider(ISettingManagementStore settingManagementStore) 
+            : base(settingManagementStore)
+        {
+
+        }
+
+        protected override string NormalizeProviderKey(string providerKey)
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingManagerExtensions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagerExtensions.cs
similarity index 93%
rename from framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingManagerExtensions.cs
rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagerExtensions.cs
index d5dabccfe8..e403eb41a3 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/GlobalSettingManagerExtensions.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/GlobalSettingManagerExtensions.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.Settings;
 
-namespace Volo.Abp.Settings
+namespace Volo.Abp.SettingManagement
 {
     public static class GlobalSettingManagerExtensions
     {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementProvider.cs
new file mode 100644
index 0000000000..827b0ff851
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementProvider.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public interface ISettingManagementProvider 
+    {
+        string Name { get; }
+
+        Task<string> GetOrNullAsync([NotNull] SettingDefinition setting, [CanBeNull] string providerKey);
+
+        Task SetAsync([NotNull] SettingDefinition setting, [NotNull] string value, [CanBeNull] string providerKey);
+
+        Task ClearAsync([NotNull] SettingDefinition setting, [CanBeNull] string providerKey);
+    }
+}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementStore.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementStore.cs
new file mode 100644
index 0000000000..eebdc69357
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManagementStore.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public interface ISettingManagementStore
+    {
+        Task<string> GetOrNullAsync(string name, string providerName, string providerKey);
+
+        Task<List<SettingValue>> GetListAsync(string providerName, string providerKey);
+
+        Task SetAsync(string name, string value, string providerName, string providerKey);
+        
+        Task DeleteAsync(string name, string providerName, string providerKey);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManager.cs
similarity index 80%
rename from framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs
rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManager.cs
index 9c794a2c9b..77ae59e664 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ISettingManager.cs
@@ -1,17 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.Settings;
 
-namespace Volo.Abp.Settings
+namespace Volo.Abp.SettingManagement
 {
     public interface ISettingManager
     {
-        Task<string> GetOrNullAsync([NotNull]string name);
-
         Task<string> GetOrNullAsync([NotNull]string name, [NotNull] string providerName, [CanBeNull] string providerKey, bool fallback = true);
 
-        Task<List<SettingValue>> GetAllAsync();
-
         Task<List<SettingValue>> GetAllAsync([NotNull] string providerName, [CanBeNull] string providerKey, bool fallback = true);
 
         Task SetAsync([NotNull] string name, [CanBeNull] string value, [NotNull] string providerName, [CanBeNull] string providerKey, bool forceToSet = false);
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementOptions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementOptions.cs
new file mode 100644
index 0000000000..06ced8e8a8
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementOptions.cs
@@ -0,0 +1,14 @@
+using Volo.Abp.Collections;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class SettingManagementOptions
+    {
+        public ITypeList<ISettingManagementProvider> Providers { get; }
+
+        public SettingManagementOptions()
+        {
+            Providers = new TypeList<ISettingManagementProvider>();
+        }
+    }
+}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
new file mode 100644
index 0000000000..d350cc28d7
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public abstract class SettingManagementProvider : ISettingManagementProvider
+    {
+        public abstract string Name { get; }
+
+        protected ISettingManagementStore SettingManagementStore { get; }
+
+        protected SettingManagementProvider(ISettingManagementStore settingManagementStore)
+        {
+            SettingManagementStore = settingManagementStore;
+        }
+
+        public async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        {
+            return await SettingManagementStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
+        }
+
+        public virtual async Task SetAsync(SettingDefinition setting, string value, string providerKey)
+        {
+            await SettingManagementStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
+        }
+
+        public virtual async Task ClearAsync(SettingDefinition setting, string providerKey)
+        {
+            await SettingManagementStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
+        }
+
+        protected virtual string NormalizeProviderKey(string providerKey)
+        {
+            return providerKey;
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
new file mode 100644
index 0000000000..8c9cfc8684
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Guids;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class SettingManagementStore : ISettingManagementStore, ITransientDependency
+    {
+        protected IDistributedCache<SettingCacheItem> Cache { get; }
+        protected ISettingRepository SettingRepository { get; }
+        protected IGuidGenerator GuidGenerator { get; }
+
+        public SettingManagementStore(
+            ISettingRepository settingRepository, 
+            IGuidGenerator guidGenerator, 
+            IDistributedCache<SettingCacheItem> cache)
+        {
+            SettingRepository = settingRepository;
+            GuidGenerator = guidGenerator;
+            Cache = cache;
+        }
+
+        public async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
+        {
+            var cacheItem = await GetCacheItemAsync(name, providerName, providerKey);
+            return cacheItem.Value;
+        }
+
+        public async Task SetAsync(string name, string value, string providerName, string providerKey)
+        {
+            var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
+            if (setting == null)
+            {
+                setting = new Setting(GuidGenerator.Create(), name, value, providerName, providerKey);
+                await SettingRepository.InsertAsync(setting);
+            }
+            else
+            {
+                setting.Value = value;
+                await SettingRepository.UpdateAsync(setting);
+            }
+        }
+
+        public async Task<List<SettingValue>> GetListAsync(string providerName, string providerKey)
+        {
+            var settings = await SettingRepository.GetListAsync(providerName, providerKey);
+            return settings.Select(s => new SettingValue(s.Name, s.Value)).ToList();
+        }
+
+        public async Task DeleteAsync(string name, string providerName, string providerKey)
+        {
+            var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
+            if (setting != null)
+            {
+                await SettingRepository.DeleteAsync(setting);
+            }
+        }
+
+        protected virtual async Task<SettingCacheItem> GetCacheItemAsync(string name, string providerName, string providerKey)
+        {
+            var cacheKey = CalculateCacheKey(name, providerName, providerKey);
+            var cacheItem = await Cache.GetAsync(cacheKey);
+
+            if (cacheItem != null)
+            {
+                return cacheItem;
+            }
+
+            var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
+
+            cacheItem = new SettingCacheItem(setting?.Value);
+
+            await Cache.SetAsync(
+                cacheKey,
+                cacheItem
+            );
+
+            return cacheItem;
+        }
+
+        protected virtual string CalculateCacheKey(string name, string providerName, string providerKey)
+        {
+            return SettingCacheItem.CalculateCacheKey(name, providerName, providerKey);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs
similarity index 71%
rename from framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs
index 33087bab77..cfb4cccbe3 100644
--- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs
@@ -5,18 +5,20 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Settings;
 
-namespace Volo.Abp.Settings
+namespace Volo.Abp.SettingManagement
 {
     public class SettingManager : ISettingManager, ISingletonDependency
     {
         protected ISettingDefinitionManager SettingDefinitionManager { get; }
         protected ISettingEncryptionService SettingEncryptionService { get; }
-        protected Lazy<List<ISettingValueProvider>> Providers { get; }
-        protected SettingOptions Options { get; }
+        protected List<ISettingManagementProvider> Providers => _lazyProviders.Value;
+        protected SettingManagementOptions Options { get; }
+        private readonly Lazy<List<ISettingManagementProvider>> _lazyProviders;
 
         public SettingManager(
-            IOptions<SettingOptions> options,
+            IOptions<SettingManagementOptions> options,
             IServiceProvider serviceProvider,
             ISettingDefinitionManager settingDefinitionManager,
             ISettingEncryptionService settingEncryptionService)
@@ -25,22 +27,17 @@ namespace Volo.Abp.Settings
             SettingEncryptionService = settingEncryptionService;
             Options = options.Value;
 
-            Providers = new Lazy<List<ISettingValueProvider>>(
+            //TODO: Instead, use IHybridServiceScopeFactory and create a scope..?
+
+            _lazyProviders = new Lazy<List<ISettingManagementProvider>>(
                 () => Options
-                    .ValueProviders
-                    .Select(c => serviceProvider.GetRequiredService(c) as ISettingValueProvider)
+                    .Providers
+                    .Select(c => serviceProvider.GetRequiredService(c) as ISettingManagementProvider)
                     .ToList(),
                 true
             );
         }
-
-        public virtual Task<string> GetOrNullAsync(string name)
-        {
-            Check.NotNull(name, nameof(name));
-
-            return GetOrNullInternalAsync(name, null, null);
-        }
-
+        
         public virtual Task<string> GetOrNullAsync(string name, string providerName, string providerKey, bool fallback = true)
         {
             Check.NotNull(name, nameof(name));
@@ -49,37 +46,12 @@ namespace Volo.Abp.Settings
             return GetOrNullInternalAsync(name, providerName, providerKey, fallback);
         }
 
-        public virtual async Task<List<SettingValue>> GetAllAsync()
-        {
-            var settingValues = new Dictionary<string, SettingValue>();
-            var settingDefinitions = SettingDefinitionManager.GetAll();
-
-            foreach (var provider in Providers.Value)
-            {
-                foreach (var setting in settingDefinitions)
-                {
-                    var value = await provider.GetOrNullAsync(setting, null);
-                    if (value != null)
-                    {
-                        if (setting.IsEncrypted)
-                        {
-                            value = SettingEncryptionService.Decrypt(setting, value);
-                        }
-
-                        settingValues[setting.Name] = new SettingValue(setting.Name, value);
-                    }
-                }
-            }
-
-            return settingValues.Values.ToList();
-        }
-
         public virtual async Task<List<SettingValue>> GetAllAsync(string providerName, string providerKey, bool fallback = true)
         {
             Check.NotNull(providerName, nameof(providerName));
 
             var settingDefinitions = SettingDefinitionManager.GetAll();
-            var providers = Enumerable.Reverse(Providers.Value)
+            var providers = Enumerable.Reverse(Providers)
                 .SkipWhile(c => c.Name != providerName);
 
             if (!fallback)
@@ -104,7 +76,10 @@ namespace Volo.Abp.Settings
                 {
                     foreach (var provider in providerList)
                     {
-                        var providerValue = await provider.GetOrNullAsync(setting, providerKey);
+                        var providerValue = await provider.GetOrNullAsync(
+                            setting,
+                            provider.Name == providerName ? providerKey : null
+                        );
                         if (providerValue != null)
                         {
                             value = providerValue;
@@ -113,7 +88,10 @@ namespace Volo.Abp.Settings
                 }
                 else
                 {
-                    value = await providerList[0].GetOrNullAsync(setting, providerKey);
+                    value = await providerList[0].GetOrNullAsync(
+                        setting,
+                        providerKey
+                    );
                 }
 
                 if (setting.IsEncrypted)
@@ -138,7 +116,7 @@ namespace Volo.Abp.Settings
             var setting = SettingDefinitionManager.Get(name);
 
             var providers = Enumerable
-                .Reverse(Providers.Value)
+                .Reverse(Providers)
                 .SkipWhile(p => p.Name != providerName)
                 .ToList();
 
@@ -154,10 +132,10 @@ namespace Volo.Abp.Settings
 
             if (providers.Count > 1 && !forceToSet && setting.IsInherited && value != null)
             {
-                //Clear the value if it's same as it's fallback value
-                var fallbackValue = await GetOrNullInternalAsync(name, providers[1].Name, providerKey);
+                var fallbackValue = await GetOrNullInternalAsync(name, providers[1].Name, null);
                 if (fallbackValue == value)
                 {
+                    //Clear the value if it's same as it's fallback value
                     value = null;
                 }
             }
@@ -186,7 +164,7 @@ namespace Volo.Abp.Settings
         {
             var setting = SettingDefinitionManager.Get(name);
             var providers = Enumerable
-                .Reverse(Providers.Value);
+                .Reverse(Providers);
 
             if (providerName != null)
             {
@@ -198,30 +176,26 @@ namespace Volo.Abp.Settings
                 providers = providers.TakeWhile(c => c.Name == providerName);
             }
 
-            var value = await GetOrNullValueFromProvidersAsync(providerKey, providers, setting);
-            if (setting.IsEncrypted)
-            {
-                value = SettingEncryptionService.Decrypt(setting, value);
-            }
-
-            return value;
-        }
-
-        protected virtual async Task<string> GetOrNullValueFromProvidersAsync(
-            string providerKey, 
-            IEnumerable<ISettingValueProvider> providers, 
-            SettingDefinition setting)
-        {
+            string value = null;
             foreach (var provider in providers)
             {
-                var value = await provider.GetOrNullAsync(setting, providerKey);
+                value = await provider.GetOrNullAsync(
+                    setting,
+                    provider.Name == providerName ? providerKey : null
+                );
+
                 if (value != null)
                 {
-                    return value;
+                    break;
                 }
             }
 
-            return null;
+            if (setting.IsEncrypted)
+            {
+                value = SettingEncryptionService.Decrypt(setting, value);
+            }
+
+            return value;
         }
     }
 }
\ No newline at end of file
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagementProvider.cs
new file mode 100644
index 0000000000..947e2d8799
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagementProvider.cs
@@ -0,0 +1,31 @@
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class TenantSettingManagementProvider : SettingManagementProvider, ITransientDependency
+    {
+        public override string Name => TenantSettingValueProvider.ProviderName;
+
+        protected ICurrentTenant CurrentTenant { get; }
+
+        public TenantSettingManagementProvider(
+            ISettingManagementStore settingManagementStore,
+            ICurrentTenant currentTenant)
+            : base(settingManagementStore)
+        {
+            CurrentTenant = currentTenant;
+        }
+
+        protected override string NormalizeProviderKey(string providerKey)
+        {
+            if (providerKey != null)
+            {
+                return providerKey;
+            }
+
+            return CurrentTenant.Id?.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/Settings/TenantSettingManagerExtensions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagerExtensions.cs
similarity index 96%
rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/Settings/TenantSettingManagerExtensions.cs
rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagerExtensions.cs
index f3500bf80a..f5cc345931 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/Settings/TenantSettingManagerExtensions.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/TenantSettingManagerExtensions.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
 
-namespace Volo.Abp.Settings
+namespace Volo.Abp.SettingManagement
 {
     public static class TenantSettingManagerExtensions
     {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagementProvider.cs
new file mode 100644
index 0000000000..790e0eaa0c
--- /dev/null
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagementProvider.cs
@@ -0,0 +1,31 @@
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Settings;
+using Volo.Abp.Users;
+
+namespace Volo.Abp.SettingManagement
+{
+    public class UserSettingManagementProvider : SettingManagementProvider, ITransientDependency
+    {
+        public override string Name => UserSettingValueProvider.ProviderName;
+
+        protected ICurrentUser CurrentUser { get; }
+
+        public UserSettingManagementProvider(
+            ISettingManagementStore settingManagementStore,
+            ICurrentUser currentUser)
+            : base(settingManagementStore)
+        {
+            CurrentUser = currentUser;
+        }
+
+        protected override string NormalizeProviderKey(string providerKey)
+        {
+            if (providerKey != null)
+            {
+                return providerKey;
+            }
+
+            return CurrentUser.Id?.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Settings/UserSettingManagerExtensions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagerExtensions.cs
similarity index 96%
rename from modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Settings/UserSettingManagerExtensions.cs
rename to modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagerExtensions.cs
index 4e3a1dd574..2b58382463 100644
--- a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Settings/UserSettingManagerExtensions.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/UserSettingManagerExtensions.cs
@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.Settings;
 using Volo.Abp.Users;
 
-namespace Volo.Abp.Settings
+namespace Volo.Abp.SettingManagement
 {
     //TODO: Consider to move to another package?
 
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs
index ce0a71b6db..79ae4702c8 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs
@@ -22,7 +22,7 @@ namespace Volo.Abp.SettingManagement
 
         public void Build()
         {
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySetting1",
@@ -31,7 +31,7 @@ namespace Volo.Abp.SettingManagement
                 )
             );
 
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySetting2",
@@ -40,7 +40,7 @@ namespace Volo.Abp.SettingManagement
                 )
             );
 
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySetting2",
@@ -50,7 +50,7 @@ namespace Volo.Abp.SettingManagement
                 )
             );
 
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySetting2",
@@ -60,7 +60,7 @@ namespace Volo.Abp.SettingManagement
                 )
             );
 
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySettingWithoutInherit",
@@ -69,7 +69,7 @@ namespace Volo.Abp.SettingManagement
                 )
             );
 
-            _settingRepository.InsertAsync(
+            _settingRepository.Insert(
                 new Setting(
                     _guidGenerator.Create(),
                     "MySettingWithoutInherit",
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs
index 0e9543cc96..1dafc31570 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_Basic_Tests.cs
@@ -8,37 +8,39 @@ namespace Volo.Abp.SettingManagement
     public class SettingManager_Basic_Tests : SettingsTestBase
     {
         private readonly ISettingManager _settingManager;
+        private readonly ISettingProvider _settingProvider;
 
         public SettingManager_Basic_Tests()
         {
             _settingManager = GetRequiredService<ISettingManager>();
+            _settingProvider = GetRequiredService<ISettingProvider>();
         }
 
         [Fact]
         public async Task Should_Throw_Exception_When_Try_To_Get_An_Undefined_Setting()
         {
             await Assert.ThrowsAsync<AbpException>(
-                async () => await _settingManager.GetOrNullAsync("UndefinedSetting")
+                async () => await _settingProvider.GetOrNullAsync("UndefinedSetting")
             );
         }
 
         [Fact]
         public async Task Should_Get_Default_Value_If_Not_Set_In_Store()
         {
-            var value = await _settingManager.GetOrNullAsync("SettingNotSetInStore");
+            var value = await _settingProvider.GetOrNullAsync("SettingNotSetInStore");
             value.ShouldBe("default-value");
         }
 
         [Fact]
         public async Task Should_Get_Base_Store_Value()
         {
-            (await _settingManager.GetOrNullAsync("MySetting1")).ShouldBe("42");
+            (await _settingProvider.GetOrNullAsync("MySetting1")).ShouldBe("42");
         }
 
         [Fact]
         public async Task Should_Get_All_Base_Store_Values()
         {
-            var settingValues = await _settingManager.GetAllAsync();
+            var settingValues = await _settingProvider.GetAllAsync();
             settingValues.ShouldContain(sv => sv.Name == "MySetting1" && sv.Value == "42");
             settingValues.ShouldContain(sv => sv.Name == "MySetting2" && sv.Value == "default-store-value");
             settingValues.ShouldContain(sv => sv.Name == "SettingNotSetInStore" && sv.Value == "default-value");
@@ -50,7 +52,7 @@ namespace Volo.Abp.SettingManagement
             await _settingManager.SetGlobalAsync("MySetting1", "43");
 
             (await _settingManager.GetOrNullGlobalAsync("MySetting1")).ShouldBe("43");
-            (await _settingManager.GetOrNullAsync("MySetting1")).ShouldBe("43");
+            (await _settingProvider.GetOrNullAsync("MySetting1")).ShouldBe("43");
         }
     }
 }
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs
index 90fff7e640..4b42572f0a 100644
--- a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs
+++ b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingManager_User_Tests.cs
@@ -1,25 +1,27 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Shouldly;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using Volo.Abp.Settings;
 using Volo.Abp.Users;
 using Xunit;
 
 namespace Volo.Abp.SettingManagement
 {
-    public class SettingManager_User_Tests: SettingsTestBase
+    public class SettingManager_User_Tests : SettingsTestBase
     {
         private Guid? _currentUserId;
 
         private readonly ISettingManager _settingManager;
+        private readonly ISettingProvider _settingProvider;
         private readonly SettingTestData _testData;
 
         public SettingManager_User_Tests()
         {
             _settingManager = GetRequiredService<ISettingManager>();
+            _settingProvider = GetRequiredService<ISettingProvider>();
             _testData = GetRequiredService<SettingTestData>();
         }
 
@@ -53,17 +55,17 @@ namespace Volo.Abp.SettingManagement
         public async Task Should_Get_From_Store_For_Current_User()
         {
             _currentUserId = _testData.User1Id;
-            (await _settingManager.GetOrNullAsync("MySetting2")).ShouldBe("user1-store-value");
+            (await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("user1-store-value");
 
             _currentUserId = _testData.User2Id;
-            (await _settingManager.GetOrNullAsync("MySetting2")).ShouldBe("user2-store-value");
+            (await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("user2-store-value");
         }
 
         [Fact]
         public async Task Should_Fallback_To_Default_Store_Value_When_No_Value_For_Current_User()
         {
             _currentUserId = Guid.NewGuid();
-            (await _settingManager.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
+            (await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
         }
 
         [Fact]
@@ -80,7 +82,7 @@ namespace Volo.Abp.SettingManagement
         public async Task Should_Fallback_To_Default_Store_Value_When_No_Value_For_Current_User_With_GetOrNullForCurrentUserAsync()
         {
             _currentUserId = Guid.NewGuid();
-            (await _settingManager.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
+            (await _settingProvider.GetOrNullAsync("MySetting2")).ShouldBe("default-store-value");
         }
 
         [Fact]
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
index f27813e04b..eac254b2a9 100644
--- a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
+++ b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/AbpUsersAbstractionModule.cs
@@ -1,8 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EventBus;
+using Volo.Abp.EventBus;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.Settings;
 
 namespace Volo.Abp.Users
 {
@@ -14,12 +12,6 @@ namespace Volo.Abp.Users
         )]
     public class AbpUsersAbstractionModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<SettingOptions>(options =>
-            {
-                options.ValueProviders.Add<UserSettingValueProvider>();
-            });
-        }
+
     }
 }
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserSettingValueProvider.cs b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserSettingValueProvider.cs
deleted file mode 100644
index 345b0e6929..0000000000
--- a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserSettingValueProvider.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Settings;
-
-namespace Volo.Abp.Users
-{
-    //TODO: Optimization: Get all settings and cache it!
-    //TODO: Think if it's true to have this provider in this project?
-
-    public class UserSettingValueProvider : SettingValueProvider
-    {
-        public const string ProviderName = "User";
-
-        public override string Name => ProviderName;
-
-        protected ICurrentUser CurrentUser { get; }
-
-        public UserSettingValueProvider(ISettingStore settingStore, ICurrentUser currentUser)
-            : base(settingStore)
-        {
-            CurrentUser = currentUser;
-        }
-
-        public override async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
-        {
-            return await SettingStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
-        }
-
-        public override Task SetAsync(SettingDefinition setting, string value, string providerKey)
-        {
-            return SettingStore.SetAsync(setting.Name, value, Name, NormalizeProviderKey(providerKey));
-        }
-
-        public override Task ClearAsync(SettingDefinition setting, string providerKey)
-        {
-            return SettingStore.DeleteAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
-        }
-
-        private string NormalizeProviderKey(string providerKey)
-        {
-            if (providerKey == null && CurrentUser.Id.HasValue)
-            {
-                return CurrentUser.Id.Value.ToString();
-            }
-
-            return providerKey;
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs
index fe3979df02..d3d6a01185 100644
--- a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs
+++ b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs
@@ -1,14 +1,12 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.Security;
-using Volo.Abp.Settings;
 
 namespace Volo.Abp.Users
 {
     [DependsOn(
         typeof(AbpUsersDomainSharedModule),
         typeof(AbpUsersAbstractionModule),
-        typeof(AbpSecurityModule),
-        typeof(AbpSettingsModule)
+        typeof(AbpSecurityModule)
         )]
     public class AbpUsersDomainModule : AbpModule
     {
diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js
index 4c87489e22..7e44e6256e 100644
--- a/npm/packs/core/src/abp.js
+++ b/npm/packs/core/src/abp.js
@@ -161,6 +161,25 @@ var abp = abp || {};
         abp.auth.setToken();
     }
 
+    /* SETTINGS *************************************************/
+
+    abp.setting = abp.setting || {};
+
+    abp.setting.values = abp.setting.values || {};
+    
+    abp.setting.get = function (name) {
+        return abp.setting.values[name];
+    };
+
+    abp.setting.getBoolean = function (name) {
+        var value = abp.setting.get(name);
+        return value == 'true' || value == 'True';
+    };
+
+    abp.setting.getInt = function (name) {
+        return parseInt(abp.setting.values[name]);
+    };
+    
     /* NOTIFICATION *********************************************/
     //Defines Notification API, not implements it
 
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml
index a89f786992..4165781b58 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml
@@ -1,5 +1,8 @@
 @page
+@using ProductManagement
+@using Volo.Abp.Settings
 @model PublicWebSite.Host.Pages.ProductsModel
+@inject ISettingProvider SettingProvider
 <h1>Our Products</h1>
 <ul>
     @foreach (var product in Model.Products.Items)
@@ -9,4 +12,7 @@
             <i>Stock count: @product.StockCount</i>
         </li>
     }
-</ul>
\ No newline at end of file
+</ul>
+
+@* An example to show how to read settings from the client side / UI *@
+<p><i>Maximum allowed page size: @await SettingProvider.GetOrNullAsync(ProductManagementSettings.MaxPageSize)</i></p>
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml.cs
index d82aa68175..e67ebff531 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml.cs
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Pages/Products.cshtml.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using MyCompanyName.ProductManagement;
 using ProductManagement;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/IPublicProductAppService.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/IPublicProductAppService.cs
index 00934075e9..b47e61fb02 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/IPublicProductAppService.cs
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/IPublicProductAppService.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
-using ProductManagement;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
-namespace MyCompanyName.ProductManagement
+namespace ProductManagement
 {
     public interface IPublicProductAppService : IApplicationService
     {
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs
index d8697022b8..53fe58cbe0 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs
@@ -3,6 +3,7 @@ using Volo.Abp.Application;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.Settings;
 using Volo.Abp.VirtualFileSystem;
 
 namespace ProductManagement
@@ -31,6 +32,11 @@ namespace ProductManagement
                     .Get<ProductManagementResource>()
                     .AddVirtualJson("/ProductManagement/Localization/ApplicationContracts");
             });
+
+            Configure<SettingOptions>(options =>
+            {
+                options.DefinitionProviders.Add<ProductManagementSettingDefinitionProvider>();
+            });
         }
     }
 }
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettingDefinitionProvider.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettingDefinitionProvider.cs
new file mode 100644
index 0000000000..98842127e1
--- /dev/null
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettingDefinitionProvider.cs
@@ -0,0 +1,22 @@
+using Volo.Abp.Settings;
+
+namespace ProductManagement
+{
+    /* These setting definitions will be visible to clients that has a ProductManagement.Application.Contracts
+     * reference. Settings those should be hidden from clients should be defined in the ProductManagement.Application
+     * package.
+     */
+    public class ProductManagementSettingDefinitionProvider : SettingDefinitionProvider
+    {
+        public override void Define(ISettingDefinitionContext context)
+        {
+            context.Add(
+                new SettingDefinition(
+                    ProductManagementSettings.MaxPageSize,
+                    "100",
+                    isVisibleToClients: true
+                )
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettings.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettings.cs
new file mode 100644
index 0000000000..da420547d0
--- /dev/null
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementSettings.cs
@@ -0,0 +1,12 @@
+namespace ProductManagement
+{
+    public static class ProductManagementSettings
+    {
+        public const string GroupName = "ProductManagement";
+
+        /// <summary>
+        /// Maximum allowed page size for paged list requests.
+        /// </summary>
+        public const string MaxPageSize = GroupName + ".MaxPageSize";
+    }
+}
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductAppService.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductAppService.cs
index e11eac435f..90d16ec7b5 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductAppService.cs
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductAppService.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using ProductManagement;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
 
 namespace ProductManagement
 {
@@ -23,6 +21,8 @@ namespace ProductManagement
 
         public async Task<PagedResultDto<ProductDto>> GetListPagedAsync(PagedAndSortedResultRequestDto input)
         {
+            await NormalizeMaxResultCountAsync(input);
+
             var products = await _productRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount);
 
             var totalCount = await _productRepository.GetCountAsync();
@@ -32,7 +32,7 @@ namespace ProductManagement
             return new PagedResultDto<ProductDto>(totalCount, dtos);
         }
 
-        public async Task<ListResultDto<ProductDto>> GetListAsync()
+        public async Task<ListResultDto<ProductDto>> GetListAsync() //TODO: Why there are two GetList. GetListPagedAsync would be enough (rename it to GetList)!
         {
             var products = await _productRepository.GetListAsync();
 
@@ -73,5 +73,14 @@ namespace ProductManagement
         {
             await _productRepository.DeleteAsync(id);
         }
+
+        private async Task NormalizeMaxResultCountAsync(PagedAndSortedResultRequestDto input)
+        {
+            var maxPageSize = (await SettingProvider.GetOrNullAsync(ProductManagementSettings.MaxPageSize))?.To<int>();
+            if (maxPageSize.HasValue && input.MaxResultCount > maxPageSize.Value)
+            {
+                input.MaxResultCount = maxPageSize.Value;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementApplicationModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementApplicationModule.cs
index 999f6385ca..4816844d93 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementApplicationModule.cs
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementApplicationModule.cs
@@ -1,6 +1,5 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.Settings;
 
 namespace ProductManagement
 {
@@ -17,11 +16,6 @@ namespace ProductManagement
             {
                 options.AddProfile<ProductManagementApplicationAutoMapperProfile>(validate: true);
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<ProductManagementSettingDefinitionProvider>();
-            });
         }
     }
 }
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettingDefinitionProvider.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettingDefinitionProvider.cs
deleted file mode 100644
index 168e441945..0000000000
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettingDefinitionProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.Abp.Settings;
-
-namespace ProductManagement
-{
-    public class ProductManagementSettingDefinitionProvider : SettingDefinitionProvider
-    {
-        public override void Define(ISettingDefinitionContext context)
-        {
-            /* Define module settings here.
-             * Use names from ProductManagementSettings class.
-             */
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettings.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettings.cs
deleted file mode 100644
index 19ca732df8..0000000000
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/ProductManagementSettings.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace ProductManagement
-{
-    public static class ProductManagementSettings
-    {
-        public const string GroupName = "ProductManagement";
-
-        /* Add constants for setting names. Example:
-         * public const string MySettingName = GroupName + ".MySettingName";
-         */
-    }
-}
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/PublicProductAppService.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/PublicProductAppService.cs
index 3305704ff9..866cc31b34 100644
--- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/PublicProductAppService.cs
+++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application/ProductManagement/PublicProductAppService.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using ProductManagement;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
-namespace MyCompanyName.ProductManagement
+namespace ProductManagement
 {
     public class PublicProductAppService : ApplicationService, IPublicProductAppService
     {
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.Designer.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.Designer.cs
similarity index 97%
rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.Designer.cs
rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.Designer.cs
index f39ddf1cc7..2002970aad 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.Designer.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.Designer.cs
@@ -10,14 +10,14 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
 namespace MyCompanyName.MyProjectName.Migrations
 {
     [DbContext(typeof(MyProjectNameDbContext))]
-    [Migration("20190107113038_Initial")]
+    [Migration("20190211104804_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -26,10 +26,18 @@ namespace MyCompanyName.MyProjectName.Migrations
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasMaxLength(96);
+
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
                         .HasMaxLength(512);
 
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
                         .HasMaxLength(64);
@@ -44,6 +52,10 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
                         .HasMaxLength(4000);
@@ -178,8 +190,6 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.Property<Guid>("EntityChangeId");
 
-                    b.Property<Guid?>("EntityChangeId1");
-
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
                         .HasMaxLength(512);
@@ -204,8 +214,6 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.HasIndex("EntityChangeId");
 
-                    b.HasIndex("EntityChangeId1");
-
                     b.ToTable("AbpEntityPropertyChanges");
                 });
 
@@ -622,13 +630,9 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany()
+                        .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
                         .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany("PropertyChanges")
-                        .HasForeignKey("EntityChangeId1");
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.cs
similarity index 97%
rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.cs
rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.cs
index 72aba4d129..8f177b29fb 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190107113038_Initial.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20190211104804_Initial.cs
@@ -14,6 +14,7 @@ namespace MyCompanyName.MyProjectName.Migrations
                     Id = table.Column<Guid>(nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
+                    ApplicationName = table.Column<string>(maxLength: 96, nullable: true),
                     UserId = table.Column<Guid>(nullable: true),
                     UserName = table.Column<string>(maxLength: 256, nullable: true),
                     TenantId = table.Column<Guid>(nullable: true),
@@ -23,6 +24,8 @@ namespace MyCompanyName.MyProjectName.Migrations
                     ExecutionDuration = table.Column<int>(nullable: false),
                     ClientIpAddress = table.Column<string>(maxLength: 64, nullable: true),
                     ClientName = table.Column<string>(maxLength: 128, nullable: true),
+                    ClientId = table.Column<string>(maxLength: 64, nullable: true),
+                    CorrelationId = table.Column<string>(maxLength: 64, nullable: true),
                     BrowserInfo = table.Column<string>(maxLength: 512, nullable: true),
                     HttpMethod = table.Column<string>(maxLength: 16, nullable: true),
                     Url = table.Column<string>(maxLength: 256, nullable: true),
@@ -329,8 +332,7 @@ namespace MyCompanyName.MyProjectName.Migrations
                     NewValue = table.Column<string>(maxLength: 512, nullable: true),
                     OriginalValue = table.Column<string>(maxLength: 512, nullable: true),
                     PropertyName = table.Column<string>(maxLength: 128, nullable: false),
-                    PropertyTypeFullName = table.Column<string>(maxLength: 64, nullable: false),
-                    EntityChangeId1 = table.Column<Guid>(nullable: true)
+                    PropertyTypeFullName = table.Column<string>(maxLength: 64, nullable: false)
                 },
                 constraints: table =>
                 {
@@ -341,12 +343,6 @@ namespace MyCompanyName.MyProjectName.Migrations
                         principalTable: "AbpEntityChanges",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_AbpEntityPropertyChanges_AbpEntityChanges_EntityChangeId1",
-                        column: x => x.EntityChangeId1,
-                        principalTable: "AbpEntityChanges",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateIndex(
@@ -389,11 +385,6 @@ namespace MyCompanyName.MyProjectName.Migrations
                 table: "AbpEntityPropertyChanges",
                 column: "EntityChangeId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpEntityPropertyChanges_EntityChangeId1",
-                table: "AbpEntityPropertyChanges",
-                column: "EntityChangeId1");
-
             migrationBuilder.CreateIndex(
                 name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey",
                 table: "AbpPermissionGrants",
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs
index a1e702f708..1d2a225f38 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace MyCompanyName.MyProjectName.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -24,10 +24,18 @@ namespace MyCompanyName.MyProjectName.Migrations
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasMaxLength(96);
+
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
                         .HasMaxLength(512);
 
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
                         .HasMaxLength(64);
@@ -42,6 +50,10 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
                         .HasMaxLength(4000);
@@ -176,8 +188,6 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.Property<Guid>("EntityChangeId");
 
-                    b.Property<Guid?>("EntityChangeId1");
-
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
                         .HasMaxLength(512);
@@ -202,8 +212,6 @@ namespace MyCompanyName.MyProjectName.Migrations
 
                     b.HasIndex("EntityChangeId");
 
-                    b.HasIndex("EntityChangeId1");
-
                     b.ToTable("AbpEntityPropertyChanges");
                 });
 
@@ -620,13 +628,9 @@ namespace MyCompanyName.MyProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany()
+                        .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
                         .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany("PropertyChanges")
-                        .HasForeignKey("EntityChangeId1");
                 });
 
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
index 7788dcfdea..f84de6cd67 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
@@ -6,11 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Migrations\20181114070127_Initial.cs" />
-    <Compile Remove="Migrations\20181212113826_Initial.cs" />
-    <Compile Remove="Migrations\20181218133646_Remove_Duplicate_AuditLogId1.cs" />
-    <Compile Remove="Migrations\20181218134025_Initial.cs" />
-    <Compile Remove="Migrations\20190107104851_AuditLogging_Module_Changes.cs" />
+    <Compile Remove="Migrations\20190211104804_Initial.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.Designer.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.Designer.cs
similarity index 94%
rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.Designer.cs
rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.Designer.cs
index 600c904f2b..61c15431db 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.Designer.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.Designer.cs
@@ -10,14 +10,14 @@ using MyCompanyName.MyProjectName.Host;
 namespace MyCompanyName.MyProjectName.Host.Migrations
 {
     [DbContext(typeof(DemoAppDbContext))]
-    [Migration("20190107114531_Initial")]
+    [Migration("20190211105121_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -26,10 +26,18 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasMaxLength(96);
+
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
                         .HasMaxLength(512);
 
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
                         .HasMaxLength(64);
@@ -44,6 +52,10 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
                         .HasMaxLength(4000);
@@ -178,8 +190,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.Property<Guid>("EntityChangeId");
 
-                    b.Property<Guid?>("EntityChangeId1");
-
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
                         .HasMaxLength(512);
@@ -204,8 +214,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.HasIndex("EntityChangeId");
 
-                    b.HasIndex("EntityChangeId1");
-
                     b.ToTable("AbpEntityPropertyChanges");
                 });
 
@@ -280,13 +288,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany()
+                        .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
                         .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany("PropertyChanges")
-                        .HasForeignKey("EntityChangeId1");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.cs
similarity index 93%
rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.cs
rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.cs
index fd1c985c5d..b2074c3513 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190107114531_Initial.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20190211105121_Initial.cs
@@ -14,6 +14,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     Id = table.Column<Guid>(nullable: false),
                     ExtraProperties = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
+                    ApplicationName = table.Column<string>(maxLength: 96, nullable: true),
                     UserId = table.Column<Guid>(nullable: true),
                     UserName = table.Column<string>(maxLength: 256, nullable: true),
                     TenantId = table.Column<Guid>(nullable: true),
@@ -23,6 +24,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     ExecutionDuration = table.Column<int>(nullable: false),
                     ClientIpAddress = table.Column<string>(maxLength: 64, nullable: true),
                     ClientName = table.Column<string>(maxLength: 128, nullable: true),
+                    ClientId = table.Column<string>(maxLength: 64, nullable: true),
+                    CorrelationId = table.Column<string>(maxLength: 64, nullable: true),
                     BrowserInfo = table.Column<string>(maxLength: 512, nullable: true),
                     HttpMethod = table.Column<string>(maxLength: 16, nullable: true),
                     Url = table.Column<string>(maxLength: 256, nullable: true),
@@ -124,8 +127,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     NewValue = table.Column<string>(maxLength: 512, nullable: true),
                     OriginalValue = table.Column<string>(maxLength: 512, nullable: true),
                     PropertyName = table.Column<string>(maxLength: 128, nullable: false),
-                    PropertyTypeFullName = table.Column<string>(maxLength: 64, nullable: false),
-                    EntityChangeId1 = table.Column<Guid>(nullable: true)
+                    PropertyTypeFullName = table.Column<string>(maxLength: 64, nullable: false)
                 },
                 constraints: table =>
                 {
@@ -136,12 +138,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                         principalTable: "AbpEntityChanges",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_AbpEntityPropertyChanges_AbpEntityChanges_EntityChangeId1",
-                        column: x => x.EntityChangeId1,
-                        principalTable: "AbpEntityChanges",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateIndex(
@@ -179,11 +175,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                 table: "AbpEntityPropertyChanges",
                 column: "EntityChangeId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_AbpEntityPropertyChanges_EntityChangeId1",
-                table: "AbpEntityPropertyChanges",
-                column: "EntityChangeId1");
-
             migrationBuilder.CreateIndex(
                 name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey",
                 table: "AbpPermissionGrants",
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
index 70e88b9973..5261599df5 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -24,10 +24,18 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasMaxLength(96);
+
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
                         .HasMaxLength(512);
 
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("ClientIpAddress")
                         .HasColumnName("ClientIpAddress")
                         .HasMaxLength(64);
@@ -42,6 +50,10 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.Property<string>("ConcurrencyStamp");
 
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasMaxLength(64);
+
                     b.Property<string>("Exceptions")
                         .HasColumnName("Exceptions")
                         .HasMaxLength(4000);
@@ -176,8 +188,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.Property<Guid>("EntityChangeId");
 
-                    b.Property<Guid?>("EntityChangeId1");
-
                     b.Property<string>("NewValue")
                         .HasColumnName("NewValue")
                         .HasMaxLength(512);
@@ -202,8 +212,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
 
                     b.HasIndex("EntityChangeId");
 
-                    b.HasIndex("EntityChangeId1");
-
                     b.ToTable("AbpEntityPropertyChanges");
                 });
 
@@ -278,13 +286,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany()
+                        .WithMany("PropertyChanges")
                         .HasForeignKey("EntityChangeId")
                         .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
-                        .WithMany("PropertyChanges")
-                        .HasForeignKey("EntityChangeId1");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index b034148995..ca352a43b3 100644
--- a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -31,8 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="Migrations\20181212121232_Initial.cs" />
-    <Compile Remove="Migrations\20181218135310_Initial.cs" />
+    <Compile Remove="Migrations\20190211105121_Initial.cs" />
   </ItemGroup>
 
 </Project>