diff --git a/Makefile b/Makefile
index a7bb63edc..804123d2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PROJECT = emqttd
 PROJECT_DESCRIPTION = Erlang MQTT Broker
-PROJECT_VERSION = 2.3.3
+PROJECT_VERSION = 2.3.4
 
 DEPS = goldrush gproc lager esockd ekka mochiweb pbkdf2 lager_syslog bcrypt clique jsx
 
diff --git a/etc/emq.conf b/etc/emq.conf
index b8c21dc40..a5ca15d9c 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -231,6 +231,15 @@ node.fullsweep_after = 1000
 ## Value: Log file
 node.crash_dump = {{ platform_log_dir }}/crash.dump
 
+## Specify the erlang distributed protocol.
+##
+## Value: Enum
+##  - inet_tcp: the default; handles TCP streams with IPv4 addressing.
+##  - inet6_tcp: handles TCP with IPv6 addressing.
+##
+## vm.args: -proto_dist inet_tcp
+node.proto_dist = inet_tcp
+
 ## Sets the net_kernel tick time. TickTime is specified in seconds.
 ## Notice that all communicating nodes are to have the same TickTime
 ## value specified.
@@ -695,6 +704,11 @@ listener.tcp.external.tune_buffer = on
 ## Value: true | false
 listener.tcp.external.nodelay = true
 
+## The SO_REUSEADDR flag for TCP listener.
+##
+## Value: true | false
+listener.tcp.external.reuseaddr = true
+
 ##--------------------------------------------------------------------
 ## Internal TCP Listener for MQTT Protocol
 
@@ -791,6 +805,11 @@ listener.tcp.internal.tune_buffer = on
 ## Value: true | false
 listener.tcp.internal.nodelay = false
 
+## The SO_REUSEADDR flag for MQTT/TCP Listener.
+##
+## Value: true | false
+listener.tcp.internal.reuseaddr = true
+
 ##--------------------------------------------------------------------
 ## MQTT/SSL - External SSL Listener for MQTT Protocol
 
@@ -1020,10 +1039,15 @@ listener.ssl.external.certfile = {{ platform_etc_dir }}/certs/cert.pem
 ## Value: true | false
 ## listener.ssl.external.nodelay = true
 
+## The SO_REUSEADDR flag for MQTT/SSL Listener.
+##
+## Value: true | false
+listener.ssl.external.reuseaddr = true
+
 ##--------------------------------------------------------------------
 ## External WebSocket Listener for MQTT Protocol
 
-## listener.ws.<name> is the IP address and port that the MQTT/Websocket
+## listener.ws.<name> is the IP address and port that the MQTT/WebSocket
 ## listener will bind.
 ##
 ## Value: IP:Port | Port
@@ -1031,35 +1055,47 @@ listener.ssl.external.certfile = {{ platform_etc_dir }}/certs/cert.pem
 ## Examples: 8083, 127.0.0.1:8083, ::1:8083
 listener.ws.external = 8083
 
-## The acceptor pool for external MQTT/Websocket listener.
+## The acceptor pool for external MQTT/WebSocket listener.
 ##
 ## Value: Number
 listener.ws.external.acceptors = 4
 
-## Maximum number of concurrent MQTT/Websocket connections.
+## Maximum number of concurrent MQTT/WebSocket connections.
 ##
 ## Value: Number
 listener.ws.external.max_clients = 102400
 
-## TODO: Zone of the external MQTT/Websocket listener belonged to.
+## TODO: Zone of the external MQTT/WebSocket listener belonged to.
 ##
 ## Value: String
 ## listener.ws.external.zone = external
 
-## Mountpoint of the MQTT/Websocket Listener.
+## Mountpoint of the MQTT/WebSocket Listener.
 ##
 ## See: listener.tcp.<name>.mountpoint
 ##
 ## Value: String
 ## listener.ws.external.mountpoint = external/
 
-## The access control for the MQTT/Websocket listener.
+## The access control for the MQTT/WebSocket listener.
 ##
 ## See: listener.tcp.<name>.access
 ##
 ## Value: ACL Rule
 listener.ws.external.access.1 = allow all
 
+## Use X-Forwarded-For header for real source IP if the EMQ cluster is
+## deployed behind NGINX or HAProxy.
+##
+## Value: String
+## listener.ws.external.proxy_address_header = X-Forwarded-For
+
+## Use X-Forwarded-Port header for real source port if the EMQ cluster is
+## deployed behind NGINX or HAProxy.
+##
+## Value: String
+## listener.ws.external.proxy_port_header = X-Forwarded-Port
+
 ## Enable the Proxy Protocol V1/2 if the EMQ cluster is deployed behind
 ## HAProxy or Nginx.
 ##
@@ -1075,37 +1111,37 @@ listener.ws.external.access.1 = allow all
 ## Value: Duration
 ## listener.ws.external.proxy_protocol_timeout = 3s
 
