diff --git a/apps/emqx/test/emqx_banned_SUITE.erl b/apps/emqx/test/emqx_banned_SUITE.erl
index 9419ba4c3..47134c666 100644
--- a/apps/emqx/test/emqx_banned_SUITE.erl
+++ b/apps/emqx/test/emqx_banned_SUITE.erl
@@ -145,11 +145,12 @@ t_kick(_) ->
 t_session_taken(_) ->
     erlang:process_flag(trap_exit, true),
     Topic = <<"t/banned">>,
-    ClientId2 = <<"t_session_taken">>,
+    ClientId2 = emqx_guid:to_hexstr(emqx_guid:gen()),
     MsgNum = 3,
     Connect = fun() ->
+        ClientId = emqx_guid:to_hexstr(emqx_guid:gen()),
         {ok, C} = emqtt:start_link([
-            {clientid, <<"client1">>},
+            {clientid, ClientId},
             {proto_ver, v5},
             {clean_start, false},
             {properties, #{'Session-Expiry-Interval' => 120}}
@@ -188,9 +189,9 @@ t_session_taken(_) ->
         end,
         15_000
     ),
-    Publish(),
 
     C2 = Connect(),
+    Publish(),
     ?assertEqual(MsgNum, length(receive_messages(MsgNum + 1))),
     ok = emqtt:disconnect(C2),
 
diff --git a/apps/emqx/test/emqx_broker_SUITE.erl b/apps/emqx/test/emqx_broker_SUITE.erl
index d66f9d974..d0c26ceb5 100644
--- a/apps/emqx/test/emqx_broker_SUITE.erl
+++ b/apps/emqx/test/emqx_broker_SUITE.erl
@@ -93,6 +93,7 @@ end_per_group(_Group, _Config) ->
     emqx_common_test_helpers:stop_apps([]).
 
 init_per_suite(Config) ->
+    emqx_common_test_helpers:clear_screen(),
     Config.
 
 end_per_suite(_Config) ->
@@ -442,7 +443,7 @@ t_connected_client_count_persistent(Config) when is_list(Config) ->
             emqx_cm_process_down
         ]
     ),
-    ?assertEqual(0, emqx_cm:get_connected_client_count()),
+    ?retry(_Sleep = 100, _Retries = 20, ?assertEqual(0, emqx_cm:get_connected_client_count())),
     ok;
 t_connected_client_count_persistent({'end', _Config}) ->
     snabbkaffe:stop(),
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
index c6f94f5ea..7b4d1ee98 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@@ -2,7 +2,7 @@
 {application, emqx_rule_engine, [
     {description, "EMQX Rule Engine"},
     % strict semver, bump manually!
-    {vsn, "5.0.18"},
+    {vsn, "5.0.19"},
     {modules, []},
     {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
     {applications, [kernel, stdlib, rulesql, getopt, emqx_ctl]},
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
index 4a52b2c35..4b6acf915 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
@@ -1,6 +1,6 @@
 {application, emqx_ee_bridge, [
     {description, "EMQX Enterprise data bridges"},
-    {vsn, "0.1.14"},
+    {vsn, "0.1.15"},
     {registered, []},
     {applications, [
         kernel,