diff --git a/apps/emqx/etc/emqx.conf b/apps/emqx/etc/emqx.conf
index f40ecd8e5..d07443012 100644
--- a/apps/emqx/etc/emqx.conf
+++ b/apps/emqx/etc/emqx.conf
@@ -1,4 +1,4 @@
-## EMQ X Configuration 4.3
+## EMQ X Configuration 5.0
 
 ##--------------------------------------------------------------------
 ## Cluster
@@ -2318,16 +2318,6 @@ listener.quic.external {
 ## Plugins
 ##-------------------------------------------------------------------
 plugins: {
-    ## The etc dir for plugins' config.
-    ##
-    ## Value: Folder
-    etc_dir: "{{ platform_etc_dir }}/plugins/"
-
-    ## The file to store loaded plugin names.
-    ##
-    ## Value: File
-    loaded_file: "{{ platform_data_dir }}/loaded_plugins"
-
     ## The directory of extension plugins.
     ##
     ## Value: File
diff --git a/apps/emqx/src/emqx.erl b/apps/emqx/src/emqx.erl
index bd46ddc03..e5855b786 100644
--- a/apps/emqx/src/emqx.erl
+++ b/apps/emqx/src/emqx.erl
@@ -254,15 +254,11 @@ reload_config(ConfFile) ->
 
 
 emqx_feature() ->
-    [ emqx_authn
+    [ emqx_resource
+    , emqx_authn
     , emqx_authz
-    , observer_cli
-    , emqx_http_lib
-    , emqx_resource
-    , emqx_connector
     , emqx_data_bridge
     , emqx_rule_engine
-    , emqx_rule_actions
     , emqx_bridge_mqtt
     , emqx_modules
     , emqx_management
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index d32073ee5..91aab2dcd 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -455,9 +455,7 @@ fields("rule") ->
     [ {"$id", t(string())}];
 
 fields("plugins") ->
-    [ {"etc_dir", t(string(), "emqx.plugins_etc_dir", undefined)}
-    , {"loaded_file", t(string(), "emqx.plugins_loaded_file", undefined)}
-    , {"expand_plugins_dir", t(string(), "emqx.expand_plugins_dir", undefined)}
+    [ {"expand_plugins_dir", t(string(), "emqx.expand_plugins_dir", undefined)}
     ];
 
 fields("broker") ->
diff --git a/rebar.config.erl b/rebar.config.erl
index 01abf254f..56599dd54 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -247,12 +247,12 @@ relx_apps(ReleaseType) ->
     , {mnesia, load}
     , {ekka, load}
     , {emqx_plugin_libs, load}
-    , emqx_authn
-    , emqx_authz
     , observer_cli
     , emqx_http_lib
     , emqx_resource
     , emqx_connector
+    , emqx_authn
+    , emqx_authz
     , emqx_data_bridge
     , emqx_rule_engine
     , emqx_rule_actions
diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index a0fbdb4b3..503e6faa8 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -28,7 +28,7 @@ main(_) ->
                 case filelib:is_regular(Filename) of
                     true ->
                         {ok, Bin1} = file:read_file(Filename),
-                        <<Acc/binary, "\r\n", Bin1/binary>>;
+                        [Acc, io_lib:nl(), Bin1];
                     false -> Acc
                 end
         end