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/AbpTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs
index ce47163be0..566cbcffbc 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperService.cs
@@ -56,93 +56,5 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
             Process(context, output);
             return Task.CompletedTask;
         }
-
-        protected virtual TagHelperOutput GetInnerTagHelper(TagHelperAttributeList attributeList, TagHelperContext context, TagHelper tagHelper, string tagName = "div", TagMode tagMode = TagMode.SelfClosing, bool runAsync = false)
-        {
-            var innerOutput = new TagHelperOutput(tagName, attributeList, (useCachedResult, encoder) => Task.Run<TagHelperContent>(() => new DefaultTagHelperContent()))
-            {
-                TagMode = tagMode
-            };
-
-            var innerContext = new TagHelperContext(attributeList, context.Items, Guid.NewGuid().ToString());
-
-            tagHelper.Init(context);
-
-            if (runAsync)
-            {
-                AsyncHelper.RunSync(() => tagHelper.ProcessAsync(innerContext, innerOutput));
-            }
-            else
-            {
-                tagHelper.Process(innerContext, innerOutput);
-            }
-
-            return innerOutput;
-        }
-
-        protected virtual string RenderTagHelper(TagHelperAttributeList attributeList, TagHelperContext context, TagHelper tagHelper, HtmlEncoder htmlEncoder, string tagName = "div", TagMode tagMode = TagMode.SelfClosing, bool runAsync = false)
-        {
-            var innerOutput = GetInnerTagHelper(attributeList, context, tagHelper, tagName, tagMode, runAsync);
-
-            return RenderTagHelperOutput(innerOutput, htmlEncoder);
-        }
-
-        protected virtual string RenderTagHelperOutput(TagHelperOutput output, HtmlEncoder htmlEncoder)
-        {
-            using (var writer = new StringWriter())
-            {
-                output.WriteTo(writer, htmlEncoder);
-                return writer.ToString();
-            }
-        }
-
-        protected virtual T GetAttribute<T>(ModelExplorer property) where T : Attribute
-        {
-            return property?.Metadata?.ContainerType?.GetTypeInfo()?.GetProperty(property.Metadata.PropertyName)?.GetCustomAttribute<T>();
-        }
-
-        protected virtual List<FormGroupItem> GetFormGroupContentsList(TagHelperContext context, out bool surpress)
-        {
-            var items = GetValueFromContext<List<FormGroupItem>>(context, FormGroupContents);
-            surpress = items != null;
-
-            return items ?? new List<FormGroupItem>();
-        }
-
-        protected virtual T GetValueFromContext<T>(TagHelperContext context, string key)
-        {
-            if (!context.Items.ContainsKey(key))
-            {
-                return default(T);
-            }
-            
-            return (T)context.Items[key];
-        }
-
-        protected virtual string GetIdAttributeAsString(TagHelperOutput inputTag)
-        {
-            var idAttr = inputTag.Attributes.FirstOrDefault(a => a.Name == "id");
-
-            return idAttr != null ? "for=\"" + idAttr.Value + "\"" : "";
-        }
-
-        protected virtual int GetInputOrder(ModelExplorer explorer)
-        {
-            return GetAttribute<DisplayOrder>(explorer)?.Number ?? DisplayOrder.Default;
-        }
-
-        protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress)
-        {
-            var list = GetFormGroupContentsList(context, out surpress);
-
-            if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\"")))
-            {
-                list.Add(new FormGroupItem
-                {
-                    HtmlContent = html,
-                    Order = order
-                });
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs
index c19ac3acd8..1d6204373a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs
@@ -2,6 +2,7 @@
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
 {
@@ -20,13 +21,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
             output.Attributes.AddClass("breadcrumb-item");
             output.Attributes.AddClass(AbpBreadcrumbItemActivePlaceholder);
 
-            var list = GetValueFromContext<List<BreadcrumbItem>>(context, BreadcrumbItemsContent);
+            var list = context.GetValue<List<BreadcrumbItem>>(BreadcrumbItemsContent);
 
             output.Content.SetHtmlContent(GetInnerHtml(context, output));
             
             list.Add(new BreadcrumbItem
             {
-                Html = RenderTagHelperOutput(output, _encoder),
+                Html = output.Render(_encoder),
                 Active = TagHelper.Active
             });
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs
index 9b44254f17..5a4bafd47d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Carousel/AbpCarouselItemTagHelperService.cs
@@ -3,6 +3,7 @@ using System.Text;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Carousel
 {
@@ -32,9 +33,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Carousel
 
         private void AddToContext(TagHelperContext context, TagHelperOutput output)
         {
-            var getOutputAsHtml = RenderTagHelperOutput(output, _encoder);
+            var getOutputAsHtml = output.Render(_encoder);
 
-            var itemList = GetValueFromContext<List<CarouselItem>>(context, CarouselItemsContent);
+            var itemList = context.GetValue<List<CarouselItem>>(CarouselItemsContent);
 
             itemList.Add(new CarouselItem(getOutputAsHtml, TagHelper.Active ?? false));
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
index 1f9f57c567..9dc279334b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Collapse/AbpAccordionItemTagHelperService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
 {
@@ -15,7 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Collapse
 
             var html = GetAccordionHeaderItem(context, output) + GetAccordionContentItem(context, output, innerContent);
 
-            var tabHeaderItems = GetValueFromContext<List<string>>(context, AccordionItems);
+            var tabHeaderItems = context.GetValue<List<string>>(AccordionItems);
 
             tabHeaderItems.Add(html);
 
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..ee17262d96 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,10 +1,12 @@
 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;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
 {
@@ -22,22 +24,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 +56,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;
@@ -62,15 +67,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             abpButtonTagHelper.ButtonType = TagHelper.ButtonType;
             var attributes = GetAttributesForMainButton(context, output);
 
-            var buttonTag = GetInnerTagHelper(attributes, context, abpButtonTagHelper, "button", TagMode.StartTagAndEndTag);
+            var buttonTag = abpButtonTagHelper.ProcessAndGetOutput(attributes, context, "button", TagMode.StartTagAndEndTag);
+
+            buttonTag.PreContent.SetHtmlContent(content.GetContent());
 
             if ((TagHelper.NavLink ?? false) || (TagHelper.Link ?? false))
             {
                 var linkTag = ConvertButtonToLink(buttonTag);
-                return RenderTagHelperOutput(linkTag, _htmlEncoder);
+                return linkTag.Render(_htmlEncoder);
             }
 
-            return RenderTagHelperOutput(buttonTag, _htmlEncoder);
+            return buttonTag.Render(_htmlEncoder);
         }
 
         protected virtual string GetSplitButton(TagHelperContext context, TagHelperOutput output)
@@ -81,7 +88,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Dropdown
             abpButtonTagHelper.ButtonType = TagHelper.ButtonType;
             var attributes = GetAttributesForSplitButton(context, output);
 
-            return RenderTagHelper(attributes, context, abpButtonTagHelper, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
+            return abpButtonTagHelper.Render(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
         }
 
         protected virtual TagHelperAttributeList GetAttributesForMainButton(TagHelperContext context, TagHelperOutput output)
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/Extensions/ModelExplorerExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/ModelExplorerExtensions.cs
new file mode 100644
index 0000000000..b6bedac11b
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/ModelExplorerExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions
+{
+    public static class ModelExplorerExtensions
+    {
+        public static T GetAttribute<T>(this ModelExplorer property) where T : Attribute
+        {
+            return property?.Metadata?.ContainerType?.GetTypeInfo()?.GetProperty(property.Metadata.PropertyName)?.GetCustomAttribute<T>();
+        }
+
+        public static int GetDisplayOrder(this ModelExplorer explorer)
+        {
+            return GetAttribute<DisplayOrder>(explorer)?.Number ?? DisplayOrder.Default;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperContextExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperContextExtensions.cs
new file mode 100644
index 0000000000..c2b3e41192
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperContextExtensions.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions
+{
+    public static class TagHelperContextExtensions
+    {
+        public static T GetValue<T>(this TagHelperContext context, string key)
+        {
+            if (!context.Items.ContainsKey(key))
+            {
+                return default(T);
+            }
+
+            return (T)context.Items[key];
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperExtensions.cs
new file mode 100644
index 0000000000..ee984474d2
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperExtensions.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using System.Text.Encodings.Web;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions
+{
+    public static class TagHelperExtensions
+    {
+        public static TagHelperOutput ProcessAndGetOutput(this TagHelper tagHelper, TagHelperAttributeList attributeList, TagHelperContext context, string tagName = "div", TagMode tagMode = TagMode.SelfClosing, bool runAsync = false)
+        {
+            var innerOutput = new TagHelperOutput(tagName, attributeList, (useCachedResult, encoder) => Task.Run<TagHelperContent>(() => new DefaultTagHelperContent()))
+            {
+                TagMode = tagMode
+            };
+
+            var innerContext = new TagHelperContext(attributeList, context.Items, Guid.NewGuid().ToString());
+
+            tagHelper.Init(context);
+
+            if (runAsync)
+            {
+                AsyncHelper.RunSync(() => tagHelper.ProcessAsync(innerContext, innerOutput));
+            }
+            else
+            {
+                tagHelper.Process(innerContext, innerOutput);
+            }
+
+            return innerOutput;
+        }
+
+        public static string Render(this TagHelper tagHelper, TagHelperAttributeList attributeList, TagHelperContext context, HtmlEncoder htmlEncoder, string tagName = "div", TagMode tagMode = TagMode.SelfClosing, bool runAsync = false)
+        {
+            var innerOutput = tagHelper.ProcessAndGetOutput(attributeList, context, tagName, tagMode, runAsync);
+
+            return innerOutput.Render(htmlEncoder);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperOutputExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperOutputExtensions.cs
new file mode 100644
index 0000000000..0cc9bae6e2
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Extensions/TagHelperOutputExtensions.cs
@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using System.IO;
+using System.Text.Encodings.Web;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions
+{
+    public static class TagHelperOutputExtensions
+    {
+        public static string Render(this TagHelperOutput output, HtmlEncoder htmlEncoder)
+        {
+            using (var writer = new StringWriter())
+            {
+                output.WriteTo(writer, htmlEncoder);
+                return writer.ToString();
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
index fa3ec9cce6..a9f3bb9c62 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs
@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 {
@@ -66,7 +67,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 ViewContext = TagHelper.ViewContext
             };
 
-            var formTagOutput = GetInnerTagHelper(output.Attributes, context, formTagHelper, "form", TagMode.StartTagAndEndTag);
+            var formTagOutput = formTagHelper.ProcessAndGetOutput(output.Attributes, context, "form", TagMode.StartTagAndEndTag);
 
             await formTagOutput.GetChildContentAsync();
 
@@ -146,7 +147,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             var abpSelectTagHelper = GetSelectGroupTagHelper(context, output, model);
 
-            RenderTagHelper(new TagHelperAttributeList(), context, abpSelectTagHelper, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
+            abpSelectTagHelper.Render(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
         }
 
         protected virtual AbpTagHelper GetSelectGroupTagHelper(TagHelperContext context, TagHelperOutput output, ModelExpression model)
@@ -156,7 +157,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 GetSelectTagHelper(model);
         }
 
-        private AbpTagHelper GetSelectTagHelper(ModelExpression model)
+        protected virtual AbpTagHelper GetSelectTagHelper(ModelExpression model)
         {
             var abpSelectTagHelper = _serviceProvider.GetRequiredService<AbpSelectTagHelper>();
             abpSelectTagHelper.AspFor = model;
@@ -165,9 +166,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             return abpSelectTagHelper;
         }
 
-        private AbpTagHelper GetAbpRadioInputTagHelper(ModelExpression model)
+        protected virtual AbpTagHelper GetAbpRadioInputTagHelper(ModelExpression model)
         {
-            var radioButtonAttribute = GetAttribute<AbpRadioButton>(model.ModelExplorer);
+            var radioButtonAttribute = model.ModelExplorer.GetAttribute<AbpRadioButton>();
             var abpRadioInputTagHelper = _serviceProvider.GetRequiredService<AbpRadioInputTagHelper>();
             abpRadioInputTagHelper.AspFor = model;
             abpRadioInputTagHelper.AspItems = null;
@@ -184,7 +185,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             abpButtonTagHelper.Text = "Submit";
             abpButtonTagHelper.ButtonType = AbpButtonType.Primary;
 
-            return RenderTagHelper(attributes, context, abpButtonTagHelper, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
+            return abpButtonTagHelper.Render(attributes, context, _htmlEncoder, "button", TagMode.StartTagAndEndTag);
         }
 
         protected virtual void ProcessInputGroup(TagHelperContext context, TagHelperOutput output, ModelExpression model)
@@ -194,7 +195,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             abpInputTagHelper.ViewContext = TagHelper.ViewContext;
             abpInputTagHelper.DisplayRequiredSymbol = TagHelper.RequiredSymbols ?? true;
 
-            RenderTagHelper(new TagHelperAttributeList(), context, abpInputTagHelper, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
+            abpInputTagHelper.Render(new TagHelperAttributeList(), context, _htmlEncoder, "div", TagMode.StartTagAndEndTag);
         }
 
         protected virtual List<ModelExpression> GetModels(TagHelperContext context, TagHelperOutput output)
@@ -280,12 +281,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual bool AreSelectItemsProvided(ModelExplorer explorer)
         {
-            return GetAttribute<SelectItems>(explorer) != null;
+            return explorer.GetAttribute<SelectItems>() != null;
         }
 
         protected virtual bool IsRadioGroup(ModelExplorer explorer)
         {
-            return GetAttribute<AbpRadioButton>(explorer) != null;
+            return explorer.GetAttribute<AbpRadioButton>() != null;
         }
     }
 }
\ No newline at end of file
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..fa16acbd93 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
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.Encodings.Web;
@@ -6,6 +7,7 @@ using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 {
@@ -26,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             var innerHtml = GetFormInputGroupAsHtml(context, output, out var isCheckbox);
 
-            var order = GetInputOrder(TagHelper.AspFor.ModelExplorer);
+            var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
 
             AddGroupToFormGroupContents(
                 context,
@@ -45,7 +47,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,8 +57,8 @@ 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 inputHtml = inputTag.Render(_encoder);
             var label = GetLabelAsHtml(context, output, inputTag, isCheckbox);
             var info = GetInfoAsHtml(context, output, inputTag, isCheckbox);
             var validation = isCheckbox ? "" : GetValidationAsHtml(context, output, inputTag);
@@ -78,7 +81,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             var attributeList = new TagHelperAttributeList { { "class", "text-danger" } };
 
-            return RenderTagHelper(attributeList, context, validationMessageTagHelper, _encoder, "span", TagMode.StartTagAndEndTag, true);
+            return validationMessageTagHelper.Render(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag, true);
         }
 
         protected virtual string GetContent(TagHelperContext context, TagHelperOutput output, string label, string inputHtml, string validation, string infoHtml, bool isCheckbox)
@@ -92,14 +95,14 @@ 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>";
         }
 
         protected virtual TagHelper GetInputTagHelper(TagHelperContext context, TagHelperOutput output)
         {
-            var textAreaAttribute = GetAttribute<TextArea>(TagHelper.AspFor.ModelExplorer);
+            var textAreaAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<TextArea>();
 
             if (textAreaAttribute != null)
             {
@@ -121,7 +124,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             var tagHelper = GetInputTagHelper(context, output);
 
-            var inputTagHelperOutput = GetInnerTagHelper(GetInputAttributes(context, output), context, tagHelper, "input");
+            var inputTagHelperOutput = tagHelper.ProcessAndGetOutput(GetInputAttributes(context, output), context, "input");
 
             ConvertToTextAreaIfTextArea(inputTagHelperOutput);
             AddDisabledAttribute(inputTagHelperOutput);
@@ -141,7 +144,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));
@@ -158,7 +161,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         protected virtual void AddDisabledAttribute(TagHelperOutput inputTagHelperOutput)
         {
             if (inputTagHelperOutput.Attributes.ContainsName("disabled") == false && 
-                     (TagHelper.IsDisabled || GetAttribute<DisabledInput>(TagHelper.AspFor.ModelExplorer) != null))
+                     (TagHelper.IsDisabled || TagHelper.AspFor.ModelExplorer.GetAttribute<DisabledInput>() != null))
             {
                 inputTagHelperOutput.Attributes.Add("disabled", "");
             }
@@ -167,7 +170,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         protected virtual void AddReadOnlyAttribute(TagHelperOutput inputTagHelperOutput)
         {
             if (inputTagHelperOutput.Attributes.ContainsName("readonly") == false && 
-                    (TagHelper.IsReadonly != false || GetAttribute<ReadOnlyInput>(TagHelper.AspFor.ModelExplorer) != null))
+                    (TagHelper.IsReadonly != false || TagHelper.AspFor.ModelExplorer.GetAttribute<ReadOnlyInput>() != null))
             {
                 inputTagHelperOutput.Attributes.Add("readonly", "");
             }
@@ -180,7 +183,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return;
             }
 
-            var attribute = GetAttribute<Placeholder>(TagHelper.AspFor.ModelExplorer);
+            var attribute = TagHelper.AspFor.ModelExplorer.GetAttribute<Placeholder>();
 
             if (attribute != null)
             {
@@ -192,7 +195,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual void AddInfoTextId(TagHelperOutput inputTagHelperOutput)
         {
-            if (GetAttribute<InputInfoText>(TagHelper.AspFor.ModelExplorer) == null)
+            if (TagHelper.AspFor.ModelExplorer.GetAttribute<InputInfoText>() == null)
             {
                 return;
             }
@@ -226,7 +229,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 +
@@ -240,7 +243,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return "";
             }
 
-            return GetAttribute<RequiredAttribute>(TagHelper.AspFor.ModelExplorer) != null ? "<span> * </span>":"";
+            return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null ? "<span> * </span>":"";
         }
 
         protected virtual string GetInfoAsHtml(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag, bool isCheckbox)
@@ -263,7 +266,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             }
             else
             {
-                var infoAttribute = GetAttribute<InputInfoText>(TagHelper.AspFor.ModelExplorer);
+                var infoAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<InputInfoText>();
                 if (infoAttribute != null)
                 {
                     text = infoAttribute.Text;
@@ -294,15 +297,15 @@ 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);
+            return labelTagHelper.Render(attributeList, context, _encoder, "label", TagMode.StartTagAndEndTag, true);
         }
 
         protected virtual void ConvertToTextAreaIfTextArea(TagHelperOutput tagHelperOutput)
         {
-            var textAreaAttribute = GetAttribute<TextArea>(TagHelper.AspFor.ModelExplorer);
+            var textAreaAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<TextArea>();
 
             if (textAreaAttribute == null)
             {
@@ -354,7 +357,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual string GetSize(TagHelperContext context, TagHelperOutput output)
         {
-            var attribute = GetAttribute<FormControlSize>(TagHelper.AspFor.ModelExplorer);
+            var attribute = TagHelper.AspFor.ModelExplorer.GetAttribute<FormControlSize>();
 
             if (attribute != null)
             {
@@ -378,5 +381,27 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             return inputTag.Attributes.Any(a => a.Name.ToLowerInvariant() == "type" && a.Value.ToString().ToLowerInvariant() == "hidden");
         }
+
+        protected virtual string GetIdAttributeAsString(TagHelperOutput inputTag)
+        {
+            var idAttr = inputTag.Attributes.FirstOrDefault(a => a.Name == "id");
+
+            return idAttr != null ? "for=\"" + idAttr.Value + "\"" : "";
+        }
+
+        protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress)
+        {
+            var list = context.GetValue<List<FormGroupItem>>(FormGroupContents) ?? new List<FormGroupItem>();
+            surpress = list != null;
+
+            if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\"")))
+            {
+                list.Add(new FormGroupItem
+                {
+                    HtmlContent = html,
+                    Order = order
+                });
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
index 2968085781..b63155a515 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 {
@@ -24,7 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             var selectItems = GetSelectItems(context,output);
             SetSelectedValue(context, output, selectItems);
 
-            var order = GetInputOrder(TagHelper.AspFor.ModelExplorer);
+            var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
 
             var html = GetHtml(context, output, selectItems);
 
@@ -78,7 +79,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return GetSelectItemsFromEnum(context, output, TagHelper.AspFor.ModelExplorer);
             }
 
-            var selectItemsAttribute = GetAttribute<SelectItems>(TagHelper.AspFor.ModelExplorer);
+            var selectItemsAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<SelectItems>();
             if (selectItemsAttribute != null)
             {
                 return GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer);
@@ -155,5 +156,20 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             return TagHelper.AspFor.ModelExplorer.Model?.ToString();
         }
+
+        protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress)
+        {
+            var list = context.GetValue<List<FormGroupItem>>(FormGroupContents) ?? new List<FormGroupItem>();
+            surpress = list != null;
+
+            if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\"")))
+            {
+                list.Add(new FormGroupItem
+                {
+                    HtmlContent = html,
+                    Order = order
+                });
+            }
+        }
     }
 }
\ No newline at end of file
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..58a20f5224 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
@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 {
@@ -30,7 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             var innerHtml = GetFormInputGroupAsHtml(context, output);
 
-            var order = GetInputOrder(TagHelper.AspFor.ModelExplorer);
+            var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
 
             AddGroupToFormGroupContents(context, TagHelper.AspFor.Name, SurroundInnerHtmlAndGet(context, output, innerHtml), order, out var surpress);
 
@@ -51,7 +52,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         protected virtual string GetFormInputGroupAsHtml(TagHelperContext context, TagHelperOutput output)
         {
             var selectTag = GetSelectTag(context, output);
-            var selectAsHtml = RenderTagHelperOutput(selectTag, _encoder);
+            var selectAsHtml = selectTag.Render(_encoder);
             var label = GetLabelAsHtml(context, output, selectTag);
             var validation = GetValidationAsHtml(context, output, selectTag);
             var infoText = GetInfoAsHtml(context, output, selectTag);
@@ -73,7 +74,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 ViewContext = TagHelper.ViewContext
             };
 
-            var selectTagHelperOutput = GetInnerTagHelper(GetInputAttributes(context, output), context, selectTagHelper, "select", TagMode.StartTagAndEndTag);
+            var selectTagHelperOutput = selectTagHelper.ProcessAndGetOutput(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag);
 
             selectTagHelperOutput.Attributes.AddClass("form-control");
             selectTagHelperOutput.Attributes.AddClass(GetSize(context, output));
@@ -85,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual void AddDisabledAttribute(TagHelperOutput inputTagHelperOutput)
         {
-            var disabledAttribute = GetAttribute<DisabledInput>(TagHelper.AspFor.ModelExplorer);
+            var disabledAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<DisabledInput>();
 
             if (disabledAttribute != null && !inputTagHelperOutput.Attributes.ContainsName("disabled"))
             {
@@ -105,7 +106,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return GetSelectItemsFromEnum(context, output, TagHelper.AspFor.ModelExplorer);
             }
 
-            var selectItemsAttribute = GetAttribute<SelectItems>(TagHelper.AspFor.ModelExplorer);
+            var selectItemsAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<SelectItems>();
             if (selectItemsAttribute != null)
             {
                 return GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer);
@@ -132,12 +133,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 return "";
             }
 
-            return GetAttribute<RequiredAttribute>(TagHelper.AspFor.ModelExplorer) != null ? "<span> * </span>" : "";
+            return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null ? "<span> * </span>" : "";
         }
 
         protected virtual void AddInfoTextId(TagHelperOutput inputTagHelperOutput)
         {
-            if (GetAttribute<InputInfoText>(TagHelper.AspFor.ModelExplorer) == null)
+            if (TagHelper.AspFor.ModelExplorer.GetAttribute<InputInfoText>() == null)
             {
                 return;
             }
@@ -164,7 +165,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             }
             else
             {
-                var infoAttribute = GetAttribute<InputInfoText>(TagHelper.AspFor.ModelExplorer);
+                var infoAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<InputInfoText>();
                 if (infoAttribute != null)
                 {
                     text = infoAttribute.Text;
@@ -227,7 +228,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 ViewContext = TagHelper.ViewContext
             };
 
-            return RenderTagHelper(new TagHelperAttributeList(), context, labelTagHelper, _encoder, "label", TagMode.StartTagAndEndTag, true);
+            return labelTagHelper.Render(new TagHelperAttributeList(), context, _encoder, "label", TagMode.StartTagAndEndTag, true);
         }
 
         protected virtual string GetValidationAsHtml(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag)
@@ -240,12 +241,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             var attributeList = new TagHelperAttributeList { { "class", "text-danger" } };
 
-            return RenderTagHelper(attributeList, context, validationMessageTagHelper, _encoder, "span", TagMode.StartTagAndEndTag, true);
+            return validationMessageTagHelper.Render(attributeList, context, _encoder, "span", TagMode.StartTagAndEndTag, true);
         }
 
         protected virtual string GetSize(TagHelperContext context, TagHelperOutput output)
         {
-            var attribute = GetAttribute<FormControlSize>(TagHelper.AspFor.ModelExplorer);
+            var attribute = TagHelper.AspFor.ModelExplorer.GetAttribute<FormControlSize>();
 
             if (attribute != null)
             {
@@ -255,11 +256,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 +278,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 attrList.Add(tagHelperAttribute);
             }
 
+            attrList.AddClass("custom-select");
+
             return attrList;
         }
 
@@ -294,5 +297,27 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 output.Attributes.Add(newAttritube);
             }
         }
+
+        protected virtual string GetIdAttributeAsString(TagHelperOutput inputTag)
+        {
+            var idAttr = inputTag.Attributes.FirstOrDefault(a => a.Name == "id");
+
+            return idAttr != null ? "for=\"" + idAttr.Value + "\"" : "";
+        }
+
+        protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress)
+        {
+            var list = context.GetValue<List<FormGroupItem>>(FormGroupContents) ?? new List<FormGroupItem>();
+            surpress = list != null;
+
+            if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\"")))
+            {
+                list.Add(new FormGroupItem
+                {
+                    HtmlContent = html,
+                    Order = order
+                });
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs
index b095a8a0a0..e78d59ee82 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs
@@ -10,23 +10,31 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.TagName = "div";
             output.Attributes.AddClass("col");
 
-            ProcessSizeClass(output, TagHelper.Size, "");
-            ProcessSizeClass(output, TagHelper.SizeSm, "-sm");
-            ProcessSizeClass(output, TagHelper.SizeMd, "-md");
-            ProcessSizeClass(output, TagHelper.SizeLg, "-lg");
-            ProcessSizeClass(output, TagHelper.SizeXl, "-xl");
-
-            ProcessOffsetClass(output, TagHelper.Offset, "");
-            ProcessOffsetClass(output, TagHelper.OffsetSm, "-sm");
-            ProcessOffsetClass(output, TagHelper.OffsetMd, "-md");
-            ProcessOffsetClass(output, TagHelper.OffsetLg, "-lg");
-            ProcessOffsetClass(output, TagHelper.OffsetXl, "-xl");
-
-            ProcessColumnOrder(output);
-            ProcessVerticalAlign(output);
+            ProcessSizeClasses(context, output);
+            ProcessOffsetClasses(context, output);
+            ProcessColumnOrder(context, output);
+            ProcessVerticalAlign(context, output);
         }
 
-        protected virtual void ProcessSizeClass(TagHelperOutput output, ColumnSize size, string breakpoint)
+        protected virtual void ProcessSizeClasses(TagHelperContext context, TagHelperOutput output)
+        {
+            ProcessSizeClass(context, output, TagHelper.Size, "");
+            ProcessSizeClass(context, output, TagHelper.SizeSm, "-sm");
+            ProcessSizeClass(context, output, TagHelper.SizeMd, "-md");
+            ProcessSizeClass(context, output, TagHelper.SizeLg, "-lg");
+            ProcessSizeClass(context, output, TagHelper.SizeXl, "-xl");
+        }
+
+        protected virtual void ProcessOffsetClasses(TagHelperContext context, TagHelperOutput output)
+        {
+            ProcessOffsetClass(context, output, TagHelper.Offset, "");
+            ProcessOffsetClass(context, output, TagHelper.OffsetSm, "-sm");
+            ProcessOffsetClass(context, output, TagHelper.OffsetMd, "-md");
+            ProcessOffsetClass(context, output, TagHelper.OffsetLg, "-lg");
+            ProcessOffsetClass(context, output, TagHelper.OffsetXl, "-xl");
+        }
+
+        protected virtual void ProcessSizeClass(TagHelperContext context, TagHelperOutput output, ColumnSize size, string breakpoint)
         {
             if (size == ColumnSize.Undefined)
             {
@@ -47,7 +55,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass(classString);
         }
 
-        protected virtual void ProcessOffsetClass(TagHelperOutput output, ColumnSize size, string breakpoint)
+        protected virtual void ProcessOffsetClass(TagHelperContext context, TagHelperOutput output, ColumnSize size, string breakpoint)
         {
             if (size == ColumnSize.Undefined)
             {
@@ -68,7 +76,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass(classString);
         }
 
-        protected virtual void ProcessVerticalAlign(TagHelperOutput output)
+        protected virtual void ProcessVerticalAlign(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.VAlign == VerticalAlign.Default)
             {
@@ -78,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass("align-self-" + TagHelper.VAlign.ToString().ToLowerInvariant());
         }
 
-        protected virtual void ProcessColumnOrder(TagHelperOutput output)
+        protected virtual void ProcessColumnOrder(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.ColumnOrder == ColumnOrder.Undefined)
             {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs
deleted file mode 100644
index b8b439ff3f..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label
-{
-    public class AbpLabelTagHelper : AbpTagHelper<AbpLabelTagHelper, AbpLabelTagHelperService>
-    {
-        public AbpLabelTagHelper(AbpLabelTagHelperService tagHelperService)
-            : base(tagHelperService)
-        {
-
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs
deleted file mode 100644
index bca82d56d5..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Razor.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label
-{
-    public class AbpLabelTagHelperService : AbpTagHelperService<AbpLabelTagHelper>
-    {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            //TODO: fill
-        }
-    }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
index e3293cddca..27ee4ee55b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
 {
@@ -121,11 +122,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
 
             var anchorTagHelper = GetAnchorTagHelper(currentPage, out var attributeList);
 
-            var tagHelperOutput = GetInnerTagHelper(attributeList, context, anchorTagHelper, "a", TagMode.StartTagAndEndTag);
+            var tagHelperOutput = anchorTagHelper.ProcessAndGetOutput(attributeList, context, "a", TagMode.StartTagAndEndTag);
 
             tagHelperOutput.Content.SetHtmlContent(localizer[localizationKey]);
 
-            var renderedHtml = RenderTagHelperOutput(tagHelperOutput, _encoder);
+            var renderedHtml = tagHelperOutput.Render(_encoder);
 
             return renderedHtml;
         }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
index 30b1ae3017..b7bda04134 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
     {
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
-            if (!TagHelper.Disabled??true)
+            if (!TagHelper.Disabled ?? true)
             {
                 SetDataToggle(context, output);
                 SetDataPlacement(context, output);
@@ -16,21 +16,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
             }
             else
             {
-                SetDisabled(context,output);
+                SetDisabled(context, output);
             }
         }
 
         protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
         {
             var triggerAsHtml = TagHelper.Dismissible ?? false ? "datatrigger=\"focus\" " : "";
-
-            var dataPlacementAsHtml = "data-placement=\"" +GetDirectory().ToString().ToLowerInvariant() + "\" ";
-
+            var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
             var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
-            var titleAsHtml = titleAttribute == null? "":"title=\""+ titleAttribute.Value +"\" ";
-
-            var preElementHtml = "<span class=\"d-inline-block\" "+ titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" +GetDataContent()+"\">";
-
+            var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
+            var preElementHtml = "<span class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
             var postElementHtml = "</span>";
 
             output.PreElement.SetHtmlContent(preElementHtml);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs
index 5dd4b8aded..f7ec9f6057 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs
@@ -10,6 +10,5 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.ProgressBar
             output.Attributes.AddClass("progress");
             output.TagName = "div";
         }
-        
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
index 75b806ccac..fb724af9c8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabDropdownTagHelperService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
 {
@@ -17,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
             await output.GetChildContentAsync();
             var tabHeader = GetTabHeaderItem(context, output);
 
-            var tabHeaderItems = GetValueFromContext<List<TabItem>>(context, TabItems);
+            var tabHeaderItems = context.GetValue<List<TabItem>>(TabItems);
 
             tabHeaderItems.Add(new TabItem(tabHeader, "", false, TagHelper.Name, "", true));
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs
index 9e94c51ea9..ba5e3e811a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabLinkTagHelperService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
 {
@@ -12,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
             
             var tabHeader = GetTabHeaderItem(context, output);
 
-            var tabHeaderItems = GetValueFromContext<List<TabItem>>(context, TabItems);
+            var tabHeaderItems = context.GetValue<List<TabItem>>(TabItems);
 
             tabHeaderItems.Add(new TabItem(tabHeader, "", false, TagHelper.Name, TagHelper.ParentDropdownName, false));
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
index 8437586041..ee90724c1a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Tab/AbpTabTagHelperService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
 {
@@ -14,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Tab
             var tabHeader = GetTabHeaderItem(context, output);
             var tabContent = GetTabContentItem(innerContent.GetContent());
 
-            var tabHeaderItems = GetValueFromContext<List<TabItem>>(context, TabItems);
+            var tabHeaderItems = context.GetValue<List<TabItem>>(TabItems);
 
             var active = TagHelper.Active ?? false;
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
index 49c0e58c4a..bdb7976286 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -52,7 +52,7 @@
     *************************************************************************/
     var localize = function (key) {
         return abp.localization.getResource('AbpUi')(key);
-    }
+    };
 
     var recordActions = function () {
         if (!$.fn.dataTableExt) {
@@ -69,7 +69,7 @@
             } else {
                 return visibilityField;
             }
-        }
+        };
 
         var _createDropdownItem = function (record, fieldItem) {
             var $li = $('<li/>');
@@ -83,7 +83,7 @@
                     $a.append($("<i>").addClass("fa fa-" + fieldItem.icon + " mr-1"));
                 } else if (fieldItem.iconClass) {
                     $a.append($("<i>").addClass(fieldItem.iconClass + " mr-1"));
-                } 
+                }
 
                 $a.append(fieldItem.text);
             }
@@ -109,7 +109,7 @@
 
             $a.appendTo($li);
             return $li;
-        }
+        };
 
         var _createButtonDropdown = function (record, field) {
             var $container = $('<div/>')
@@ -200,11 +200,11 @@
             }
 
             throw "DTE#1: Cannot create row action. Either set element or items fields!";
-        }
+        };
 
         var hideColumnWithoutRedraw = function (tableInstance, colIndex) {
             tableInstance.fnSetColumnVis(colIndex, false, false);
-        }
+        };
 
         var hideEmptyColumn = function (cellContent, tableInstance, colIndex) {
             if (cellContent == "") {
@@ -307,8 +307,8 @@
                         });
                     });
                 }
-            }
-        }
+            };
+        };
     }();
 
     /************************************************************************
@@ -338,9 +338,10 @@
                 }
             }
 
+            configuration.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col"p>>';
 
             return configuration;
-        }
+        };
 
     }();
 
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..5f1c7ea4d8 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Auditing;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
+using Volo.Abp.AspNetCore.Tracing;
 using Volo.Abp.AspNetCore.Uow;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Localization;
@@ -40,6 +41,12 @@ namespace Microsoft.AspNetCore.Builder
                 .UseMiddleware<AbpUnitOfWorkMiddleware>();
         }
 
+        public static IApplicationBuilder UseCorrelationId(this IApplicationBuilder app)
+        {
+            return app
+                .UseMiddleware<AbpCorrelationIdMiddleware>();
+        }
+
         public static IApplicationBuilder UseAbpRequestLocalization(this IApplicationBuilder app)
         {
             IReadOnlyList<LanguageInfo> languages;
@@ -48,10 +55,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.AspNetCore/Volo/Abp/AspNetCore/Auditing/AspNetCoreCorrelationIdProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AspNetCoreCorrelationIdProvider.cs
deleted file mode 100644
index 7e8c5ad717..0000000000
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AspNetCoreCorrelationIdProvider.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Http;
-using Volo.Abp.Auditing;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.AspNetCore.Auditing
-{
-    [Dependency(ReplaceServices = true)]
-    public class AspNetCoreCorrelationIdProvider : ICorrelationIdProvider, ITransientDependency
-    {
-        public const string CorrelationIdKey = "_CorrelationId";
-
-        protected IHttpContextAccessor HttpContextAccessor { get; }
-
-        public AspNetCoreCorrelationIdProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            HttpContextAccessor = httpContextAccessor;
-        }
-
-        public virtual string Get()
-        {
-            if (HttpContextAccessor.HttpContext?.Request?.Headers == null)
-            {
-                return CreateNewCorrelationId();
-            }
-
-            string correlationId = HttpContextAccessor.HttpContext.Request.Headers[CorrelationIdKey];
-
-            if (correlationId.IsNullOrEmpty())
-            {
-                correlationId = CreateNewCorrelationId();
-                HttpContextAccessor.HttpContext.Request.Headers[CorrelationIdKey] = correlationId;
-            }
-
-            return correlationId;
-        }
-
-        protected virtual string CreateNewCorrelationId()
-        {
-            return Guid.NewGuid().ToString("N");
-        }
-    }
-}
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
new file mode 100644
index 0000000000..c96a760aad
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using System.Threading.Tasks;
+using Volo.Abp.Tracing;
+
+namespace Volo.Abp.AspNetCore.Tracing
+{
+    public class AbpCorrelationIdMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public AbpCorrelationIdMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task Invoke(
+            HttpContext httpContext,
+            IOptions<CorrelationIdOptions> options,
+            ICorrelationIdProvider correlationIdProvider)
+        {
+            var correlationId = correlationIdProvider.Get();
+            var optionsValue = options.Value;
+
+            try
+            {
+                await _next(httpContext);
+            }
+            finally
+            {
+                CheckAndSetCorrelationIdOnResponse(httpContext, optionsValue, correlationId);
+            }
+        }
+
+        protected virtual void CheckAndSetCorrelationIdOnResponse(
+            HttpContext httpContext,
+            CorrelationIdOptions options,
+            string correlationId)
+        {
+            if (httpContext.Response.HasStarted)
+            {
+                return;
+            }
+
+            if (!options.SetResponseHeader)
+            {
+                return;
+            }
+
+            if (httpContext.Response.Headers.ContainsKey(options.HttpHeaderName))
+            {
+                return;
+            }
+
+            httpContext.Response.Headers[options.HttpHeaderName] = correlationId;
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
new file mode 100644
index 0000000000..78383d1252
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
@@ -0,0 +1,49 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Tracing;
+
+namespace Volo.Abp.AspNetCore.Tracing
+{
+    [Dependency(ReplaceServices = true)]
+    public class AspNetCoreCorrelationIdProvider : ICorrelationIdProvider, ITransientDependency
+    {
+        protected IHttpContextAccessor HttpContextAccessor { get; }
+        protected CorrelationIdOptions Options { get; }
+
+        public AspNetCoreCorrelationIdProvider(
+            IHttpContextAccessor httpContextAccessor,
+            IOptions<CorrelationIdOptions> options)
+        {
+            HttpContextAccessor = httpContextAccessor;
+            Options = options.Value;
+        }
+
+        public virtual string Get()
+        {
+            if (HttpContextAccessor.HttpContext?.Request?.Headers == null)
+            {
+                return CreateNewCorrelationId();
+            }
+
+            lock (HttpContextAccessor.HttpContext.Request.Headers)
+            {
+                string correlationId = HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName];
+
+                if (correlationId.IsNullOrEmpty())
+                {
+                    correlationId = CreateNewCorrelationId();
+                    HttpContextAccessor.HttpContext.Request.Headers[Options.HttpHeaderName] = correlationId;
+                }
+
+                return correlationId;
+            }
+        }
+
+        protected virtual string CreateNewCorrelationId()
+        {
+            return Guid.NewGuid().ToString("N");
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs
index 94ffc6670b..616190af64 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs
@@ -14,6 +14,12 @@ namespace Volo.Abp.Auditing
         /// </summary>
         public bool IsEnabled { get; set; }
 
+        /// <summary>
+        /// The name of the application or service writing audit logs.
+        /// Default: null.
+        /// </summary>
+        public string ApplicationName { get; set; }
+
         /// <summary>
         /// Default: true.
         /// </summary>
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditLogInfo.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditLogInfo.cs
index 2881d7b230..79becb4ea0 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditLogInfo.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditLogInfo.cs
@@ -10,6 +10,8 @@ namespace Volo.Abp.Auditing
     //TODO: Make serializable!
     public class AuditLogInfo : IMultiTenant, IHasExtraProperties
     {
+        public string ApplicationName { get; set; }
+
         public Guid? UserId { get; set; }
 
         public string UserName { get; set; }
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs
index 5e4bbf721d..c584d322a0 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs
+++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs
@@ -9,6 +9,7 @@ using Volo.Abp.Clients;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Timing;
+using Volo.Abp.Tracing;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.Auditing
@@ -89,6 +90,7 @@ namespace Volo.Abp.Auditing
         {
             var auditInfo = new AuditLogInfo
             {
+                ApplicationName = Options.ApplicationName,
                 TenantId = CurrentTenant.Id,
                 UserId = CurrentUser.Id,
                 UserName = CurrentUser.UserName,
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/NullCorrelationIdProvider.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/NullCorrelationIdProvider.cs
deleted file mode 100644
index 70f35495c7..0000000000
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/NullCorrelationIdProvider.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.Auditing
-{
-    public class NullCorrelationIdProvider : ICorrelationIdProvider, ISingletonDependency
-    {
-        public string Get()
-        {
-            return null;
-        }
-    }
-}
\ No newline at end of file
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.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs
new file mode 100644
index 0000000000..0b794674ad
--- /dev/null
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.Tracing
+{
+    public class CorrelationIdOptions
+    {
+        public string HttpHeaderName { get; set; } = "X-Correlation-Id";
+
+        public bool SetResponseHeader { get; set; } = true;
+    }
+}
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/DefaultCorrelationIdProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/DefaultCorrelationIdProvider.cs
new file mode 100644
index 0000000000..24102112a7
--- /dev/null
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/DefaultCorrelationIdProvider.cs
@@ -0,0 +1,18 @@
+using System;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Tracing
+{
+    public class DefaultCorrelationIdProvider : ICorrelationIdProvider, ISingletonDependency
+    {
+        public string Get()
+        {
+            return CreateNewCorrelationId();
+        }
+
+        protected virtual string CreateNewCorrelationId()
+        {
+            return Guid.NewGuid().ToString("N");
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICorrelationIdProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/ICorrelationIdProvider.cs
similarity index 51%
rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICorrelationIdProvider.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Tracing/ICorrelationIdProvider.cs
index aa45519911..082da95779 100644
--- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/ICorrelationIdProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/ICorrelationIdProvider.cs
@@ -1,7 +1,10 @@
-namespace Volo.Abp.Auditing
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Tracing
 {
     public interface ICorrelationIdProvider
     {
+        [NotNull]
         string Get();
     }
 }
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.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs
index dccd1c0206..ea84b41792 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs
@@ -1,98 +1,61 @@
-using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 namespace Volo.Abp.Domain.Values
 {
-    //Inspired from https://blogs.msdn.microsoft.com/cesardelatorre/2011/06/06/implementing-a-value-object-base-class-supertype-patternddd-patterns-related/
-    
-    /// <summary>
-    /// Base class for value objects.
-    /// </summary>
-    /// <typeparam name="TValueObject">The type of the value object.</typeparam>
-    public abstract class ValueObject<TValueObject> : IEquatable<TValueObject>
-        where TValueObject : ValueObject<TValueObject>
+    //Inspired from https://docs.microsoft.com/en-us/dotnet/standard/microservices-architecture/microservice-ddd-cqrs-patterns/implement-value-objects
+
+    public abstract class ValueObject
     {
-        public bool Equals(TValueObject other)
+        protected static bool EqualOperator(ValueObject left, ValueObject right)
         {
-            if ((object)other == null)
+            if (ReferenceEquals(left, null) ^ ReferenceEquals(right, null))
             {
                 return false;
             }
+            return ReferenceEquals(left, null) || left.Equals(right);
+        }
 
-            var publicProperties = GetType().GetTypeInfo().GetProperties();
-            if (!publicProperties.Any())
-            {
-                return true;
-            }
-
-            return publicProperties.All(property => Equals(property.GetValue(this, null), property.GetValue(other, null)));
+        protected static bool NotEqualOperator(ValueObject left, ValueObject right)
+        {
+            return !(EqualOperator(left, right));
         }
 
+        protected abstract IEnumerable<object> GetAtomicValues();
+
         public override bool Equals(object obj)
         {
-            if (obj == null)
+            if (obj == null || obj.GetType() != GetType())
             {
                 return false;
             }
 
-            var item = obj as ValueObject<TValueObject>;
-            return (object)item != null && Equals((TValueObject)item);
-        }
-
-        public override int GetHashCode()
-        {
-            //TODO: Can we cache the hash value assuming value objects are always immutable? We can make a Reset-like method to reset it's mutated.
-
-            const int index = 1;
-            const int initialHasCode = 31;
-
-            var publicProperties = GetType().GetTypeInfo().GetProperties();
-
-            if (!publicProperties.Any())
+            ValueObject other = (ValueObject)obj;
+            IEnumerator<object> thisValues = GetAtomicValues().GetEnumerator();
+            IEnumerator<object> otherValues = other.GetAtomicValues().GetEnumerator();
+            while (thisValues.MoveNext() && otherValues.MoveNext())
             {
-                return initialHasCode;
-            }
-
-            var hashCode = initialHasCode;
-            var changeMultiplier = false;
-
-            foreach (var property in publicProperties)
-            {
-                var value = property.GetValue(this, null);
-
-                if (value == null)
+                if (ReferenceEquals(thisValues.Current, null) ^
+                    ReferenceEquals(otherValues.Current, null))
                 {
-                    //support {"a",null,null,"a"} != {null,"a","a",null}
-                    hashCode = hashCode ^ (index * 13);
-                    continue;
+                    return false;
                 }
 
-                hashCode = hashCode * (changeMultiplier ? 59 : 114) + value.GetHashCode();
-                changeMultiplier = !changeMultiplier;
-            }
-
-            return hashCode;
-        }
-
-        public static bool operator ==(ValueObject<TValueObject> x, ValueObject<TValueObject> y)
-        {
-            if (ReferenceEquals(x, y))
-            {
-                return true;
-            }
-
-            if (((object)x == null) || ((object)y == null))
-            {
-                return false;
+                if (thisValues.Current != null &&
+                    !thisValues.Current.Equals(otherValues.Current))
+                {
+                    return false;
+                }
             }
-
-            return x.Equals(y);
+            return !thisValues.MoveNext() && !otherValues.MoveNext();
         }
 
-        public static bool operator !=(ValueObject<TValueObject> x, ValueObject<TValueObject> y)
+        public override int GetHashCode()
         {
-            return !(x == y);
+            return GetAtomicValues()
+                .Select(x => x != null ? x.GetHashCode() : 0)
+                .Aggregate((x, y) => x ^ y);
         }
+        // Other utilility methods
     }
 }
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.Http.Client/Volo.Abp.Http.Client.csproj b/framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj
index dd9122b666..a93dc4fcb9 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj
+++ b/framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj
@@ -20,6 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Castle.Core\Volo.Abp.Castle.Core.csproj" />
     <ProjectReference Include="..\Volo.Abp.Http\Volo.Abp.Http.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
index 0331c51fff..f9240bd4a8 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs
@@ -1,17 +1,20 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Castle;
 using Volo.Abp.Modularity;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Http.Client
 {
-    [DependsOn(typeof(AbpHttpModule))]
-    [DependsOn(typeof(AbpCastleCoreModule))]
+    [DependsOn(
+        typeof(AbpHttpModule),
+        typeof(AbpCastleCoreModule),
+        typeof(AbpThreadingModule)
+        )]
     public class AbpHttpClientModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
-
             Configure<RemoteServiceOptions>(configuration);
         }
     }
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index e97f6d6323..b108ca92f6 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -15,21 +16,25 @@ using Volo.Abp.Http.ProxyScripting.Generators;
 using Volo.Abp.Json;
 using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
+using Volo.Abp.Tracing;
 
 namespace Volo.Abp.Http.Client.DynamicProxying
 {
-    //TODO: Somehow capture cancellationtoken and pass to other methods...?
-
     public class DynamicHttpProxyInterceptor<TService> : AbpInterceptor, ITransientDependency
     {
-        private static MethodInfo GenericInterceptAsyncMethod { get; }
+        // ReSharper disable once StaticMemberInGenericType
+        protected static MethodInfo GenericInterceptAsyncMethod { get; }
+
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
+        protected ICorrelationIdProvider CorrelationIdProvider { get; }
+        protected CorrelationIdOptions CorrelationIdOptions { get; }
+        protected IDynamicProxyHttpClientFactory HttpClientFactory { get; }
+        protected IApiDescriptionFinder ApiDescriptionFinder { get; }
+        protected RemoteServiceOptions RemoteServiceOptions { get; }
+        protected AbpHttpClientOptions ClientOptions { get; }
+        protected IJsonSerializer JsonSerializer { get; }
+        protected IRemoteServiceHttpClientAuthenticator ClientAuthenticator { get; }
 
-        private readonly IDynamicProxyHttpClientFactory _httpClientFactory;
-        private readonly IApiDescriptionFinder _apiDescriptionFinder;
-        private readonly RemoteServiceOptions _remoteServiceOptions;
-        private readonly AbpHttpClientOptions _clientOptions;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IRemoteServiceHttpClientAuthenticator _clientAuthenticator;
 
         public ILogger<DynamicHttpProxyInterceptor<TService>> Logger { get; set; }
 
@@ -46,14 +51,20 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             IOptionsSnapshot<RemoteServiceOptions> remoteServiceOptions,
             IApiDescriptionFinder apiDescriptionFinder,
             IJsonSerializer jsonSerializer,
-            IRemoteServiceHttpClientAuthenticator clientAuthenticator)
+            IRemoteServiceHttpClientAuthenticator clientAuthenticator,
+            ICancellationTokenProvider cancellationTokenProvider,
+            ICorrelationIdProvider correlationIdProvider, 
+            IOptions<CorrelationIdOptions> correlationIdOptions)
         {
-            _httpClientFactory = httpClientFactory;
-            _apiDescriptionFinder = apiDescriptionFinder;
-            _jsonSerializer = jsonSerializer;
-            _clientAuthenticator = clientAuthenticator;
-            _clientOptions = clientOptions.Value;
-            _remoteServiceOptions = remoteServiceOptions.Value;
+            CancellationTokenProvider = cancellationTokenProvider;
+            CorrelationIdProvider = correlationIdProvider;
+            CorrelationIdOptions = correlationIdOptions.Value;
+            HttpClientFactory = httpClientFactory;
+            ApiDescriptionFinder = apiDescriptionFinder;
+            JsonSerializer = jsonSerializer;
+            ClientAuthenticator = clientAuthenticator;
+            ClientOptions = clientOptions.Value;
+            RemoteServiceOptions = remoteServiceOptions.Value;
 
             Logger = NullLogger<DynamicHttpProxyInterceptor<TService>>.Instance;
         }
@@ -62,11 +73,11 @@ namespace Volo.Abp.Http.Client.DynamicProxying
         {
             if (invocation.Method.ReturnType == typeof(void))
             {
-                AsyncHelper.RunSync(() => MakeRequest(invocation));
+                AsyncHelper.RunSync(() => MakeRequestAsync(invocation));
             }
             else
             {
-                var responseAsString = AsyncHelper.RunSync(() => MakeRequest(invocation));
+                var responseAsString = AsyncHelper.RunSync(() => MakeRequestAsync(invocation));
 
                 //TODO: Think on that
                 if (TypeHelper.IsPrimitiveExtended(invocation.Method.ReturnType, true))
@@ -75,7 +86,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                 }
                 else
                 {
-                    invocation.ReturnValue = _jsonSerializer.Deserialize(
+                    invocation.ReturnValue = JsonSerializer.Deserialize(
                         invocation.Method.ReturnType,
                         responseAsString
                     );
@@ -87,7 +98,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
         {
             if (invocation.Method.ReturnType.GenericTypeArguments.IsNullOrEmpty())
             {
-                return MakeRequest(invocation);
+                return MakeRequestAsync(invocation);
             }
 
             invocation.ReturnValue = GenericInterceptAsyncMethod
@@ -99,7 +110,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
         private async Task<T> MakeRequestAndGetResultAsync<T>(IAbpMethodInvocation invocation)
         {
-            var responseAsString = await MakeRequest(invocation);
+            var responseAsString = await MakeRequestAsync(invocation);
 
             //TODO: Think on that
             if (TypeHelper.IsPrimitiveExtended(typeof(T), true))
@@ -107,28 +118,28 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                 return (T)Convert.ChangeType(responseAsString, typeof(T));
             }
 
-            return _jsonSerializer.Deserialize<T>(responseAsString);
+            return JsonSerializer.Deserialize<T>(responseAsString);
         }
 
-        private async Task<string> MakeRequest(IAbpMethodInvocation invocation)
+        private async Task<string> MakeRequestAsync(IAbpMethodInvocation invocation)
         {
-            using (var client = _httpClientFactory.Create())
+            using (var client = HttpClientFactory.Create())
             {
-                var clientConfig = _clientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}.");
-                var remoteServiceConfig = _remoteServiceOptions.RemoteServices.GetConfigurationOrDefault(clientConfig.RemoteServiceName);
+                var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}.");
+                var remoteServiceConfig = RemoteServiceOptions.RemoteServices.GetConfigurationOrDefault(clientConfig.RemoteServiceName);
 
-                var action = await _apiDescriptionFinder.FindActionAsync(remoteServiceConfig.BaseUrl, typeof(TService), invocation.Method);
+                var action = await ApiDescriptionFinder.FindActionAsync(remoteServiceConfig.BaseUrl, typeof(TService), invocation.Method);
                 var apiVersion = GetApiVersionInfo(action);
                 var url = remoteServiceConfig.BaseUrl + UrlBuilder.GenerateUrlWithParameters(action, invocation.ArgumentsDictionary, apiVersion);
 
                 var requestMessage = new HttpRequestMessage(action.GetHttpMethod(), url)
                 {
-                    Content = RequestPayloadBuilder.BuildContent(action, invocation.ArgumentsDictionary, _jsonSerializer, apiVersion)
+                    Content = RequestPayloadBuilder.BuildContent(action, invocation.ArgumentsDictionary, JsonSerializer, apiVersion)
                 };
 
                 AddHeaders(invocation, action, requestMessage, apiVersion);
 
-                await _clientAuthenticator.Authenticate(
+                await ClientAuthenticator.Authenticate(
                     new RemoteServiceHttpClientAuthenticateContext(
                         client,
                         requestMessage,
@@ -137,7 +148,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                     )
                 );
 
-                var response = await client.SendAsync(requestMessage);
+                var response = await client.SendAsync(requestMessage, GetCancellationToken());
 
                 if (!response.IsSuccessStatusCode)
                 {
@@ -176,8 +187,9 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return action.SupportedVersions.Last(); //TODO: Ensure to get the latest version!
         }
 
-        private static void AddHeaders(IAbpMethodInvocation invocation, ActionApiDescriptionModel action, HttpRequestMessage requestMessage, ApiVersionInfo apiVersion)
+        protected virtual void AddHeaders(IAbpMethodInvocation invocation, ActionApiDescriptionModel action, HttpRequestMessage requestMessage, ApiVersionInfo apiVersion)
         {
+            //API Version
             if (!apiVersion.Version.IsNullOrEmpty())
             {
                 //TODO: What about other media types?
@@ -186,8 +198,8 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                 requestMessage.Headers.Add("api-version", apiVersion.Version);
             }
 
+            //Header parameters
             var headers = action.Parameters.Where(p => p.BindingSourceId == ParameterBindingSources.Header).ToArray();
-
             foreach (var headerParameter in headers)
             {
                 var value = HttpActionParameterHelper.FindParameterValue(invocation.ArgumentsDictionary, headerParameter);
@@ -196,22 +208,25 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                     requestMessage.Headers.Add(headerParameter.Name, value.ToString());
                 }
             }
+
+            //CorrelationId
+            requestMessage.Headers.Add(CorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get());
         }
 
         private string GetConfiguredApiVersion()
         {
-            var clientConfig = _clientOptions.HttpClientProxies.GetOrDefault(typeof(TService))
+            var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService))
                                ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}.");
 
-            return _remoteServiceOptions.RemoteServices.GetOrDefault(clientConfig.RemoteServiceName)?.Version
-                   ?? _remoteServiceOptions.RemoteServices.Default?.Version;
+            return RemoteServiceOptions.RemoteServices.GetOrDefault(clientConfig.RemoteServiceName)?.Version
+                   ?? RemoteServiceOptions.RemoteServices.Default?.Version;
         }
 
         private async Task ThrowExceptionForResponseAsync(HttpResponseMessage response)
         {
             if (response.Headers.Contains(AbpHttpConsts.AbpErrorFormat))
             {
-                var errorResponse = _jsonSerializer.Deserialize<RemoteServiceErrorResponse>(
+                var errorResponse = JsonSerializer.Deserialize<RemoteServiceErrorResponse>(
                     await response.Content.ReadAsStringAsync()
                 );
 
@@ -220,5 +235,10 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
             throw new AbpException($"Remote service returns error! HttpStatusCode: {response.StatusCode}, ReasonPhrase: {response.ReasonPhrase}");
         }
+
+        protected virtual CancellationToken GetCancellationToken()
+        {
+            return CancellationTokenProvider.Token;
+        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
index ee1dd28e85..ad956aee1e 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
@@ -15,7 +15,6 @@ namespace Volo.Abp.IdentityModel
     public class IdentityModelHttpClientAuthenticator : IIdentityModelHttpClientAuthenticator, ITransientDependency
     {
         public ILogger<IdentityModelHttpClientAuthenticator> Logger { get; set; }
-
         protected IdentityClientOptions ClientOptions { get; }
         
         public IdentityModelHttpClientAuthenticator(
@@ -84,6 +83,8 @@ namespace Volo.Abp.IdentityModel
 
         protected virtual async Task<TokenResponse> GetTokenResponse(DiscoveryResponse discoveryResponse, IdentityClientConfiguration configuration)
         {
+            //TODO: Pass cancellation token
+
             var tokenClient = new TokenClient(discoveryResponse.TokenEndpoint, configuration.ClientId, configuration.ClientSecret);
 
             switch (configuration.GrantType)
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.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs
index c1298d0e27..b079b38188 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs
@@ -82,6 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseMiddleware<FakeAuthenticationMiddleware>();
             app.UseAuditing();
             app.UseUnitOfWork();
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/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/AuditLogConsts.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/AuditLogConsts.cs
index 6f2756bfc4..f6a73bb19a 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/AuditLogConsts.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/AuditLogConsts.cs
@@ -2,6 +2,8 @@
 {
     public static class AuditLogConsts
     {
+        public const int MaxApplicationNameLength = 96;
+
         public const int MaxClientIpAddressLength = 64;
 
         public const int MaxClientNameLength = 128;
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditLog.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditLog.cs
index 411d64843f..5640685b2e 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditLog.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditLog.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Volo.Abp.Auditing;
-using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
@@ -12,6 +11,8 @@ namespace Volo.Abp.AuditLogging
     [DisableAuditing]
     public class AuditLog : AggregateRoot<Guid>, IMultiTenant
     {
+        public virtual string ApplicationName { get; set; }
+
         public virtual Guid? UserId { get; protected set; }
 
         public virtual string UserName { get; protected set; }
@@ -58,6 +59,7 @@ namespace Volo.Abp.AuditLogging
         public AuditLog(IGuidGenerator guidGenerator, AuditLogInfo auditInfo)
         {
             Id = guidGenerator.Create();
+            ApplicationName = auditInfo.ApplicationName;
             TenantId = auditInfo.TenantId;
             UserId = auditInfo.UserId;
             UserName = auditInfo.UserName.Truncate(AuditLogConsts.MaxUserNameLength);
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingtDbContextModelBuilderExtensions.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingtDbContextModelBuilderExtensions.cs
index ae066f2d38..bc8a8d2e52 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingtDbContextModelBuilderExtensions.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingtDbContextModelBuilderExtensions.cs
@@ -24,6 +24,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
                 b.ConfigureExtraProperties();
 
+                b.Property(x => x.ApplicationName).HasMaxLength(AuditLogConsts.MaxApplicationNameLength).HasColumnName(nameof(AuditLog.ApplicationName));
                 b.Property(x => x.ClientIpAddress).HasMaxLength(AuditLogConsts.MaxClientIpAddressLength).HasColumnName(nameof(AuditLog.ClientIpAddress));
                 b.Property(x => x.ClientName).HasMaxLength(AuditLogConsts.MaxClientNameLength).HasColumnName(nameof(AuditLog.ClientName));
                 b.Property(x => x.ClientId).HasMaxLength(AuditLogConsts.MaxClientIdLength).HasColumnName(nameof(AuditLog.ClientId));
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissionDefinitionProvider.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissionDefinitionProvider.cs
index 1c8a8df8d0..14c12adde2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissionDefinitionProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissionDefinitionProvider.cs
@@ -22,7 +22,9 @@ namespace Volo.Abp.Identity
             usersPermission.AddChild(IdentityPermissions.Users.Delete, L("Permission:Delete"));
             usersPermission.AddChild(IdentityPermissions.Users.ManagePermissions, L("Permission:ChangePermissions"));
 
-            identityGroup.AddPermission(IdentityPermissions.UserLookup.Default, L("Permission:UserLookup"));
+            identityGroup
+                .AddPermission(IdentityPermissions.UserLookup.Default, L("Permission:UserLookup"))
+                .WithProviders(ClientPermissionValueProvider.ProviderName);
         }
 
         private static LocalizableString L(string name)
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs
index ffe69f2362..339122c2a8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs
@@ -41,7 +41,8 @@
                 Users.Create,
                 Users.Update,
                 Users.Delete,
-                Users.ManagePermissions
+                Users.ManagePermissions,
+                UserLookup.Default
             };
         }
     }
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/.dockerignore b/samples/MicroserviceDemo/.dockerignore
new file mode 100644
index 0000000000..3a78c9d4c3
--- /dev/null
+++ b/samples/MicroserviceDemo/.dockerignore
@@ -0,0 +1,13 @@
+node_modules
+npm-debug.log
+Dockerfile*
+docker-compose*
+.dockerignore
+.git
+.gitignore
+.env
+*/bin
+*/obj
+README.md
+LICENSE
+.vscode
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/DeployToKubernetes.sh b/samples/MicroserviceDemo/DeployToKubernetes.sh
new file mode 100755
index 0000000000..8ca8667878
--- /dev/null
+++ b/samples/MicroserviceDemo/DeployToKubernetes.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+export SHELL="/bin/bash"
+
+minikube start
+
+eval $(minikube docker-env)
+docker-compose -f docker-compose.yml -f docker-compose.migrations.yml -f docker-compose.override.yml build
+
+cd ./k8s
+kubectl create -f $(ls -x | grep .yaml | grep -v deployment | tr " \t\n\r" ","  | sed 's/.$//')
+kubectl create -f $(ls -x | grep .yaml | grep deployment | tr " \t\n\r" ","  | sed 's/.$//')
diff --git a/samples/MicroserviceDemo/README.md b/samples/MicroserviceDemo/README.md
new file mode 100644
index 0000000000..e855adba0f
--- /dev/null
+++ b/samples/MicroserviceDemo/README.md
@@ -0,0 +1,26 @@
+# MicroserviceDemo
+
+Run demo using docker-compose:
+
+First restore mssql database
+```sh
+$ docker-compose -f docker-compose.yml -f docker-compose.migrations.yml run restore-database
+```
+
+Build and start containers
+```sh
+$ docker-compose up -d
+```
+
+Add this line to your `hosts` file
+```
+127.0.0.1	auth-server
+```
+- Windows: `C:\Windows\System32\Drivers\etc\hosts`
+- Linux & macOS: `/etc/hosts`
+
+
+### Accessing the Web User Interfaces
+- AuthServer: `http://localhost:64999`
+- PublicWebsite: `http://localhost:53435`
+- BackendAdminApp: `http://localhost:51954`
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj
index 324b4abf06..4f10fd61b9 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs
index 3d1112c760..bc0d0b825d 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
+using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.EventBus.RabbitMq;
@@ -60,12 +61,19 @@ namespace AuthServer.Host
             {
                 options.Configuration = configuration["Redis:Configuration"];
             });