-## The TCP backlog of external MQTT/Websocket Listener.
+## The TCP backlog of external MQTT/WebSocket Listener.
 ##
 ## See: listener.tcp.<name>.backlog
 ##
 ## Value: Number >= 0
 listener.ws.external.backlog = 1024
 
-## The TCP send timeout for external MQTT/Websocket connections.
+## The TCP send timeout for external MQTT/WebSocket connections.
 ##
 ## See: listener.tcp.<name>.send_timeout
 ##
 ## Value: Duration
 listener.ws.external.send_timeout = 15s
 
-## Close the MQTT/Websocket connection if send timeout.
+## Close the MQTT/WebSocket connection if send timeout.
 ##
 ## See: listener.tcp.<name>.send_timeout_close
 ##
 ## Value: on | off
 listener.ws.external.send_timeout_close = on
 
-## The TCP receive buffer(os kernel) for external MQTT/Websocket connections.
+## The TCP receive buffer(os kernel) for external MQTT/WebSocket connections.
 ##
 ## See: listener.tcp.<name>.recbuf
 ##
 ## Value: Bytes
 ## listener.ws.external.recbuf = 4KB
 
-## The TCP send buffer(os kernel) for external MQTT/Websocket connections.
+## The TCP send buffer(os kernel) for external MQTT/WebSocket connections.
 ##
-## See 'listener.tcp.<name>.sndbuf'
+## See: listener.tcp.<name>.sndbuf
 ##
 ## Value: Bytes
 ## listener.ws.external.sndbuf = 4KB
@@ -1124,17 +1160,22 @@ listener.ws.external.send_timeout_close = on
 ## Value: on | off
 listener.ws.external.tune_buffer = on
 
-## The TCP_NODELAY flag for external MQTT/Websocket connections.
+## The TCP_NODELAY flag for external MQTT/WebSocket connections.
 ##
 ## See: listener.tcp.<name>.nodelay
 ##
 ## Value: true | false
 listener.ws.external.nodelay = true
 
+## The SO_REUSEADDR flag for MQTT/WebSocket Listener.
+##
+## Value: true | false
+listener.ws.external.reuseaddr = true
+
 ##--------------------------------------------------------------------
 ## External WebSocket/SSL listener for MQTT Protocol
 
-## listener.wss.<name> is the IP address and port that the MQTT/Websocket/SSL
+## listener.wss.<name> is the IP address and port that the MQTT/WebSocket/SSL
 ## listener will bind.
 ##
 ## Value: IP:Port | Port
@@ -1142,7 +1183,7 @@ listener.ws.external.nodelay = true
 ## Examples: 8084, 127.0.0.1:8084, ::1:8084
 listener.wss.external = 8084
 
-## The acceptor pool for external MQTT/Websocket/SSL listener.
+## The acceptor pool for external MQTT/WebSocket/SSL listener.
 ##
 ## Value: Number
 listener.wss.external.acceptors = 4
@@ -1152,25 +1193,35 @@ listener.wss.external.acceptors = 4
 ## Value: Number
 listener.wss.external.max_clients = 64
 
-## TODO: Zone of the external MQTT/Websocket/SSL listener belonged to.
+## TODO: Zone of the external MQTT/WebSocket/SSL listener belonged to.
 ##
 ## Value: String
 ## listener.wss.external.zone = external
 
-## Mountpoint of the MQTT/Websocket/SSL Listener.
+## Mountpoint of the MQTT/WebSocket/SSL Listener.
 ##
-## See 'listener.tcp.<name>.mountpoint'
+## See: listener.tcp.<name>.mountpoint
 ##
 ## Value: String
 ## listener.wss.external.mountpoint = inbound/
 
-## The access control rules for the MQTT/Websocket/SSL listener.
+## The access control rules for the MQTT/WebSocket/SSL listener.
 ##
 ## See: listener.tcp.<name>.access.<no>
 ##
 ## Value: ACL Rule
 listener.wss.external.access.1 = allow all
 
+## See: listener.ws.external.proxy_address_header
+##
+## Value: String
+## listener.wss.external.proxy_address_header = X-Forwarded-For
+
+## See: listener.ws.external.proxy_port_header
+##
+## Value: String
+## listener.wss.external.proxy_port_header = X-Forwarded-Port
+
 ## Enable the Proxy Protocol V1/2 support.
 ##
 ## See: listener.tcp.<name>.proxy_protocol
@@ -1260,35 +1311,35 @@ listener.wss.external.certfile = {{ platform_etc_dir }}/certs/cert.pem
 ## Value: cn | dn
 ## listener.wss.external.peer_cert_as_username = cn
 
-## TCP backlog for the Websocket/SSL connection.
+## TCP backlog for the WebSocket/SSL connection.
 ##
-## See 'listener.tcp.<name>.backlog'
+## See listener.tcp.<name>.backlog
 ##
 ## Value: Number >= 0
 listener.wss.external.backlog = 1024
 
