diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 0278a1b1d..78a8b76e0 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -29,7 +29,7 @@
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
     {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
-    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.11"}}},
+    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
diff --git a/apps/emqx_authz/test/emqx_authz_test_lib.erl b/apps/emqx_authz/test/emqx_authz_test_lib.erl
index e308e0de7..03d687851 100644
--- a/apps/emqx_authz/test/emqx_authz_test_lib.erl
+++ b/apps/emqx_authz/test/emqx_authz_test_lib.erl
@@ -35,7 +35,7 @@ reset_authorizers(Nomatch, CacheEnabled, Source) ->
         [authorization],
         #{
             <<"no_match">> => atom_to_binary(Nomatch),
-            <<"cache">> => #{<<"enable">> => atom_to_binary(CacheEnabled)},
+            <<"cache">> => #{<<"enable">> => CacheEnabled},
             <<"sources">> => Source
         }
     ),
diff --git a/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz b/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz
index b7da76bbb..a22ff40a5 100644
Binary files a/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz and b/apps/emqx_management/test/emqx_mgmt_data_backup_SUITE_data/emqx-export-test-bootstrap-ce.tar.gz differ
diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index 41e5673d9..10dc001c2 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -114,7 +114,6 @@
 
 %% boolean
 -define(START_AFTER_CREATED, true).
--define(START_AFTER_CREATED_RAW, <<"true">>).
 
 -define(TEST_ID_PREFIX, "_probe_:").
 -define(RES_METRICS, resource_metrics).
diff --git a/apps/emqx_resource/src/emqx_resource.app.src b/apps/emqx_resource/src/emqx_resource.app.src
index 57ab8129a..19b6ca5e2 100644
--- a/apps/emqx_resource/src/emqx_resource.app.src
+++ b/apps/emqx_resource/src/emqx_resource.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_resource, [
     {description, "Manager for all external resources"},
-    {vsn, "0.1.19"},
+    {vsn, "0.1.20"},
     {registered, []},
     {mod, {emqx_resource_app, []}},
     {applications, [
diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
index 59687eb8d..b98f50a98 100644
--- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl
+++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
@@ -129,7 +129,7 @@ health_check_interval_range(HealthCheckInterval) ->
 
 start_after_created(type) -> boolean();
 start_after_created(desc) -> ?DESC("start_after_created");
-start_after_created(default) -> ?START_AFTER_CREATED_RAW;
+start_after_created(default) -> ?START_AFTER_CREATED;
 start_after_created(required) -> false;
 start_after_created(_) -> undefined.
 
diff --git a/changes/ce/fix-11077.en.md b/changes/ce/fix-11077.en.md
new file mode 100644
index 000000000..64911df4a
--- /dev/null
+++ b/changes/ce/fix-11077.en.md
@@ -0,0 +1 @@
+Fixes crash when updating binding with a non-integer port.
diff --git a/changes/ce/fix-11192.en.md b/changes/ce/fix-11192.en.md
new file mode 100644
index 000000000..6bbc0b12d
--- /dev/null
+++ b/changes/ce/fix-11192.en.md
@@ -0,0 +1,2 @@
+Fix produces valid HOCON file when atom type is used.
+Remove unnecessary `"` from HOCON file.
diff --git a/mix.exs b/mix.exs
index 9e9279895..65c942394 100644
--- a/mix.exs
+++ b/mix.exs
@@ -72,7 +72,7 @@ defmodule EMQXUmbrella.MixProject do
       # in conflict by emqtt and hocon
       {:getopt, "1.0.2", override: true},
       {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.8", override: true},
-      {:hocon, github: "emqx/hocon", tag: "0.39.11", override: true},
+      {:hocon, github: "emqx/hocon", tag: "0.39.13", override: true},
       {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true},
       {:esasl, github: "emqx/esasl", tag: "0.2.0"},
       {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
diff --git a/rebar.config b/rebar.config
index ff55d2e70..0f6864c5e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -75,7 +75,7 @@
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
     , {getopt, "1.0.2"}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.8"}}}
-    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.11"}}}
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}}
     , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}
     , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
     , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}