diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 960d14c10..7b427ec54 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -18,6 +18,7 @@ File format:
 * Add support for JWT authorization [#7596]
   Now MQTT clients may be authorized with respect to a specific claim containing publish/subscribe topic whitelists.
 * Better randomisation of app screts (changed from timestamp seeded sha hash (uuid) to crypto:strong_rand_bytes)
+* Return a client_identifier_not_valid error when username is empty and username_as_clientid is set to true [#7862]
 
 ### Bug fixes
 * List subscription topic (/api/v4/subscriptions), the result do not match with multiple conditions.
diff --git a/etc/emqx_cloud/vm.args b/etc/emqx_cloud/vm.args
index a199091c7..e0f4c70d7 100644
--- a/etc/emqx_cloud/vm.args
+++ b/etc/emqx_cloud/vm.args
@@ -115,4 +115,4 @@
 -shutdown_time 30000
 
 ## patches dir
--pa {{ platform_data_dir }}/patches
+-pa "{{ platform_data_dir }}/patches"
diff --git a/etc/emqx_edge/vm.args b/etc/emqx_edge/vm.args
index 2f61faa2d..a87449b79 100644
--- a/etc/emqx_edge/vm.args
+++ b/etc/emqx_edge/vm.args
@@ -113,4 +113,4 @@
 -shutdown_time 10000
 
 ## patches dir
--pa {{ platform_data_dir }}/patches
+-pa "{{ platform_data_dir }}/patches"
diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 7e9ec6d12..be7c60261 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -3,10 +3,12 @@
 {VSN,
   [{"4.3.15",
     [{load_module,emqx_frame,brutal_purge,soft_purge,[]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.14",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
+    {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
@@ -458,11 +460,13 @@
    {<<".*">>,[]}],
   [{"4.3.15",
     [{load_module,emqx_frame,brutal_purge,soft_purge,[]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.14",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},