-## The TCP send timeout for the Websocket/SSL connection.
+## The TCP send timeout for the WebSocket/SSL connection.
 ##
-## See 'listener.tcp.<name>.send_timeout'
+## See: listener.tcp.<name>.send_timeout
 ##
 ## Value: Duration
 listener.wss.external.send_timeout = 15s
 
-## Close the Websocket/SSL connection if send timeout.
+## Close the WebSocket/SSL connection if send timeout.
 ##
 ## See: listener.tcp.<name>.send_timeout_close
 ##
 ## Value: on | off
 listener.wss.external.send_timeout_close = on
 
-## The TCP receive buffer(os kernel) for the Websocket/SSL connections.
+## The TCP receive buffer(os kernel) for the WebSocket/SSL connections.
 ##
 ## See: listener.tcp.<name>.recbuf
 ##
 ## Value: Bytes
 ## listener.wss.external.recbuf = 4KB
 
-## The TCP send buffer(os kernel) for the Websocket/SSL connections.
+## The TCP send buffer(os kernel) for the WebSocket/SSL connections.
 ##
 ## See: listener.tcp.<name>.sndbuf
 ##
@@ -1302,13 +1353,18 @@ listener.wss.external.send_timeout_close = on
 ## Value: Bytes
 ## listener.wss.external.buffer = 4KB
 
-## The TCP_NODELAY flag for Websocket/SSL connections.
+## The TCP_NODELAY flag for WebSocket/SSL connections.
 ##
 ## See: listener.tcp.<name>.nodelay
 ##
 ## Value: true | false
 ## listener.wss.external.nodelay = true
 
+## The SO_REUSEADDR flag for WebSocket/SSL listener.
+##
+## Value: true | false
+listener.wss.external.reuseaddr = true
+
 ##--------------------------------------------------------------------
 ## HTTP Management API Listener
 
diff --git a/include/emqttd.hrl b/include/emqttd.hrl
index 508712512..975b50dd4 100644
--- a/include/emqttd.hrl
+++ b/include/emqttd.hrl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 %% Banner
 %%--------------------------------------------------------------------
 
--define(COPYRIGHT, "Copyright (c) 2013-2017 EMQ Enterprise, Inc.").
+-define(COPYRIGHT, "Copyright (c) 2013-2018 EMQ Enterprise, Inc.").
 
 -define(LICENSE_MESSAGE, "Licensed under the Apache License, Version 2.0").
 
diff --git a/include/emqttd_cli.hrl b/include/emqttd_cli.hrl
index bda88d801..b99038481 100644
--- a/include/emqttd_cli.hrl
+++ b/include/emqttd_cli.hrl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/include/emqttd_internal.hrl b/include/emqttd_internal.hrl
index 343be68e4..c2ae503de 100644
--- a/include/emqttd_internal.hrl
+++ b/include/emqttd_internal.hrl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/include/emqttd_protocol.hrl b/include/emqttd_protocol.hrl
index a6d6c06e6..8a0ad4478 100644
--- a/include/emqttd_protocol.hrl
+++ b/include/emqttd_protocol.hrl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/include/emqttd_trie.hrl b/include/emqttd_trie.hrl
index eb4e1390d..ffd2acebc 100644
--- a/include/emqttd_trie.hrl
+++ b/include/emqttd_trie.hrl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/priv/emq.schema b/priv/emq.schema
index 11c45cecb..8c1e64a9f 100644
--- a/priv/emq.schema
+++ b/priv/emq.schema
@@ -168,6 +168,11 @@ end}.
   {default, "emq@127.0.0.1"}
 ]}.
 
+%% @doc The erlang distributed protocol
+{mapping, "node.proto_dist", "vm_args.-proto_dist", [
+  %%{default, "inet_tcp"}
+]}.
+
 %% @doc Secret cookie for distributed erlang node
 {mapping, "node.cookie", "vm_args.-setcookie", [
   {default, "emqsecretcookie"}
@@ -400,7 +405,7 @@ end}.
 {translation,
  "lager.handlers",
  fun(Conf) ->
-    ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf) of
+    ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf, undefined) of
       undefined -> [];
       ErrorFilename -> [{lager_file_backend, [{file, ErrorFilename},
                                               {level, error},
@@ -442,7 +447,6 @@ end}.
                    cuttlefish:conf_get("log.syslog.facility", Conf),
                    cuttlefish:conf_get("log.syslog.level", Conf)]}]
     end,
-
     ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler
   end
 }.
@@ -846,6 +850,11 @@ end}.
   hidden
 ]}.
 
+{mapping, "listener.tcp.$name.reuseaddr", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}},
+  hidden
+]}.
+
 %%--------------------------------------------------------------------
 %% SSL Listeners
 
@@ -928,6 +937,11 @@ end}.
   hidden
 ]}.
 
