diff --git a/docs/en/AspNet-Boilerplate-Migration-Guide.md b/docs/en/AspNet-Boilerplate-Migration-Guide.md
index 8aec88336a..190e11769f 100644
--- a/docs/en/AspNet-Boilerplate-Migration-Guide.md
+++ b/docs/en/AspNet-Boilerplate-Migration-Guide.md
@@ -38,6 +38,10 @@ We also suggest you to compare the features of two products based on your needs.
 
 If you have an ASP.NET Zero based solution and want to migrate to the ABP Commercial, this guide will also help you.
 
+### ASP.NET MVC 5.x Projects
+
+The ABP Framework doesn't support ASP.NET MVC 5.x, it only works with ASP.NET Core. So, if you migrate your ASP.NET MVC 5.x based projects, you will also deal with the .NET Core migration.
+
 ## The Migration Progress
 
 We've designed the ABP Framework by **getting the best parts** of the ASP.NET Boilerplate framework, so it will be familiar to you if you've developed ASP.NET Boilerplate based applications.
@@ -608,11 +612,47 @@ So, to migrate your code;
 
 > Note that ABP Framework has also an `IEventBus` interface, but it does exists to be a common interface for the local and distributed event bus. It is not injected and directly used.
 
+### Feature Management
+
+Feature system is used in multi-tenant applications to define features of your application check if given feature is available for the current tenant.
+
+#### Defining Features
+
+In the ASP.NET Boilerplate ([see](https://aspnetboilerplate.com/Pages/Documents/Feature-Management)), you create a class inheriting from the `FeatureProvider`, override the `SetFeatures` method and add your class to the `Configuration.Features.Providers` list.
+
+In the ABP Framework ([see](Features.md)), you derive your class from the `FeatureDefinitionProvider` and override the `Define` method. No need to add your class to the configuration, it is automatically discovered by the framework.
+
+#### Checking Features
+
+You can continue to use the `RequiresFeature` attribute and `IFeatureChecker` service to check if a feature is enabled for the current tenant.
+
+#### Changing the Feature Values
+
+In the ABP Framework you use the `IFeatureManager` to change a feature value for a tenant.
+
+### Audit Logging
+
+TODO
+
+### Localization
+
+TODO
+
+### Navigation
+
+TODO
+
+### Background Jobs & Workers
+
+TODO
+
 ## Missing Features
 
 The following features are not present for the ABP Framework. Here, a list of major missing features (and the related issue for that feature waiting on the ABP Framework GitHub repository):
 
 * [Multi-Lingual Entities](https://aspnetboilerplate.com/Pages/Documents/Multi-Lingual-Entities) ([#1754](https://github.com/abpframework/abp/issues/1754))
+* [Real time notification system](https://aspnetboilerplate.com/Pages/Documents/Notification-System) ([#633](https://github.com/abpframework/abp/issues/633))
+* [NHibernate Integration](https://aspnetboilerplate.com/Pages/Documents/NHibernate-Integration) ([#339](https://github.com/abpframework/abp/issues/339)) - We don't intent to work on this, but any community contribution welcome.
 * ...TODO
 
 Most of these features will eventually be implemented. However, you can implement them yourself if they are important for you. If you want, you can [contribute](Contribution/Index.md) to the framework by implementing these yourself.
\ No newline at end of file
diff --git a/docs/en/Features.md b/docs/en/Features.md
new file mode 100644
index 0000000000..4b31ca16e9
--- /dev/null
+++ b/docs/en/Features.md
@@ -0,0 +1,3 @@
+# Features
+
+TODO
\ No newline at end of file
diff --git a/docs/en/Modules/Feature-Management.md b/docs/en/Modules/Feature-Management.md
new file mode 100644
index 0000000000..5c41277dd8
--- /dev/null
+++ b/docs/en/Modules/Feature-Management.md
@@ -0,0 +1,3 @@
+# Feature Management Module
+
+TODO
\ No newline at end of file
diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md
index 812f22e8dd..2ffb509667 100644
--- a/docs/en/Modules/Index.md
+++ b/docs/en/Modules/Index.md
@@ -16,6 +16,7 @@ There are some **free and open source** application modules developed and mainta
 * **Background Jobs**: Persist background jobs when using the default background job manager.
 * **Blogging**: Used to create fancy blogs. ABP's [own blog](https://blog.abp.io/) already using this module.
 * [**Docs**](Docs.md): Used to create technical documentation pages. ABP's [own documentation](https://docs.abp.io) already using this module.
+* **Feature Management**: Used to persist and manage the [features](../Features.md).
 * **Identity**: Manages roles, users and their permissions, based on the Microsoft Identity library.
 * **IdentityServer**: Integrates to IdentityServer4.
 * **Permission Management**: Used to persist permissions.