diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 99cca64d6..ca45b20a9 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -12,7 +12,7 @@
     [ {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
     , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
-    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.1"}}}
+    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.2"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.2"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
     , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon
diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index 18e0d7020..06cd252ed 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -85,7 +85,7 @@ put_listener_conf(Zone, Listener, KeyPath, Conf) ->
     ?MODULE:put([zones, Zone, listeners, Listener | KeyPath], Conf).
 
 -spec find_listener_conf(atom(), atom(), emqx_map_lib:config_key_path()) ->
-    {ok, term()} | {not_foud, emqx_map_lib:config_key_path(), term()}.
+    {ok, term()} | {not_found, emqx_map_lib:config_key_path(), term()}.
 find_listener_conf(Zone, Listener, KeyPath) ->
     %% the configs in listener is prior to the ones in the zone
     case find([zones, Zone, listeners, Listener | KeyPath]) of
diff --git a/apps/emqx/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl
index fbe62e4b2..09ec54b9d 100644
--- a/apps/emqx/src/emqx_types.erl
+++ b/apps/emqx/src/emqx_types.erl
@@ -209,7 +209,8 @@
 -type(infos() :: #{atom() => term()}).
 -type(stats() :: [{atom(), term()}]).
 
--type(oom_policy() :: #{message_queue_len => non_neg_integer(),
-                        max_heap_size => non_neg_integer()
+-type(oom_policy() :: #{max_message_queue_len => non_neg_integer(),
+                        max_heap_size => non_neg_integer(),
+                        enable => boolean()
                        }).
 
diff --git a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
index 322baa120..4b4feb29d 100644
--- a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
+++ b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
@@ -583,7 +583,8 @@ handle_call(discard, Channel) ->
 %    shutdown_and_reply(takeovered, AllPendings, Channel);
 
 handle_call(list_acl_cache, Channel) ->
-    {reply, emqx_acl_cache:list_acl_cache(), Channel};
+    %% This won't work
+    {reply, emqx_acl_cache:list_acl_cache(default, mqtt_tcp), Channel};
 
 %% XXX: No Quota Now
 % handle_call({quota, Policy}, Channel) ->
diff --git a/rebar.config b/rebar.config
index b965c8fba..7998cefb9 100644
--- a/rebar.config
+++ b/rebar.config
@@ -47,7 +47,7 @@
     , {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
     , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
-    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.1"}}}
+    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.2"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.2"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}}
     , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} % TODO: delete when all apps moved to hocon