+{mapping, "listener.ssl.$name.reuseaddr", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}},
+  hidden
+]}.
+
 {mapping, "listener.ssl.$name.tls_versions", "emqttd.listeners", [
   {datatype, string}
 ]}.
@@ -1015,6 +1029,16 @@ end}.
   {datatype, string}
 ]}.
 
+{mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [
+  {datatype, string},
+  hidden
+]}.
+
+{mapping, "listener.ws.$name.proxy_port_header", "emqttd.listeners", [
+  {datatype, string},
+  hidden
+]}.
+
 {mapping, "listener.ws.$name.proxy_protocol", "emqttd.listeners", [
   {datatype, flag}
 ]}.
@@ -1063,6 +1087,11 @@ end}.
   hidden
 ]}.
 
+{mapping, "listener.ws.$name.reuseaddr", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}},
+  hidden
+]}.
+
 %%--------------------------------------------------------------------
 %% MQTT/WebSocket/SSL Listeners
 
@@ -1096,6 +1125,16 @@ end}.
   {datatype, string}
 ]}.
 
+{mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [
+  {datatype, string},
+  hidden
+]}.
+
+{mapping, "listener.wss.$name.proxy_port_header", "emqttd.listeners", [
+  {datatype, string},
+  hidden
+]}.
+
 {mapping, "listener.wss.$name.proxy_protocol", "emqttd.listeners", [
   {datatype, flag}
 ]}.
@@ -1144,6 +1183,11 @@ end}.
   hidden
 ]}.
 
+{mapping, "listener.wss.$name.reuseaddr", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}},
+  hidden
+]}.
+
 {mapping, "listener.wss.$name.tls_versions", "emqttd.listeners", [
   {datatype, string}
 ]}.
@@ -1220,7 +1264,9 @@ end}.
                            {proxy_protocol, cuttlefish:conf_get(Prefix ++ ".proxy_protocol", Conf, undefined)},
                            {proxy_protocol_timeout, cuttlefish:conf_get(Prefix ++ ".proxy_protocol_timeout", Conf, undefined)},
                            {mountpoint, MountPoint(cuttlefish:conf_get(Prefix ++ ".mountpoint", Conf, undefined))},
-                           {peer_cert_as_username, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_username", Conf, undefined)}])
+                           {peer_cert_as_username, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_username", Conf, undefined)},
+                           {proxy_port_header, cuttlefish:conf_get(Prefix ++ ".proxy_port_header", Conf, undefined)},
+                           {proxy_address_header, cuttlefish:conf_get(Prefix ++ ".proxy_address_header", Conf, undefined)}])
                end,
 
     LisOpts = fun(Prefix) ->
@@ -1235,7 +1281,8 @@ end}.
                            {recbuf,  cuttlefish:conf_get(Prefix ++ ".recbuf", Conf, undefined)},
                            {sndbuf,  cuttlefish:conf_get(Prefix ++ ".sndbuf", Conf, undefined)},
                            {buffer,  cuttlefish:conf_get(Prefix ++ ".buffer", Conf, undefined)},
-                           {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}])
+                           {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)},
+                           {reuseaddr, cuttlefish:conf_get(Prefix ++ ".reuseaddr", Conf, true)}])
               end,
 
     SplitFun = fun(undefined) -> undefined; (S) -> string:tokens(S, ",") end,
@@ -1265,7 +1312,8 @@ end}.
                            undefined ->
                                [];
                            ListenOn ->
-                               [{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)}, {sockopts, TcpOpts(Prefix)} | LisOpts(Prefix)]}]
+                               [{Atom(Type), ListenOn, [{connopts, ConnOpts(Prefix)},
+                                                        {sockopts, TcpOpts(Prefix)} | LisOpts(Prefix)]}]
                        end
                    end,
 
@@ -1374,6 +1422,11 @@ end}.
   hidden
 ]}.
 
+{mapping, "listener.api.$name.reuseaddr", "emqttd.listeners", [
+  {datatype, {enum, [true, false]}},
+  hidden
+]}.
+
 {mapping, "listener.api.$name.handshake_timeout", "emqttd.listeners", [
   {datatype, {duration, ms}}
 ]}.