+
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.IsEnabledForGetRequests = true;
+                options.ApplicationName = "AuthServer";
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseIdentityServer();
             app.UseAbpRequestLocalization();
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile b/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
new file mode 100644
index 0000000000..4fe82ef81b
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/applications/AuthServer.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "AuthServer.Host.dll"]
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.Designer.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.Designer.cs
new file mode 100644
index 0000000000..c40fb65f22
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.Designer.cs
@@ -0,0 +1,1154 @@
+// <auto-generated />
+using System;
+using AuthServer.Host.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace AuthServer.Host.Migrations
+{
+    [DbContext(typeof(AuthServerDbContext))]
+    [Migration("20190209193341_Added_ApplicationName_To_AuditLogs")]
+    partial class Added_ApplicationName_To_AuditLogs
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    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);
+
+                    b.Property<string>("ClientName")
+                        .HasColumnName("ClientName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Comments")
+                        .HasColumnName("Comments")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnName("Exceptions")
+                        .HasMaxLength(4000);
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HttpMethod")
+                        .HasColumnName("HttpMethod")
+                        .HasMaxLength(16);
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnName("HttpStatusCode");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnName("ImpersonatorTenantId");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnName("ImpersonatorUserId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Url")
+                        .HasColumnName("Url")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnName("UserId");
+
+                    b.Property<string>("UserName")
+                        .HasColumnName("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnName("ExecutionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("MethodName")
+                        .HasColumnName("MethodName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Parameters")
+                        .HasColumnName("Parameters")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ServiceName")
+                        .HasColumnName("ServiceName")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogActions");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnName("ChangeTime");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnName("ChangeType");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnName("EntityId")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("EntityTypeFullName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("AbpEntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<Guid>("EntityChangeId");
+
+                    b.Property<string>("NewValue")
+                        .HasColumnName("NewValue")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("OriginalValue")
+                        .HasColumnName("OriginalValue")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasColumnName("PropertyName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("PropertyTypeFullName")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("AbpEntityPropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsStatic");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Regex")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("RegexDescription")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Required");
+
+                    b.Property<int>("ValueType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpClaimTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnName("IsDefault");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnName("IsPublic");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnName("IsStatic");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("AbpRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid>("RoleId");
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AbpRoleClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("AccessFailedCount")
+                        .HasDefaultValue(0);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Email")
+                        .HasColumnName("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("LockoutEnabled")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasColumnName("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnName("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnName("PasswordHash")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnName("SecurityStamp")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("TwoFactorEnabled")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("AbpUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.Property<Guid>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AbpUserClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(196);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("AbpUserLogins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId");
+
+                    b.Property<Guid>("RoleId");
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("AbpUserRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AbpUserTokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(200);
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IdentityServerApiResources");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b =>
+                {
+                    b.Property<Guid>("ApiResourceId");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(196);
+
+                    b.HasKey("ApiResourceId", "Type");
+
+                    b.ToTable("IdentityServerApiClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b =>
+                {
+                    b.Property<Guid>("ApiResourceId");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(196);
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Emphasize");
+
+                    b.Property<bool>("Required");
+
+                    b.Property<bool>("ShowInDiscoveryDocument");
+
+                    b.HasKey("ApiResourceId", "Name");
+
+                    b.ToTable("IdentityServerApiScopes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b =>
+                {
+                    b.Property<Guid>("ApiResourceId");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(196);
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(196);
+
+                    b.HasKey("ApiResourceId", "Name", "Type");
+
+                    b.ToTable("IdentityServerApiScopeClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b =>
+                {
+                    b.Property<Guid>("ApiResourceId");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(32);
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(196);
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256);
+
+                    b.Property<DateTime?>("Expiration");
+
+                    b.HasKey("ApiResourceId", "Type", "Value");
+
+                    b.ToTable("IdentityServerApiSecrets");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AbsoluteRefreshTokenLifetime");
+
+                    b.Property<int>("AccessTokenLifetime");
+
+                    b.Property<int>("AccessTokenType");
+
+                    b.Property<bool>("AllowAccessTokensViaBrowser");
+
+                    b.Property<bool>("AllowOfflineAccess");
+
+                    b.Property<bool>("AllowPlainTextPkce");
+
+                    b.Property<bool>("AllowRememberConsent");
+
+                    b.Property<bool>("AlwaysIncludeUserClaimsInIdToken");
+
+                    b.Property<bool>("AlwaysSendClientClaims");
+
+                    b.Property<int>("AuthorizationCodeLifetime");
+
+                    b.Property<bool>("BackChannelLogoutSessionRequired");
+
+                    b.Property<string>("BackChannelLogoutUri")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ClientClaimsPrefix")
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ClientName")
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ClientUri")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ConcurrencyStamp");
+
+                    b.Property<int?>("ConsentLifetime");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("EnableLocalLogin");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("FrontChannelLogoutSessionRequired");
+
+                    b.Property<string>("FrontChannelLogoutUri")
+                        .HasMaxLength(2000);
+
+                    b.Property<int>("IdentityTokenLifetime");
+
+                    b.Property<bool>("IncludeJwtId");
+
+                    b.Property<string>("LogoUri")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("PairWiseSubjectSalt")
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ProtocolType")
+                        .IsRequired()
+                        .HasMaxLength(200);
+
+                    b.Property<int>("RefreshTokenExpiration");
+
+                    b.Property<int>("RefreshTokenUsage");
+
+                    b.Property<bool>("RequireClientSecret");
+
+                    b.Property<bool>("RequireConsent");
+
+                    b.Property<bool>("RequirePkce");
+
+                    b.Property<int>("SlidingRefreshTokenLifetime");
+
+                    b.Property<bool>("UpdateAccessTokenClaimsOnRefresh");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.ToTable("IdentityServerClients");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(250);
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(250);
+
+                    b.HasKey("ClientId", "Type", "Value");
+
+                    b.ToTable("IdentityServerClientClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Origin")
+                        .HasMaxLength(150);
+
+                    b.HasKey("ClientId", "Origin");
+
+                    b.ToTable("IdentityServerClientCorsOrigins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("GrantType")
+                        .HasMaxLength(196);
+
+                    b.HasKey("ClientId", "GrantType");
+
+                    b.ToTable("IdentityServerClientGrantTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Provider")
+                        .HasMaxLength(64);
+
+                    b.HasKey("ClientId", "Provider");
+
+                    b.ToTable("IdentityServerClientIdPRestrictions");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("PostLogoutRedirectUri")
+                        .HasMaxLength(200);
+
+                    b.HasKey("ClientId", "PostLogoutRedirectUri");
+
+                    b.ToTable("IdentityServerClientPostLogoutRedirectUris");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Key")
+                        .HasMaxLength(250);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2000);
+
+                    b.HasKey("ClientId", "Key");
+
+                    b.ToTable("IdentityServerClientProperties");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("RedirectUri")
+                        .HasMaxLength(2000);
+
+                    b.HasKey("ClientId", "RedirectUri");
+
+                    b.ToTable("IdentityServerClientRedirectUris");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Scope")
+                        .HasMaxLength(196);
+
+                    b.HasKey("ClientId", "Scope");
+
+                    b.ToTable("IdentityServerClientScopes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b =>
+                {
+                    b.Property<Guid>("ClientId");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(32);
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(196);
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256);
+
+                    b.Property<DateTime?>("Expiration");
+
+                    b.HasKey("ClientId", "Type", "Value");
+
+                    b.ToTable("IdentityServerClientSecrets");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ClientId")
+                        .IsRequired()
+                        .HasMaxLength(200);
+
+                    b.Property<string>("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime");
+
+                    b.Property<string>("Data")
+                        .IsRequired();
+
+                    b.Property<DateTime?>("Expiration");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("Id");
+
+                    b.Property<string>("SubjectId")
+                        .HasMaxLength(200);
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Key");
+
+                    b.HasIndex("SubjectId", "ClientId", "Type");
+
+                    b.ToTable("IdentityServerPersistedGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b =>
+                {
+                    b.Property<Guid>("IdentityResourceId");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(196);
+
+                    b.HasKey("IdentityResourceId", "Type");
+
+                    b.ToTable("IdentityServerIdentityClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(200);
+
+                    b.Property<bool>("Emphasize");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200);
+
+                    b.Property<bool>("Required");
+
+                    b.Property<bool>("ShowInDiscoveryDocument");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IdentityServerIdentityResources");
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpPermissionGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2048);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpSettings");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog")
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange")
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser")
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource")
+                        .WithMany("UserClaims")
+                        .HasForeignKey("ApiResourceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource")
+                        .WithMany("Scopes")
+                        .HasForeignKey("ApiResourceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope")
+                        .WithMany("UserClaims")
+                        .HasForeignKey("ApiResourceId", "Name")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource")
+                        .WithMany("Secrets")
+                        .HasForeignKey("ApiResourceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("Claims")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("AllowedCorsOrigins")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("AllowedGrantTypes")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("IdentityProviderRestrictions")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("PostLogoutRedirectUris")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("Properties")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("RedirectUris")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("AllowedScopes")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.Clients.Client")
+                        .WithMany("ClientSecrets")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource")
+                        .WithMany("UserClaims")
+                        .HasForeignKey("IdentityResourceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.cs
new file mode 100644
index 0000000000..91ed4a25a1
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20190209193341_Added_ApplicationName_To_AuditLogs.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace AuthServer.Host.Migrations
+{
+    public partial class Added_ApplicationName_To_AuditLogs : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ApplicationName",
+                table: "AbpAuditLogs",
+                maxLength: 96,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ApplicationName",
+                table: "AbpAuditLogs");
+        }
+    }
+}
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs
index cd62047645..ee3cf09fd3 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs
@@ -24,6 +24,10 @@ namespace AuthServer.Host.Migrations
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasMaxLength(96);
+
                     b.Property<string>("BrowserInfo")
                         .HasColumnName("BrowserInfo")
                         .HasMaxLength(512);
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
index 84f71ab802..80de0a0d64 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace AuthServer.Host
 {
@@ -10,11 +12,26 @@ namespace AuthServer.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "AuthServer")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json b/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json
index 17a9c1a1fe..2840491ce5 100644
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json
@@ -2,6 +2,9 @@
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj
index f91c905ed2..01bc6634d5 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
   </ItemGroup>
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs
index d687cd8933..5969d69370 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs
@@ -89,6 +89,7 @@ namespace BackendAdminApp.Host
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseAbpRequestLocalization();
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
new file mode 100644
index 0000000000..5444edb5a5
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/applications/BackendAdminApp.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "BackendAdminApp.Host.dll"]
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
index 88423094cf..e0736fb529 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace BackendAdminApp.Host
 {
@@ -10,11 +12,26 @@ namespace BackendAdminApp.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BackendAdminApp")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json
index cfc597fc38..95fc1a4664 100644
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json
@@ -9,6 +9,9 @@
       "BaseUrl": "http://localhost:65115/"
     }
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/applications/ConsoleClientDemo/Dockerfile b/samples/MicroserviceDemo/applications/ConsoleClientDemo/Dockerfile
new file mode 100644
index 0000000000..5822384ef6
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/ConsoleClientDemo/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/applications/ConsoleClientDemo"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "ConsoleClientDemo.dll"]
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
new file mode 100644
index 0000000000..82bb090408
--- /dev/null
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/applications/PublicWebSite.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "PublicWebSite.Host.dll"]
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/applications/PublicWebSite.Host/Program.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
index 7512671999..d6a396ecf4 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace PublicWebSite.Host
 {
@@ -10,11 +12,26 @@ namespace PublicWebSite.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "PublicWebSite")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj
index 02618191ce..1585146a68 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs
index dab1006ec0..3591fc018d 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs
@@ -81,6 +81,7 @@ namespace PublicWebSite.Host
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseAbpRequestLocalization();
diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json b/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json
index edf6f8b09d..829fe9722d 100644
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json
@@ -9,6 +9,9 @@
       "BaseUrl": "http://localhost:64897/"
     }
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/databases/Dockerfile b/samples/MicroserviceDemo/databases/Dockerfile
new file mode 100644
index 0000000000..91879f9e7c
--- /dev/null
+++ b/samples/MicroserviceDemo/databases/Dockerfile
@@ -0,0 +1,21 @@
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+RUN apk add --no-cache bash
+WORKDIR /src
+COPY . .
+
+WORKDIR "/src/samples/MicroserviceDemo/microservices/ProductService.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release
+
+WORKDIR "/src/samples/MicroserviceDemo/applications/AuthServer.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release
+
+FROM build AS final
+WORKDIR /src
+COPY --from=build /src/samples/MicroserviceDemo/microservices/ProductService.Host ./ProductService.Host
+COPY --from=build /src/samples/MicroserviceDemo/applications/AuthServer.Host ./AuthServer.Host
+COPY --from=build /src/samples/MicroserviceDemo/databases/entrypoint.sh .
+RUN chmod +x ./entrypoint.sh
+
+ENTRYPOINT ["./entrypoint.sh"]
diff --git a/samples/MicroserviceDemo/databases/MsDemo_Identity.zip b/samples/MicroserviceDemo/databases/MsDemo_Identity.zip
index 6f65aeefac..18c8dc12ab 100644
Binary files a/samples/MicroserviceDemo/databases/MsDemo_Identity.zip and b/samples/MicroserviceDemo/databases/MsDemo_Identity.zip differ
diff --git a/samples/MicroserviceDemo/databases/entrypoint.sh b/samples/MicroserviceDemo/databases/entrypoint.sh
new file mode 100644
index 0000000000..31f4fa7920
--- /dev/null
+++ b/samples/MicroserviceDemo/databases/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd /src/ProductService.Host
+
+until dotnet ef database update --no-build; do
+>&2 echo "SQL Server is starting up"
+sleep 1
+done
+
+cd /src/AuthServer.Host && dotnet ef database update --no-build
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/databases/restore/Dockerfile b/samples/MicroserviceDemo/databases/restore/Dockerfile
new file mode 100644
index 0000000000..917fc27e1a
--- /dev/null
+++ b/samples/MicroserviceDemo/databases/restore/Dockerfile
@@ -0,0 +1,14 @@
+FROM alpine AS unzip
+WORKDIR /src
+RUN apk add --no-cache unzip
+COPY /samples/MicroserviceDemo/databases/MsDemo_Identity.zip .
+COPY /samples/MicroserviceDemo/databases/MsDemo_ProductManagement.zip .
+RUN unzip -q "*.zip"
+
+FROM mcr.microsoft.com/mssql-tools AS restore
+WORKDIR /src
+COPY --from=unzip /src/MsDemo_Identity.bak .
+COPY --from=unzip /src/MsDemo_ProductManagement.bak .
+COPY /samples/MicroserviceDemo/databases/restore/entrypoint.sh .
+RUN chmod +x ./entrypoint.sh
+ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/databases/restore/entrypoint.sh b/samples/MicroserviceDemo/databases/restore/entrypoint.sh
new file mode 100644
index 0000000000..cb34a14ff7
--- /dev/null
+++ b/samples/MicroserviceDemo/databases/restore/entrypoint.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+mkdir -p /var/opt/mssql/backup
+mv /src/MsDemo_Identity.bak /var/opt/mssql/backup
+mv /src/MsDemo_ProductManagement.bak /var/opt/mssql/backup
+
+until /opt/mssql-tools/bin/sqlcmd -S sqlserver -U SA -P $SA_PASSWORD -Q 'SELECT name FROM master.sys.databases'; do
+>&2 echo "SQL Server is starting up"
+sleep 1
+done
+
+/opt/mssql-tools/bin/sqlcmd -S sqlserver \
+   -U SA -P $SA_PASSWORD \
+   -Q 'RESTORE FILELISTONLY FROM DISK = "/var/opt/mssql/backup/MsDemo_Identity.bak"' \
+   | tr -s ' ' | cut -d ' ' -f 1-2
+
+/opt/mssql-tools/bin/sqlcmd -S sqlserver \
+   -U SA -P $SA_PASSWORD \
+   -Q 'RESTORE FILELISTONLY FROM DISK = "/var/opt/mssql/backup/MsDemo_ProductManagement.bak"' \
+   | tr -s ' ' | cut -d ' ' -f 1-2
+
+/opt/mssql-tools/bin/sqlcmd \
+   -S sqlserver -U SA -P $SA_PASSWORD \
+   -Q 'RESTORE DATABASE MsDemo_Identity FROM DISK = "/var/opt/mssql/backup/MsDemo_Identity.bak" WITH MOVE "MsDemo_Identity" TO "/var/opt/mssql/data/MsDemo_Identity.mdf", MOVE "MsDemo_Identity_log" TO "/var/opt/mssql/data/MsDemo_Identity_log.ldf"'
+
+/opt/mssql-tools/bin/sqlcmd \
+   -S sqlserver -U SA -P $SA_PASSWORD \
+   -Q 'RESTORE DATABASE MsDemo_ProductManagement FROM DISK = "/var/opt/mssql/backup/MsDemo_ProductManagement.bak" WITH MOVE "MsDemo_ProductManagement" TO "/var/opt/mssql/data/MsDemo_ProductManagement.mdf", MOVE "MsDemo_ProductManagement_log" TO "/var/opt/mssql/data/MsDemo_ProductManagement_log.ldf"'
diff --git a/samples/MicroserviceDemo/docker-compose.migrations.yml b/samples/MicroserviceDemo/docker-compose.migrations.yml
new file mode 100644
index 0000000000..513c1245aa
--- /dev/null
+++ b/samples/MicroserviceDemo/docker-compose.migrations.yml
@@ -0,0 +1,29 @@
+version: '3.0'
+
+services:
+  sqlserver:
+    environment:
+      - SA_PASSWORD=yourStrong(!)Password
+      - ACCEPT_EULA=Y
+    ports:
+      - "1433:1433"
+
+  migrations:
+    image: 'microservice-demo/migrations:${TAG:-latest}'
+    build:
+      context: ../..
+      dockerfile: samples/MicroserviceDemo/databases/Dockerfile
+    depends_on:
+      - sqlserver
+
+  restore-database:
+    image: 'microservice-demo/restore-database:${TAG:-latest}'
+    build:
+      context: ../..
+      dockerfile: samples/MicroserviceDemo/databases/restore/Dockerfile
+    volumes:
+      - dbdata:/var/opt/mssql
+    environment:
+      - SA_PASSWORD=yourStrong(!)Password
+    depends_on:
+      - sqlserver
diff --git a/samples/MicroserviceDemo/docker-compose.override.yml b/samples/MicroserviceDemo/docker-compose.override.yml
new file mode 100644
index 0000000000..04efc436ec
--- /dev/null
+++ b/samples/MicroserviceDemo/docker-compose.override.yml
@@ -0,0 +1,177 @@
+version: '3.0'
+services:
+  sqlserver:
+    environment:
+      - SA_PASSWORD=yourStrong(!)Password
+      - ACCEPT_EULA=Y
+    ports:
+      - 1433:1433
+
+  mongodb:
+    ports:
+      - 27017:27017
+
+  rabbitmq:
+    ports:
+      - 15672:15672
+      - 5672:5672
+
+  redis:
+    ports:
+      - 6379:6379
+
+  elasticsearch:
+    volumes:
+      - ./elk/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
+    environment:
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ports:
+      - 9200:9200
+
+  logstash:
+    volumes:
+      - ./elk/logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
+      - ./elk/logstash/pipeline:/usr/share/logstash/pipeline:ro
+    environment:
+      - "LS_JAVA_OPTS=-Xmx256m -Xms256m"
+    ports:
+      - 9600:9600
+      - 5000:5000
+
+  kibana:
+    volumes:
+      - ./elk/kibana/config/:/usr/share/kibana/config:ro
+    ports:
+      - 5601:5601
+
+  internal-gateway:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - ReRoutes__0__DownstreamHostAndPorts__Host=identity-service
+      - ReRoutes__0__DownstreamHostAndPorts__Port=80
+      - ReRoutes__1__DownstreamHostAndPorts__Host=product-service
+      - ReRoutes__1__DownstreamHostAndPorts__Port=80
+      - ReRoutes__2__DownstreamHostAndPorts__Host=blogging-service
+      - ReRoutes__2__DownstreamHostAndPorts__Port=80
+      - GlobalConfiguration__BaseUrl=http://internal-gateway
+    ports:
+      - 65129:80
+
+  backend-admin-app-gateway:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - ReRoutes__0__DownstreamHostAndPorts__Host=identity-service
+      - ReRoutes__0__DownstreamHostAndPorts__Port=80
+      - ReRoutes__1__DownstreamHostAndPorts__Host=product-service
+      - ReRoutes__1__DownstreamHostAndPorts__Port=80
+      - GlobalConfiguration__BaseUrl=http://backend-admin-app-gateway
+    ports:
+      - 65115:80
+
+  public-website-gateway:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - ReRoutes__0__DownstreamHostAndPorts__Host=product-service
+      - ReRoutes__0__DownstreamHostAndPorts__Port=80
+      - ReRoutes__1__DownstreamHostAndPorts__Host=blogging-service
+      - ReRoutes__1__DownstreamHostAndPorts__Port=80
+      - GlobalConfiguration__BaseUrl=http://public-website-gateway
+    ports:
+      - 64897:80
+
+  blogging-service:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - ConnectionStrings__Blogging=mongodb://mongodb|MsDemo_Blogging
+      - Redis__Configuration=redis
+      - RabbitMQ__Connections__Default__HostName=rabbitmq
+    ports:
+      - 62157:80
+
+  identity-service:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - RabbitMQ__Connections__Default__HostName=rabbitmq
+    ports:
+      - 63568:80
+
+  product-service:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - ConnectionStrings__ProductManagement=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - RabbitMQ__Connections__Default__HostName=rabbitmq
+    ports:
+      - 60244:80
+
+  auth-server:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:64999
+      - ConnectionStrings__Default=Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+      - Redis__Configuration=redis
+      - RabbitMQ__Connections__Default__HostName=rabbitmq
+    ports:
+      - 64999:64999
+
+  backend-admin-app:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - RemoteServices__Default__BaseUrl=http://backend-admin-app-gateway/
+      - Redis__Configuration=redis
+    ports:
+      - 51954:80
+
+  console-client-demo:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - RemoteServices__Default__BaseUrl=http://internal-gateway/
+      - IdentityClients__Default__Authority=http://auth-server:64999
+    ports:
+      - 63898:80
+
+  public-website:
+    environment:
+      - ElasticSearch__Url=http://elasticsearch:9200
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - AuthServer__Authority=http://auth-server:64999
+      - RemoteServices__Default__BaseUrl=http://public-website-gateway/
+      - Redis__Configuration=redis
+    ports:
+      - 53435:80
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/docker-compose.yml b/samples/MicroserviceDemo/docker-compose.yml
new file mode 100644
index 0000000000..08c6874366
--- /dev/null
+++ b/samples/MicroserviceDemo/docker-compose.yml
@@ -0,0 +1,140 @@
+version: '3.0'
+
+services:
+  sqlserver:
+    image: mcr.microsoft.com/mssql/server
+    volumes:
+      - dbdata:/var/opt/mssql
+  
+  mongodb:
+    image: mongo
+  
+  rabbitmq:
+    image: 'rabbitmq:3-management-alpine'
+
+  redis:
+    image: redis
+
+  elasticsearch:
+    image: 'docker.elastic.co/elasticsearch/elasticsearch:6.6.0'
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+
+  logstash:
+    image: 'docker.elastic.co/logstash/logstash:6.6.0'
+    depends_on:
+      - elasticsearch
+
+  kibana:
+    image: 'docker.elastic.co/kibana/kibana:6.6.0'
+    depends_on:
+      - elasticsearch
+
+  internal-gateway:
+    image: 'microservice-demo/internal-gateway:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - redis
+      - sqlserver
+      - identity-service
+      - product-service
+      - blogging-service
+  
+  backend-admin-app-gateway:
+    image: 'microservice-demo/backend-admin-app-gateway:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - redis
+      - sqlserver
+      - identity-service
+      - product-service
+  
+  public-website-gateway:
+    image: 'microservice-demo/public-website-gateway:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - redis
+      - blogging-service
+      - product-service
+  
+  blogging-service:
+    image: 'microservice-demo/blogging-service:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - mongodb
+      - redis
+  
+  identity-service:
+    image: 'microservice-demo/identity-service:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - rabbitmq
+      - redis
+      - sqlserver
+  
+  product-service:
+    image: 'microservice-demo/product-service:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - sqlserver
+      - redis
+  
+  auth-server:
+    image: 'microservice-demo/auth-server:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/applications/AuthServer.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - redis
+      - rabbitmq
+      - identity-service
+  
+  backend-admin-app:
+    image: 'microservice-demo/backend-admin-app:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/applications/BackendAdminApp.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - backend-admin-app-gateway
+  
+  console-client-demo:
+    image: 'microservice-demo/console-client-demo:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/applications/ConsoleClientDemo/Dockerfile
+    depends_on:
+      - elasticsearch
+      - internal-gateway
+  
+  public-website:
+    image: 'microservice-demo/public-website:${TAG:-latest}'
+    build:
+      context: ../../
+      dockerfile: samples/MicroserviceDemo/applications/PublicWebSite.Host/Dockerfile
+    depends_on:
+      - elasticsearch
+      - public-website-gateway
+
+volumes:
+  dbdata:
+  esdata:
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/docs/design/Overall.md b/samples/MicroserviceDemo/docs/design/Overall.md
index 36c4beee58..fe75084afe 100644
--- a/samples/MicroserviceDemo/docs/design/Overall.md
+++ b/samples/MicroserviceDemo/docs/design/Overall.md
@@ -13,6 +13,8 @@ The goal of this work is to show how to create a complete microservice solution
 * [**Redis**](https://redis.io/) for distributed cache.
 * [**RabbitMQ**](https://www.rabbitmq.com/) for distributed messaging.
 * **[Serilog](https://serilog.net/)** for logging.
+* **[Elasticsearch](https://www.elastic.co/products/elasticsearch)** as log database.
+* **[Kibana](https://www.elastic.co/products/kibana)** as visualization tool (for logs in the Elasticsearch).
 
 ## Diagram
 
diff --git a/samples/MicroserviceDemo/elk/elasticsearch/config/elasticsearch.yml b/samples/MicroserviceDemo/elk/elasticsearch/config/elasticsearch.yml
new file mode 100644
index 0000000000..eb39c2fe10
--- /dev/null
+++ b/samples/MicroserviceDemo/elk/elasticsearch/config/elasticsearch.yml
@@ -0,0 +1,4 @@
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
+discovery.zen.minimum_master_nodes: 1
+discovery.type: single-node
diff --git a/samples/MicroserviceDemo/elk/kibana/config/kibana.yml b/samples/MicroserviceDemo/elk/kibana/config/kibana.yml
new file mode 100644
index 0000000000..08b13ed258
--- /dev/null
+++ b/samples/MicroserviceDemo/elk/kibana/config/kibana.yml
@@ -0,0 +1,4 @@
+server.name: kibana
+server.host: "0"
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
+xpack.monitoring.ui.container.elasticsearch.enabled: true
diff --git a/samples/MicroserviceDemo/elk/logstash/config/logstash.yml b/samples/MicroserviceDemo/elk/logstash/config/logstash.yml
new file mode 100644
index 0000000000..2a5d4d762c
--- /dev/null
+++ b/samples/MicroserviceDemo/elk/logstash/config/logstash.yml
@@ -0,0 +1,2 @@
+http.host: "0.0.0.0"
+path.config: /usr/share/logstash/pipeline
diff --git a/samples/MicroserviceDemo/elk/logstash/pipeline/logstash.conf b/samples/MicroserviceDemo/elk/logstash/pipeline/logstash.conf
new file mode 100644
index 0000000000..10e442ecd5
--- /dev/null
+++ b/samples/MicroserviceDemo/elk/logstash/pipeline/logstash.conf
@@ -0,0 +1,13 @@
+input {
+	tcp {
+		port => 5000
+	}
+}
+
+## Add your filters / logstash plugins configuration here
+
+output {
+	elasticsearch {
+		hosts => "elasticsearch:9200"
+	}
+}
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
index 03f9b51d65..1ec9405f2a 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="Ocelot" Version="13.0.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
@@ -24,6 +25,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel\Volo.Abp.Http.Client.IdentityModel.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
index d0549dcfc1..ddc484b2da 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs
@@ -8,6 +8,7 @@ using Volo.Abp;
 using Volo.Abp.Autofac;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
+using Volo.Abp.Http.Client.IdentityModel;
 using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
@@ -33,7 +34,8 @@ namespace BackendAdminAppGateway.Host
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(BloggingApplicationContractsModule),
         typeof(AbpPermissionManagementDomainIdentityModule),
-        typeof(AbpPermissionManagementDomainIdentityServerModule)
+        typeof(AbpPermissionManagementDomainIdentityServerModule),
+        typeof(AbpHttpClientIdentityModelModule)
         )]
     public class BackendAdminAppGatewayHostModule : AbpModule
     {
@@ -81,6 +83,7 @@ namespace BackendAdminAppGateway.Host
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseSwagger();
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
new file mode 100644
index 0000000000..8577b0d182
--- /dev/null
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "BackendAdminAppGateway.Host.dll"]
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
index 6e2a864021..22f634eadd 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace BackendAdminAppGateway.Host
 {
@@ -10,11 +12,26 @@ namespace BackendAdminAppGateway.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BackendAdminAppGateway")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
index 05ea2b0eda..3e6f45b15a 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
@@ -8,6 +8,9 @@
     "Authority": "http://localhost:64999",
     "ApiName": "BackendAdminAppGateway"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
new file mode 100644
index 0000000000..cb03220467
--- /dev/null
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/gateways/InternalGateway.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "InternalGateway.Host.dll"]
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
index 1f09839dfe..8b56b69df7 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="Ocelot" Version="13.0.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
index b869e121c8..68c98a26a2 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs
@@ -70,6 +70,7 @@ namespace InternalGateway.Host
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseSwagger();
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
index 719eaa6adb..1d53275ed7 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace InternalGateway.Host
 {
@@ -10,11 +12,26 @@ namespace InternalGateway.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "InternalGateway")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json b/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
index 75df9901e2..c3863ac907 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
@@ -6,6 +6,9 @@
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
new file mode 100644
index 0000000000..5f3eee8618
--- /dev/null
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "PublicWebSiteGateway.Host.dll"]
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
index 9a3a9e5e20..e609e48821 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace PublicWebSiteGateway.Host
 {
@@ -10,11 +12,26 @@ namespace PublicWebSiteGateway.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "PublicWebSiteGateway")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj
index 0679c1cae8..6cddd67e53 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="Ocelot" Version="13.0.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
index 33874d6438..36b52cc1e3 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs
@@ -70,6 +70,7 @@ namespace PublicWebSiteGateway.Host
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseSwagger();
diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json
index d0e8ae7f2f..1a1da067be 100644
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json
@@ -6,6 +6,9 @@
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml b/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
new file mode 100644
index 0000000000..b2307834d2
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
@@ -0,0 +1,35 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: auth-server
+  name: auth-server
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: auth-server
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: RabbitMQ__Connections__Default__HostName
+          value: rabbitmq
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/auth-server:latest
+        name: auth-server
+        ports:
+        - containerPort: 64999
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/auth-server-service.yaml b/samples/MicroserviceDemo/k8s/auth-server-service.yaml
new file mode 100644
index 0000000000..c96e9c3e3d
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/auth-server-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: auth-server
+  name: auth-server
+spec:
+  ports:
+  - name: "64999"
+    port: 64999
+    targetPort: 64999
+  selector:
+    io.kompose.service: auth-server
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
new file mode 100644
index 0000000000..ce6c238f7c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: backend-admin-app
+  name: backend-admin-app
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: backend-admin-app
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: Redis__Configuration
+          value: redis
+        - name: RemoteServices__Default__BaseUrl
+          value: http://backend-admin-app-gateway/
+        image: microservice-demo/backend-admin-app:latest
+        name: backend-admin-app
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
new file mode 100644
index 0000000000..10490961e5
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
@@ -0,0 +1,47 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: backend-admin-app-gateway
+  name: backend-admin-app-gateway
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: backend-admin-app-gateway
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: GlobalConfiguration__BaseUrl
+          value: http://backend-admin-app-gateway
+        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+          value: identity-service
+        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+          value: product-service
+        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: Redis__Configuration
+          value: redis
+        - name: RemoteServices__Default__BaseUrl
+          value: http://backend-admin-app-gateway/
+        image: microservice-demo/backend-admin-app-gateway:latest
+        name: backend-admin-app-gateway
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
new file mode 100644
index 0000000000..ca3faee62c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: backend-admin-app-gateway
+  name: backend-admin-app-gateway
+spec:
+  ports:
+  - name: "65115"
+    port: 65115
+    targetPort: 80
+  selector:
+    io.kompose.service: backend-admin-app-gateway
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
new file mode 100644
index 0000000000..f735fdae1c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: backend-admin-app
+  name: backend-admin-app
+spec:
+  ports:
+  - name: "3000"
+    port: 3000
+    targetPort: 80
+  selector:
+    io.kompose.service: backend-admin-app
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
new file mode 100644
index 0000000000..a5b801106b
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
@@ -0,0 +1,39 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: blogging-service
+  name: blogging-service
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: blogging-service
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Blogging
+          value: mongodb://mongodb|MsDemo_Blogging
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: RabbitMQ__Connections__Default__HostName
+          value: rabbitmq
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/blogging-service:latest
+        name: blogging-service
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/blogging-service-service.yaml b/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
new file mode 100644
index 0000000000..d0ab95528e
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: blogging-service
+  name: blogging-service
+spec:
+  ports:
+  - name: "62157"
+    port: 62157
+    targetPort: 80
+  selector:
+    io.kompose.service: blogging-service
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml b/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml
new file mode 100644
index 0000000000..4ccfd788be
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml
@@ -0,0 +1,32 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: console-client-demo
+  name: console-client-demo
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: console-client-demo
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: IdentityClients__Default__Authority
+          value: http://auth-server:64999
+        - name: RemoteServices__Default__BaseUrl
+          value: http://internal-gateway/
+        image: microservice-demo/console-client-demo:latest
+        name: console-client-demo
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml b/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml
new file mode 100644
index 0000000000..5146110356
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: console-client-demo
+  name: console-client-demo
+spec:
+  ports:
+  - name: "3001"
+    port: 3001
+    targetPort: 80
+  selector:
+    io.kompose.service: console-client-demo
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/dbdata-persistentvolumeclaim.yaml b/samples/MicroserviceDemo/k8s/dbdata-persistentvolumeclaim.yaml
new file mode 100644
index 0000000000..cfed8b93e2
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/dbdata-persistentvolumeclaim.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: dbdata
+  name: dbdata
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Mi
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml b/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
new file mode 100644
index 0000000000..4df2099e49
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
@@ -0,0 +1,37 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: identity-service
+  name: identity-service
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: identity-service
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: RabbitMQ__Connections__Default__HostName
+          value: rabbitmq
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/identity-service:latest
+        name: identity-service
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/identity-service-service.yaml b/samples/MicroserviceDemo/k8s/identity-service-service.yaml
new file mode 100644
index 0000000000..8c601852a3
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/identity-service-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: identity-service
+  name: identity-service
+spec:
+  ports:
+  - name: "63568"
+    port: 63568
+    targetPort: 80
+  selector:
+    io.kompose.service: identity-service
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
new file mode 100644
index 0000000000..4abd77f1df
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
@@ -0,0 +1,49 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: internal-gateway
+  name: internal-gateway
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: internal-gateway
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: GlobalConfiguration__BaseUrl
+          value: http://internal-gateway
+        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+          value: identity-service
+        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+          value: product-service
+        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: ReRoutes__2__DownstreamHostAndPorts__Host
+          value: blogging-service
+        - name: ReRoutes__2__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/internal-gateway:latest
+        name: internal-gateway
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml b/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
new file mode 100644
index 0000000000..5b392f5619
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: internal-gateway
+  name: internal-gateway
+spec:
+  ports:
+  - name: "65129"
+    port: 65129
+    targetPort: 80
+  selector:
+    io.kompose.service: internal-gateway
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/migrations-deployment.yaml b/samples/MicroserviceDemo/k8s/migrations-deployment.yaml
new file mode 100644
index 0000000000..bae8d1388b
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/migrations-deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: migrations
+  name: migrations
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: migrations
+    spec:
+      containers:
+      - image: microservice-demo/migrations:latest
+        name: migrations
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/migrations-job.yaml b/samples/MicroserviceDemo/k8s/migrations-job.yaml
new file mode 100644
index 0000000000..257393379e
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/migrations-job.yaml
@@ -0,0 +1,12 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: migrations
+spec:
+  template:
+    spec:
+      containers:
+      - image: microservice-demo/migrations:latest
+        name: migrations
+        imagePullPolicy: Never
+      restartPolicy: Never
diff --git a/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml b/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
new file mode 100644
index 0000000000..48617c488c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: mongodb
+  name: mongodb
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: mongodb
+    spec:
+      containers:
+      - image: mongo
+        name: mongodb
+        ports:
+        - containerPort: 27017
+        resources: {}
+        imagePullPolicy: IfNotPresent
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/mongodb-service.yaml b/samples/MicroserviceDemo/k8s/mongodb-service.yaml
new file mode 100644
index 0000000000..59480974ff
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/mongodb-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: mongodb
+  name: mongodb
+spec:
+  ports:
+  - name: "27017"
+    port: 27017
+    targetPort: 27017
+  selector:
+    io.kompose.service: mongodb
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/product-service-deployment.yaml b/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
new file mode 100644
index 0000000000..5418a8abc7
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
@@ -0,0 +1,40 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: product-service
+  name: product-service
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: product-service
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: ConnectionStrings__ProductManagement
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: RabbitMQ__Connections__Default__HostName
+          value: rabbitmq
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/product-service:latest
+        name: product-service
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/product-service-service.yaml b/samples/MicroserviceDemo/k8s/product-service-service.yaml
new file mode 100644
index 0000000000..25b52f9d7c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/product-service-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: product-service
+  name: product-service
+spec:
+  ports:
+  - name: "60244"
+    port: 60244
+    targetPort: 80
+  selector:
+    io.kompose.service: product-service
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-deployment.yaml b/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
new file mode 100644
index 0000000000..3c8955a99b
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: public-website
+  name: public-website
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: public-website
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: Redis__Configuration
+          value: redis
+        - name: RemoteServices__Default__BaseUrl
+          value: http://public-website-gateway/
+        image: microservice-demo/public-website:latest
+        name: public-website
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
new file mode 100644
index 0000000000..9532d9334f
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
@@ -0,0 +1,45 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: public-website-gateway
+  name: public-website-gateway
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: public-website-gateway
+    spec:
+      containers:
+      - env:
+        - name: ASPNETCORE_ENVIRONMENT
+          value: Development
+        - name: ASPNETCORE_URLS
+          value: http://0.0.0.0:80
+        - name: AuthServer__Authority
+          value: http://auth-server:64999
+        - name: ConnectionStrings__Default
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+            Security=false
+        - name: GlobalConfiguration__BaseUrl
+          value: http://public-website-gateway
+        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+          value: product-service
+        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+          value: blogging-service
+        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+          value: "80"
+        - name: Redis__Configuration
+          value: redis
+        image: microservice-demo/public-website-gateway:latest
+        name: public-website-gateway
+        ports:
+        - containerPort: 80
+        resources: {}
+        imagePullPolicy: Never
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml b/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
new file mode 100644
index 0000000000..4c007686b7
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: public-website-gateway
+  name: public-website-gateway
+spec:
+  ports:
+  - name: "64897"
+    port: 64897
+    targetPort: 80
+  selector:
+    io.kompose.service: public-website-gateway
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-service.yaml b/samples/MicroserviceDemo/k8s/public-website-service.yaml
new file mode 100644
index 0000000000..77fac13ac3
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/public-website-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: public-website
+  name: public-website
+spec:
+  ports:
+  - name: "3002"
+    port: 3002
+    targetPort: 80
+  selector:
+    io.kompose.service: public-website
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml b/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
new file mode 100644
index 0000000000..5f32e398c1
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
@@ -0,0 +1,24 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: rabbitmq
+  name: rabbitmq
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: rabbitmq
+    spec:
+      containers:
+      - image: rabbitmq:3-management-alpine
+        name: rabbitmq
+        ports:
+        - containerPort: 5672
+        - containerPort: 15672
+        resources: {}
+        imagePullPolicy: IfNotPresent
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/rabbitmq-service.yaml b/samples/MicroserviceDemo/k8s/rabbitmq-service.yaml
new file mode 100644
index 0000000000..b8595193e8
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/rabbitmq-service.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: rabbitmq
+  name: rabbitmq
+spec:
+  ports:
+  - name: "5672"
+    port: 5672
+    targetPort: 5672
+  - name: "15672"
+    port: 15672
+    targetPort: 15672
+  selector:
+    io.kompose.service: rabbitmq
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/redis-deployment.yaml b/samples/MicroserviceDemo/k8s/redis-deployment.yaml
new file mode 100644
index 0000000000..b4389df699
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/redis-deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        io.kompose.service: redis
+    spec:
+      containers:
+      - image: redis
+        name: redis
+        ports:
+        - containerPort: 6379
+        resources: {}
+        imagePullPolicy: IfNotPresent
+      restartPolicy: Always
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/redis-service.yaml b/samples/MicroserviceDemo/k8s/redis-service.yaml
new file mode 100644
index 0000000000..702eaab08c
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/redis-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  ports:
+  - name: "6379"
+    port: 6379
+    targetPort: 6379
+  selector:
+    io.kompose.service: redis
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml b/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
new file mode 100644
index 0000000000..568f29ab4d
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: sqlserver
+  name: sqlserver
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        io.kompose.service: sqlserver
+    spec:
+      containers:
+      - env:
+        - name: ACCEPT_EULA
+          value: "Y"
+        - name: SA_PASSWORD
+          value: yourStrong(!)Password
+        image: mcr.microsoft.com/mssql/server
+        name: sqlserver
+        ports:
+        - containerPort: 1433
+        resources: {}
+        imagePullPolicy: IfNotPresent
+        volumeMounts:
+        - mountPath: /var/opt/mssql
+          name: dbdata
+      restartPolicy: Always
+      volumes:
+      - name: dbdata
+        persistentVolumeClaim:
+          claimName: dbdata
+status: {}
diff --git a/samples/MicroserviceDemo/k8s/sqlserver-service.yaml b/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
new file mode 100644
index 0000000000..57e77a1b42
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: sqlserver
+  name: sqlserver
+spec:
+  ports:
+  - name: "1433"
+    port: 1433
+    targetPort: 1433
+  selector:
+    io.kompose.service: sqlserver
+status:
+  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/kibana/kibana-export.json b/samples/MicroserviceDemo/kibana/kibana-export.json
new file mode 100644
index 0000000000..6b9f733aab
--- /dev/null
+++ b/samples/MicroserviceDemo/kibana/kibana-export.json
@@ -0,0 +1,51 @@
+[
+  {
+    "_id": "06391c40-2f86-11e9-bb15-b7628f52d7f3",
+    "_type": "index-pattern",
+    "_source": {
+      "title": "msdemo-log-*",
+      "timeFieldName": "@timestamp",
+      "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":2,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"fields.ActionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ActionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ActionName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ActionName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ActionResult\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ActionResult.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Application\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Application.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Arguments\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Arguments.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.AuthenticationScheme\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.AuthenticationScheme.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ConnectionId\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ConnectionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ContentLength\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ContentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ContentType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ElapsedMilliseconds\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.EventId.Id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.FullName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.FullName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.HandlerName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.HandlerName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Host.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.HostingRequestFinishedLog\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.HostingRequestFinishedLog.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.HostingRequestStartingLog\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.HostingRequestStartingLog.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Method\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Method.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.PageName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.PageName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Path\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Path.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.PathBase\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.PathBase.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.PhysicalPath\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.PhysicalPath.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Protocol.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.QueryString\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.QueryString.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.RequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.RequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.RequestPath\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.RequestPath.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.RouteData\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.RouteData.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Scheme\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Scheme.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.SourceContext\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.SourceContext.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.StatusCode\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.Type\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.Type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ValidationState\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ValidationState.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ViewComponentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ViewComponentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.ViewComponentName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.ViewComponentName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.VirtualPath\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.VirtualPath.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.endpoint\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.endpoint.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.endpointHandler\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.endpointHandler.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.endpointType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.endpointType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.path\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.path.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.previousRequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.previousRequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.requestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.requestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.scheme\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.scheme.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"fields.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"fields.url.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"messageTemplate\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"messageTemplate.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"renderings.HostingRequestFinishedLog.Format\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"renderings.HostingRequestFinishedLog.Format.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"renderings.HostingRequestFinishedLog.Rendering\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"renderings.HostingRequestFinishedLog.Rendering.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"renderings.HostingRequestStartingLog.Format\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"renderings.HostingRequestStartingLog.Format.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"renderings.HostingRequestStartingLog.Rendering\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"renderings.HostingRequestStartingLog.Rendering.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
+    },
+    "_meta": {
+      "savedObjectVersion": 2
+    },
+    "_migrationVersion": {
+      "index-pattern": "6.5.0"
+    }
+  },
+  {
+    "_id": "d9beab00-2f88-11e9-bb15-b7628f52d7f3",
+    "_type": "visualization",
+    "_source": {
+      "title": "Apps by log count",
+      "visState": "{\"title\":\"Apps by log count\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"times\":[],\"type\":\"histogram\",\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"fields.Application.keyword\",\"size\":12,\"order\":\"desc\",\"orderBy\":\"1\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"customLabel\":\"App\"}}]}",
+      "uiStateJSON": "{}",
+      "description": "",
+      "version": 1,
+      "kibanaSavedObjectMeta": {
+        "searchSourceJSON": "{\"index\":\"06391c40-2f86-11e9-bb15-b7628f52d7f3\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
+      }
+    },
+    "_meta": {
+      "savedObjectVersion": 2
+    }
+  },
+  {
+    "_id": "f00a7400-2f8a-11e9-bb15-b7628f52d7f3",
+    "_type": "visualization",
+    "_source": {
+      "title": "Application error log count",
+      "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"App\",\"field\":\"fields.Application.keyword\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"order\":\"desc\",\"orderBy\":\"1\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"size\":12},\"schema\":\"segment\",\"type\":\"terms\"}],\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"times\":[],\"type\":\"histogram\",\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Application error log count\",\"type\":\"histogram\"}",
+      "uiStateJSON": "{}",
+      "description": "",
+      "version": 1,
+      "kibanaSavedObjectMeta": {
+        "searchSourceJSON": "{\"index\":\"06391c40-2f86-11e9-bb15-b7628f52d7f3\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"06391c40-2f86-11e9-bb15-b7628f52d7f3\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"level\",\"value\":\"Error\",\"params\":{\"query\":\"Error\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"level\":{\"query\":\"Error\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
+      }
+    },
+    "_meta": {
+      "savedObjectVersion": 2
+    }
+  }
+]
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
index d99c35d7f7..10b797c0f4 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
index 8ff7c47b24..1ae68cfd55 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
+using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
 using Volo.Abp.EntityFrameworkCore;
@@ -80,12 +81,19 @@ namespace BloggingService.Host
             {
                 options.Configuration = configuration["Redis:Configuration"];
             });
+
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.IsEnabledForGetRequests = true;
+                options.ApplicationName = "BloggingService";
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseAbpRequestLocalization(); //TODO: localization?
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
new file mode 100644
index 0000000000..05e601031c
--- /dev/null
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/microservices/BloggingService.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "BloggingService.Host.dll"]
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
index 00ace4e0c4..cf6767226e 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace BloggingService.Host
 {
@@ -10,11 +12,26 @@ namespace BloggingService.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BloggingService")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json b/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json
index f5e5e31282..edcaf2127f 100644
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json
@@ -22,6 +22,9 @@
       "Scope": "InternalGateway IdentityService"
     }
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
new file mode 100644
index 0000000000..14038ef487
--- /dev/null
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/microservices/IdentityService.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "IdentityService.Host.dll"]
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj
index 2390e9b733..600dbb96df 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
index 2456bb53ce..9dd68c9f39 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
+using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
 using Volo.Abp.EntityFrameworkCore;
@@ -71,12 +72,19 @@ namespace IdentityService.Host
             {
                 options.Configuration = configuration["Redis:Configuration"];
             });
+
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.IsEnabledForGetRequests = true;
+                options.ApplicationName = "IdentityService";
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseAbpRequestLocalization(); //TODO: localization?
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
index 9f59194360..86dc91ab2a 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace IdentityService.Host
 {
@@ -10,11 +12,26 @@ namespace IdentityService.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "IdentityService")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json b/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json
index 19bf738cce..9a5d60841d 100644
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json
@@ -6,6 +6,9 @@
   "ConnectionStrings": {
     "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "Redis": {
     "Configuration": "127.0.0.1"
   },
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile b/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
new file mode 100644
index 0000000000..e716f68113
--- /dev/null
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Dockerfile
@@ -0,0 +1,18 @@
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/samples/MicroserviceDemo/microservices/ProductService.Host"
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "ProductService.Host.dll"]
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
index cdeb484825..cd3d255d3c 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
@@ -41,6 +42,7 @@
 
   <ItemGroup>
     <Compile Remove="Migrations\20190121115804_Initial.cs" />
+    <Compile Remove="Migrations\20190209193421_Added_ApplicationName_To_AuditLogs.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
index 545b4dde24..c09fb4fcc1 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
@@ -4,6 +4,7 @@ using ProductManagement;
 using ProductManagement.EntityFrameworkCore;
 using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
+using Volo.Abp.Auditing;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
 using Volo.Abp.EntityFrameworkCore;
@@ -71,12 +72,19 @@ namespace ProductService.Host
             {
                 options.Configuration = configuration["Redis:Configuration"];
             });
+
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.IsEnabledForGetRequests = true;
+                options.ApplicationName = "ProductService";
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var app = context.GetApplicationBuilder();
 
+            app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
             app.UseAbpRequestLocalization(); //TODO: localization?
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
index a12f96d9b1..40a6f7b5c6 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;
 
 namespace ProductService.Host
 {
@@ -10,11 +12,26 @@ namespace ProductService.Host
     {
         public static int Main(string[] args)
         {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "ProductService")
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                 .CreateLogger();
 
             try
diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json b/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json
index 1bcfe310d7..e6b2f9ddcb 100644
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json
@@ -10,6 +10,9 @@
   "Redis": {
     "Configuration": "127.0.0.1"
   },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
   "RabbitMQ": {
     "Connections": {
       "Default": {
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>