diff --git a/docs/source/_static/dispatch.png b/docs/source/_static/dispatch.png
new file mode 100644
index 000000000..11d2c6567
Binary files /dev/null and b/docs/source/_static/dispatch.png differ
diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis
index ef0971ede..9fef7a1b7 160000
--- a/plugins/emqttd_plugin_redis
+++ b/plugins/emqttd_plugin_redis
@@ -1 +1 @@
-Subproject commit ef0971ede89fd5c45c22779edd0e9eb7a0420869
+Subproject commit 9fef7a1b762dfd8ad27190ebe31dd3afc784c6fa
diff --git a/src/emqttd_broker.erl b/src/emqttd_broker.erl
index 4c2024972..f7518a894 100644
--- a/src/emqttd_broker.erl
+++ b/src/emqttd_broker.erl
@@ -139,7 +139,7 @@ handle_cast(Msg, State) ->
 handle_info(heartbeat, State) ->
     publish(uptime, list_to_binary(uptime(State))),
     publish(datetime, list_to_binary(datetime())),
-    {noreply, State};
+    {noreply, State, hibernate};
 
 handle_info(tick, State) ->
     retain(brokers),
diff --git a/src/emqttd_sysmon.erl b/src/emqttd_sysmon.erl
index 393f5f5a0..a262ffc5e 100644
--- a/src/emqttd_sysmon.erl
+++ b/src/emqttd_sysmon.erl
@@ -127,7 +127,7 @@ handle_info({monitor, SusPid, busy_dist_port, Port}, State) ->
     end, State);
 
 handle_info(reset, State) ->
-    {noreply, State#state{events = []}};
+    {noreply, State#state{events = []}, hibernate};
 
 handle_info(Info, State) ->
     ?UNEXPECTED_INFO(Info, State).