diff --git a/src/emqttd.app.src b/src/emqttd.app.src
index 4ff79090a..c1291446a 100644
--- a/src/emqttd.app.src
+++ b/src/emqttd.app.src
@@ -1,6 +1,6 @@
 {application,emqttd,
              [{description,"Erlang MQTT Broker"},
-              {vsn,"2.3.3"},
+              {vsn,"2.3.4"},
               {modules,[]},
               {registered,[emqttd_sup]},
               {applications,[kernel,stdlib,gproc,lager,esockd,mochiweb,
diff --git a/src/emqttd.erl b/src/emqttd.erl
index 65739952f..ecea2ca18 100644
--- a/src/emqttd.erl
+++ b/src/emqttd.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_access_control.erl b/src/emqttd_access_control.erl
index 601fd263f..0b74e2dc2 100644
--- a/src/emqttd_access_control.erl
+++ b/src/emqttd_access_control.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_access_rule.erl b/src/emqttd_access_rule.erl
index 73718fd3a..f0bad6816 100644
--- a/src/emqttd_access_rule.erl
+++ b/src/emqttd_access_rule.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_acl_internal.erl b/src/emqttd_acl_internal.erl
index 5305985c4..9304b9208 100644
--- a/src/emqttd_acl_internal.erl
+++ b/src/emqttd_acl_internal.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_acl_mod.erl b/src/emqttd_acl_mod.erl
index 4ed07b369..66e5f098b 100644
--- a/src/emqttd_acl_mod.erl
+++ b/src/emqttd_acl_mod.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_alarm.erl b/src/emqttd_alarm.erl
index 1467797c7..d271cb425 100644
--- a/src/emqttd_alarm.erl
+++ b/src/emqttd_alarm.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_app.erl b/src/emqttd_app.erl
index 1e99cb951..f14229715 100644
--- a/src/emqttd_app.erl
+++ b/src/emqttd_app.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_auth_mod.erl b/src/emqttd_auth_mod.erl
index d413446ff..a33631b65 100644
--- a/src/emqttd_auth_mod.erl
+++ b/src/emqttd_auth_mod.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_base62.erl b/src/emqttd_base62.erl
index 481488fb9..707981e32 100644
--- a/src/emqttd_base62.erl
+++ b/src/emqttd_base62.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_boot.erl b/src/emqttd_boot.erl
index d7a6d311e..694b5248a 100644
--- a/src/emqttd_boot.erl
+++ b/src/emqttd_boot.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_bridge.erl b/src/emqttd_bridge.erl
index 6c20290bd..8349eeec1 100644
--- a/src/emqttd_bridge.erl
+++ b/src/emqttd_bridge.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_bridge_sup.erl b/src/emqttd_bridge_sup.erl
index 75138332f..29b68c199 100644
--- a/src/emqttd_bridge_sup.erl
+++ b/src/emqttd_bridge_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_bridge_sup_sup.erl b/src/emqttd_bridge_sup_sup.erl
index 11679aba8..fe5c33428 100644
--- a/src/emqttd_bridge_sup_sup.erl
+++ b/src/emqttd_bridge_sup_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_broker.erl b/src/emqttd_broker.erl
index 9e78207ce..798c94a6a 100644
--- a/src/emqttd_broker.erl
+++ b/src/emqttd_broker.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl
index 280c050ee..49e2500bb 100644
--- a/src/emqttd_cli.erl
+++ b/src/emqttd_cli.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_cli_config.erl b/src/emqttd_cli_config.erl
index 1ce0de49c..3c69c8cbc 100644
--- a/src/emqttd_cli_config.erl
+++ b/src/emqttd_cli_config.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_client.erl b/src/emqttd_client.erl
index 5ca450bf5..f479d2253 100644
--- a/src/emqttd_client.erl
+++ b/src/emqttd_client.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_cm.erl b/src/emqttd_cm.erl
index 4edc155df..bcaf353ed 100644
--- a/src/emqttd_cm.erl
+++ b/src/emqttd_cm.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_cm_sup.erl b/src/emqttd_cm_sup.erl
index fc01ea649..ccaea00fb 100644
--- a/src/emqttd_cm_sup.erl
+++ b/src/emqttd_cm_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_config.erl b/src/emqttd_config.erl
index deaaa77d1..04d94b260 100644
--- a/src/emqttd_config.erl
+++ b/src/emqttd_config.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_ctl.erl b/src/emqttd_ctl.erl
index 77769e3c8..a32a40172 100644
--- a/src/emqttd_ctl.erl
+++ b/src/emqttd_ctl.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_gc.erl b/src/emqttd_gc.erl
index 75545a77f..6484a195d 100644
--- a/src/emqttd_gc.erl
+++ b/src/emqttd_gc.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_gen_mod.erl b/src/emqttd_gen_mod.erl
index f8d690024..012b610da 100644
--- a/src/emqttd_gen_mod.erl
+++ b/src/emqttd_gen_mod.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_guid.erl b/src/emqttd_guid.erl
index 24199fa01..805a128b6 100644
--- a/src/emqttd_guid.erl
+++ b/src/emqttd_guid.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_hooks.erl b/src/emqttd_hooks.erl
index 693a67ff7..4fc84f9e8 100644
--- a/src/emqttd_hooks.erl
+++ b/src/emqttd_hooks.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_http.erl b/src/emqttd_http.erl
index a41025294..c229f4de2 100644
--- a/src/emqttd_http.erl
+++ b/src/emqttd_http.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ http_api() ->
 %% Handle HTTP Request
 %%--------------------------------------------------------------------
 handle_request(Req, State) ->
-    Path = Req:get(path),
+    {Path, _, _} = mochiweb_util:urlsplit_path(Req:get(raw_path)),
     case Path of
         "/status" ->
             handle_request("/status", Req, Req:get(method));
@@ -58,7 +58,7 @@ handle_request(Req, State) ->
     end.
 
 inner_handle_request(Req, State) ->
-    Path = Req:get(path),
+    {Path, _, _} = mochiweb_util:urlsplit_path(Req:get(raw_path)),
     case Path of
         "/api/v2/auth" -> handle_request(Path, Req, State);
         _ -> if_authorized(Req, fun() -> handle_request(Path, Req, State) end)
@@ -95,7 +95,8 @@ dispatcher(APIs) ->
                         case {check_params(Params, FilterArgs),
                               check_params_type(Params, FilterArgs)} of
                             {true, true} ->
-                                {match, [MatchList]} = re:run(Url, Regexp, [global, {capture, all_but_first, list}]),
+                                {match, [MatchList0]} = re:run(Url, Regexp, [global, {capture, all_but_first, list}]),
+                                MatchList = lists:map(fun mochiweb_util:unquote/1, MatchList0),
                                 Args = lists:append([[Method, Params], MatchList]),
                                 lager:debug("Mod:~p, Fun:~p, Args:~p", [emqttd_rest_api, Function, Args]),
                                 case catch apply(emqttd_rest_api, Function, Args) of
diff --git a/src/emqttd_inflight.erl b/src/emqttd_inflight.erl
index bb9af390b..be7517197 100644
--- a/src/emqttd_inflight.erl
+++ b/src/emqttd_inflight.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_keepalive.erl b/src/emqttd_keepalive.erl
index a0458038a..abc6dbc50 100644
--- a/src/emqttd_keepalive.erl
+++ b/src/emqttd_keepalive.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl
index 4c3bea0d8..86918e47a 100644
--- a/src/emqttd_message.erl
+++ b/src/emqttd_message.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_metrics.erl b/src/emqttd_metrics.erl
index 17e6e96d4..37d897b67 100644
--- a/src/emqttd_metrics.erl
+++ b/src/emqttd_metrics.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_mgmt.erl b/src/emqttd_mgmt.erl
index 1a608968e..2052d68fc 100644
--- a/src/emqttd_mgmt.erl
+++ b/src/emqttd_mgmt.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_misc.erl b/src/emqttd_misc.erl
index e60d27d4f..2224879ca 100644
--- a/src/emqttd_misc.erl
+++ b/src/emqttd_misc.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_mod_sup.erl b/src/emqttd_mod_sup.erl
index 749b84a42..b8335e6b3 100644
--- a/src/emqttd_mod_sup.erl
+++ b/src/emqttd_mod_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_mqueue.erl b/src/emqttd_mqueue.erl
index 08e620a37..92fda72f1 100644
--- a/src/emqttd_mqueue.erl
+++ b/src/emqttd_mqueue.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_net.erl b/src/emqttd_net.erl
index 1f246a315..9da9cd287 100644
--- a/src/emqttd_net.erl
+++ b/src/emqttd_net.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_packet.erl b/src/emqttd_packet.erl
index 6349e58b1..f269f3dbe 100644
--- a/src/emqttd_packet.erl
+++ b/src/emqttd_packet.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_parser.erl b/src/emqttd_parser.erl
index 91df07d77..e9277a7c6 100644
--- a/src/emqttd_parser.erl
+++ b/src/emqttd_parser.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_plugins.erl b/src/emqttd_plugins.erl
index 81ff61a4d..4491e26df 100644
--- a/src/emqttd_plugins.erl
+++ b/src/emqttd_plugins.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_pmon.erl b/src/emqttd_pmon.erl
index ebe691ad4..00cb9a4c3 100644
--- a/src/emqttd_pmon.erl
+++ b/src/emqttd_pmon.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_pool_sup.erl b/src/emqttd_pool_sup.erl
index 87654bcff..d5f408cd2 100644
--- a/src/emqttd_pool_sup.erl
+++ b/src/emqttd_pool_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_pooler.erl b/src/emqttd_pooler.erl
index a74e01fec..fdde12a66 100644
--- a/src/emqttd_pooler.erl
+++ b/src/emqttd_pooler.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc.
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_protocol.erl b/src/emqttd_protocol.erl
index d021c9e1f..e81f86eb0 100644
--- a/src/emqttd_protocol.erl
+++ b/src/emqttd_protocol.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -563,8 +563,11 @@ sp(false) -> 0.
 %% The retained flag should be propagated for bridge.
 %%--------------------------------------------------------------------
 
-clean_retain(false, Msg = #mqtt_message{retain = true}) ->
-    Msg#mqtt_message{retain = false};
+clean_retain(false, Msg = #mqtt_message{retain = true, headers = Headers}) ->
+    case lists:member(retained, Headers) of
+        true  -> Msg;
+        false -> Msg#mqtt_message{retain = false}
+    end;
 clean_retain(_IsBridge, Msg) ->
     Msg.
 
diff --git a/src/emqttd_pubsub.erl b/src/emqttd_pubsub.erl
index 994ef6230..17f5455ff 100644
--- a/src/emqttd_pubsub.erl
+++ b/src/emqttd_pubsub.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_pubsub_sup.erl b/src/emqttd_pubsub_sup.erl
index 09d08d110..6e18aa031 100644
--- a/src/emqttd_pubsub_sup.erl
+++ b/src/emqttd_pubsub_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_rest_api.erl b/src/emqttd_rest_api.erl
index 0eb6adc11..ecc8410cd 100644
--- a/src/emqttd_rest_api.erl
+++ b/src/emqttd_rest_api.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_router.erl b/src/emqttd_router.erl
index fa1a0c70c..f667f8ea0 100644
--- a/src/emqttd_router.erl
+++ b/src/emqttd_router.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_serializer.erl b/src/emqttd_serializer.erl
index 079cfbb3c..1b81a45be 100644
--- a/src/emqttd_serializer.erl
+++ b/src/emqttd_serializer.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_server.erl b/src/emqttd_server.erl
index 4e05c00aa..38e7be311 100644
--- a/src/emqttd_server.erl
+++ b/src/emqttd_server.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl
index aa1a027a4..dfba46b3e 100644
--- a/src/emqttd_session.erl
+++ b/src/emqttd_session.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -286,8 +286,8 @@ init([CleanSess, {ClientId, Username}, ClientPid]) ->
     {ok, QEnv} = emqttd:env(mqueue),
     MaxInflight = get_value(max_inflight, Env, 0),
     EnableStats = get_value(enable_stats, Env, false),
-    IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false),
     ForceGcCount = emqttd_gc:conn_max_gc_count(),
+    IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false),
     MQueue = ?MQueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()),
     State = #state{clean_sess        = CleanSess,
                    binding           = binding(ClientPid),
diff --git a/src/emqttd_session_sup.erl b/src/emqttd_session_sup.erl
index bd9b34f02..506383834 100644
--- a/src/emqttd_session_sup.erl
+++ b/src/emqttd_session_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sm.erl b/src/emqttd_sm.erl
index a46d56fa6..e2e332041 100644
--- a/src/emqttd_sm.erl
+++ b/src/emqttd_sm.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sm_helper.erl b/src/emqttd_sm_helper.erl
index 0721339fd..7a1875be1 100644
--- a/src/emqttd_sm_helper.erl
+++ b/src/emqttd_sm_helper.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sm_sup.erl b/src/emqttd_sm_sup.erl
index 1c2e7f31a..f26716e0d 100644
--- a/src/emqttd_sm_sup.erl
+++ b/src/emqttd_sm_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_stats.erl b/src/emqttd_stats.erl
index 6d84395e2..4471a2814 100644
--- a/src/emqttd_stats.erl
+++ b/src/emqttd_stats.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sup.erl b/src/emqttd_sup.erl
index e38d20d65..0d0bf496c 100644
--- a/src/emqttd_sup.erl
+++ b/src/emqttd_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sysmon.erl b/src/emqttd_sysmon.erl
index c94c1df54..8a9489c9e 100644
--- a/src/emqttd_sysmon.erl
+++ b/src/emqttd_sysmon.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_sysmon_sup.erl b/src/emqttd_sysmon_sup.erl
index 99e7a628d..884112a00 100644
--- a/src/emqttd_sysmon_sup.erl
+++ b/src/emqttd_sysmon_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_time.erl b/src/emqttd_time.erl
index 7e5940438..77459195e 100644
--- a/src/emqttd_time.erl
+++ b/src/emqttd_time.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_topic.erl b/src/emqttd_topic.erl
index 91cd0ff08..6623c730f 100644
--- a/src/emqttd_topic.erl
+++ b/src/emqttd_topic.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_trace.erl b/src/emqttd_trace.erl
index 05734c2d2..b87359416 100644
--- a/src/emqttd_trace.erl
+++ b/src/emqttd_trace.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_trace_sup.erl b/src/emqttd_trace_sup.erl
index 728e6818e..35264e017 100644
--- a/src/emqttd_trace_sup.erl
+++ b/src/emqttd_trace_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_trie.erl b/src/emqttd_trie.erl
index 0bb6ec63e..2dae6974a 100644
--- a/src/emqttd_trie.erl
+++ b/src/emqttd_trie.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_vm.erl b/src/emqttd_vm.erl
index 16fae60ae..368463d35 100644
--- a/src/emqttd_vm.erl
+++ b/src/emqttd_vm.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_ws.erl b/src/emqttd_ws.erl
index 798c4d69b..e2375e4a6 100644
--- a/src/emqttd_ws.erl
+++ b/src/emqttd_ws.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl
index 206f461bb..0462e3220 100644
--- a/src/emqttd_ws_client.erl
+++ b/src/emqttd_ws_client.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/emqttd_ws_client_sup.erl b/src/emqttd_ws_client_sup.erl
index 21f683eaa..48f3b1193 100644
--- a/src/emqttd_ws_client_sup.erl
+++ b/src/emqttd_ws_client_sup.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/src/lager_emqtt_backend.erl b/src/lager_emqtt_backend.erl
index 69c1aece4..1ceb9785e 100644
--- a/src/lager_emqtt_backend.erl
+++ b/src/lager_emqtt_backend.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_SUITE.erl b/test/emqttd_SUITE.erl
index c5794e5b0..360905859 100644
--- a/test/emqttd_SUITE.erl
+++ b/test/emqttd_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_access_SUITE.erl b/test/emqttd_access_SUITE.erl
index 762ae6f40..c3529d935 100644
--- a/test/emqttd_access_SUITE.erl
+++ b/test/emqttd_access_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_acl_test_mod.erl b/test/emqttd_acl_test_mod.erl
index 08f1f9c94..9ed34c263 100644
--- a/test/emqttd_acl_test_mod.erl
+++ b/test/emqttd_acl_test_mod.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_auth_anonymous_test_mod.erl b/test/emqttd_auth_anonymous_test_mod.erl
index be6a14bf8..0f01be47f 100644
--- a/test/emqttd_auth_anonymous_test_mod.erl
+++ b/test/emqttd_auth_anonymous_test_mod.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_auth_dashboard.erl b/test/emqttd_auth_dashboard.erl
index 49f54c377..97ed17ea4 100644
--- a/test/emqttd_auth_dashboard.erl
+++ b/test/emqttd_auth_dashboard.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_cli_SUITE.erl b/test/emqttd_cli_SUITE.erl
index 273518b7f..024432d95 100644
--- a/test/emqttd_cli_SUITE.erl
+++ b/test/emqttd_cli_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_config_SUITE.erl b/test/emqttd_config_SUITE.erl
index 744f7402e..8b227b1b2 100644
--- a/test/emqttd_config_SUITE.erl
+++ b/test/emqttd_config_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_inflight_SUITE.erl b/test/emqttd_inflight_SUITE.erl
index de5391f1a..d3800fc72 100644
--- a/test/emqttd_inflight_SUITE.erl
+++ b/test/emqttd_inflight_SUITE.erl
@@ -1,5 +1,5 @@
 %%
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 
 -module(emqttd_inflight_SUITE).
diff --git a/test/emqttd_lib_SUITE.erl b/test/emqttd_lib_SUITE.erl
index a808fbcc8..dac72e210 100644
--- a/test/emqttd_lib_SUITE.erl
+++ b/test/emqttd_lib_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_mod_SUITE.erl b/test/emqttd_mod_SUITE.erl
index 1fcf455d0..9935b7424 100644
--- a/test/emqttd_mod_SUITE.erl
+++ b/test/emqttd_mod_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_mqueue_SUITE.erl b/test/emqttd_mqueue_SUITE.erl
index 93ccc9833..f709f1478 100644
--- a/test/emqttd_mqueue_SUITE.erl
+++ b/test/emqttd_mqueue_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_net_SUITE.erl b/test/emqttd_net_SUITE.erl
index 78abb50c9..c6bb10c14 100644
--- a/test/emqttd_net_SUITE.erl
+++ b/test/emqttd_net_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_protocol_SUITE.erl b/test/emqttd_protocol_SUITE.erl
index 21428f0c7..3401860e6 100644
--- a/test/emqttd_protocol_SUITE.erl
+++ b/test/emqttd_protocol_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_router_SUITE.erl b/test/emqttd_router_SUITE.erl
index 415550ec3..b305d699d 100644
--- a/test/emqttd_router_SUITE.erl
+++ b/test/emqttd_router_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_topic_SUITE.erl b/test/emqttd_topic_SUITE.erl
index 9ec7736bd..984d0b299 100644
--- a/test/emqttd_topic_SUITE.erl
+++ b/test/emqttd_topic_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_trie_SUITE.erl b/test/emqttd_trie_SUITE.erl
index a81a132f5..629531934 100644
--- a/test/emqttd_trie_SUITE.erl
+++ b/test/emqttd_trie_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/test/emqttd_vm_SUITE.erl b/test/emqttd_vm_SUITE.erl
index ef0ac2946..49252c2ae 100644
--- a/test/emqttd_vm_SUITE.erl
+++ b/test/emqttd_vm_SUITE.erl
@@ -1,5 +1,5 @@
 %%--------------------------------------------------------------------
-%% Copyright (c) 2013-2017 EMQ Enterprise, Inc. (http://emqtt.io)
+%% Copyright (c) 2013-2018 EMQ Enterprise, Inc. (http://emqtt.io)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.