Merge branch 'main-v4.3' into bridge_config_topic_node_template_43

2022-02-25 10:05:36 +00:00 · 2022-02-25 10:05:36 +00:00 · 19fcd6a4f6
parent 0bd080c063 a147f82b7c
commit 19fcd6a4f6
115 changed files with 1173 additions and 722 deletions
--- a/.ci/fvt_tests/relup.lux
+++ b/.ci/fvt_tests/relup.lux
@ -18,8 +18,9 @@
    ?>

 [shell emqx]
+    !OLD_VSN=$(echo $OLD_VSN | sed  -r 's/[v|e]//g')
    !cd $PACKAGE_PATH
-    !unzip -q -o $PROFILE-ubuntu20.04-$(echo $OLD_VSN | sed  -r 's/[v|e]//g')-amd64.zip
+    !unzip -q -o $PROFILE-ubuntu20.04-$${OLD_VSN}-amd64.zip
    ?SH-PROMPT

    !cd emqx
@ -30,6 +31,7 @@
    ?SH-PROMPT

 [shell emqx2]
+    !OLD_VSN=$(echo $OLD_VSN | sed  -r 's/[v|e]//g')
    !cd $PACKAGE_PATH
    !cp -f $ONE_MORE_EMQX_PATH/one_more_$(echo $PROFILE | sed 's/-/_/g').sh .
    !./one_more_$(echo $PROFILE | sed 's/-/_/g').sh emqx2
@ -82,6 +84,27 @@

    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/

+    ## upgrade to the new version
+    !./bin/emqx install $VSN
+    ?Made release permanent: "$VSN"
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent
+    ?(.*)$VSN
+    ?SH-PROMPT
+
+    ## downgrade to the old version
+    !./bin/emqx install $${OLD_VSN}
+    ?Made release permanent:.*
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent | grep -qs "$${OLD_VSN}"
+    ?SH-PROMPT:
+    !echo ==$$?==
+    ?^==0==
+    ?SH-PROMPT:
+
+    ## again, upgrade to the new version
    !./bin/emqx install $VSN
    ?Made release permanent: "$VSN"
    ?SH-PROMPT
@ -107,6 +130,27 @@

    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/

+    ## upgrade to the new version
+    !./bin/emqx install $VSN
+    ?Made release permanent: "$VSN"
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent
+    ?(.*)$VSN
+    ?SH-PROMPT
+
+    ## downgrade to the old version
+    !./bin/emqx install $${OLD_VSN}
+    ?Made release permanent:.*
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent | grep -qs "$${OLD_VSN}"
+    ?SH-PROMPT:
+    !echo ==$$?==
+    ?^==0==
+    ?SH-PROMPT:
+
+    ## again, upgrade to the new version
    !./bin/emqx install $VSN
    ?Made release permanent: "$VSN"
    ?SH-PROMPT
@ -136,17 +180,20 @@
    !./bin/emqx_ctl broker metrics | grep "messages.publish"
    ???SH-PROMPT

+## We don't guarantee not to lose a single message!
+## So even if we received 290~300 messages, we consider it as success
 [shell bench]
    !curl --user admin:public --silent --show-error http://localhost:8081/api/v4/rules | jq -M --raw-output ".data[0].metrics[] | select(.node==\"emqx@127.0.0.1\").matched"
-    ?300
+    ?(29[0-9])|(300)
    ?SH-PROMPT

    !curl --user admin:public --silent --show-error http://localhost:8081/api/v4/rules | jq -M --raw-output ".data[0].actions[0].metrics[] | select(.node==\"emqx@127.0.0.1\").success"
-    ?300
+    ?(29[0-9])|(300)
    ?SH-PROMPT

+    ## The /counter API is provided by .ci/fvt_test/http_server
    !curl http://127.0.0.1:8080/counter
-    ???{"data":300,"code":0}
+    ?\{"data":(29[0-9])|(300),"code":0\}
    ?SH-PROMPT

 [shell emqx2]
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@ -12,11 +12,11 @@ assignees: tigercl

 **Environment**:

- EMQ X version (e.g. `emqx_ctl status`): 
+- EMQX version (e.g. `emqx_ctl status`):
 - Hardware configuration (e.g. `lscpu`):
 - OS (e.g. `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
- Erlang/OTP version (in case you build emqx from source code): 
+- Erlang/OTP version (in case you build emqx from source code):
 - Others:

 **What happened and what you expected to happen**:
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@ -1,6 +1,13 @@
 name: Cross build packages

+concurrency:
+  group: build-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
+  push:
+    branches:
+      - 'main-v4.**'
  schedule:
    - cron:  '0 */6 * * *'
  release:
@ -15,7 +22,6 @@ jobs:

    outputs:
      profiles: ${{ steps.set_profile.outputs.profiles}}
-      old_vsns: ${{ steps.set_profile.outputs.old_vsns}}

    steps:
      - uses: actions/checkout@v2
@ -28,12 +34,8 @@ jobs:
        run: |
          cd source
          if make emqx-ee --dry-run > /dev/null 2>&1; then
-            old_vsns="$(./scripts/relup-base-vsns.sh enterprise | xargs)"
-            echo "::set-output name=old_vsns::$old_vsns"
            echo "::set-output name=profiles::[\"emqx-ee\"]"
          else
-            old_vsns="$(./scripts/relup-base-vsns.sh community | xargs)"
-            echo "::set-output name=old_vsns::$old_vsns"
            echo "::set-output name=profiles::[\"emqx\", \"emqx-edge\"]"
          fi
      - name: get_all_deps
@ -216,6 +218,7 @@ jobs:
    needs: prepare

    strategy:
+      fail-fast: false
      matrix:
        profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
        arch:
@ -269,32 +272,6 @@ jobs:
        path: .
    - name: unzip source code
      run: unzip -q source.zip
-    - name: downloads old emqx zip packages
-      env:
-        PROFILE: ${{ matrix.profile }}
-        ARCH: ${{ matrix.arch }}
-        SYSTEM: ${{ matrix.os }}
-        OLD_VSNS: ${{ needs.prepare.outputs.old_vsns }}
-      run: |
-        set -e -x -u
-        broker=$PROFILE
-        if [ $PROFILE = "emqx" ];then
-            broker="emqx-ce"
-        fi
-        if [ ! -z "$(echo $SYSTEM | grep -oE 'raspbian')" ]; then
-            export ARCH="arm"
-        fi
-
-        mkdir -p source/_upgrade_base
-        cd source/_upgrade_base
-        old_vsns=($(echo $OLD_VSNS | tr ' ' ' '))
-        for tag in ${old_vsns[@]}; do
-          if [ ! -z "$(echo $(curl -I -m 10 -o /dev/null -s -w %{http_code} https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip) | grep -oE "^[23]+")" ];then
-            wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip
-            wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256
-            echo "$(cat $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256) $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip" | sha256sum -c || exit 1
-          fi
-        done
    - name: build emqx packages
      env:
        ERL_OTP: erl23.2.7.2-emqx-3
@ -342,6 +319,7 @@ jobs:
    needs: prepare

    strategy:
+      fail-fast: false
      matrix:
        profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
        registry:
@ -439,6 +417,7 @@ jobs:
    needs: [prepare, mac, linux, docker]

    strategy:
+      fail-fast: false
      matrix:
        profile: ${{fromJSON(needs.prepare.outputs.profiles)}}

--- a/.github/workflows/code_style_check.yaml
+++ b/.github/workflows/code_style_check.yaml
@ -1,24 +0,0 @@
-name: Code style check
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1000
-      - name: Set git token
-        if: endsWith(github.repository, 'enterprise')
-        run: |
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
-          git config --global credential.helper store
-      - name: Run elvis check
-        run: |
-          set -e
-          if [ -f EMQX_ENTERPRISE ]; then
-            ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx-enterprise
-          else
-            ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx
-          fi
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@ -239,6 +239,7 @@ jobs:
          name: Checkout
          with:
            path: emqx
+            fetch-depth: 0
        - name: Prepare credentials
          run: |
            if [ "$PROFILE" = "emqx-ee" ]; then
@ -246,15 +247,6 @@ jobs:
              git config --global credential.helper store
              echo "${{ secrets.CI_GIT_TOKEN }}" >> emqx/scripts/git-token
            fi
-        - name: Download bases
-          run: |
-            set -e -x -u
-            mkdir -p emqx/_upgrade_base
-            cd emqx/_upgrade_base
-            old_vsns=($(echo $OLD_VSNS | tr ' ' ' '))
-            for old_vsn in ${old_vsns[@]}; do
-              wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$BROKER/$old_vsn/$PROFILE-ubuntu20.04-${old_vsn#[e|v]}-amd64.zip
-            done
        - name: Build emqx
          run: make -C emqx ${PROFILE}-zip
        - uses: actions/upload-artifact@v2
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@ -1,6 +1,6 @@
-# EMQ X 4.3 Changes
+# EMQX 4.3 Changes

-Started tracking changes in CHANGE.md since EMQ X v4.3.11
+Started tracking changes in CHANGE.md since EMQX v4.3.11

 NOTE: Keep prepending to the head of the file instead of the tail

@ -12,17 +12,30 @@ File format:

 ## v4.3.13

+### Important changes
+
+* For docker image, /opt/emqx/etc has been removed from the VOLUME list,
+  this made it easier for the users to rebuild image on top with changed configs.
+
 ### Enhancements

 * CLI `emqx_ctl pem_cache clean` to force purge x509 certificate cache,
  to force an immediate reload of all certificates after the files are updated on disk.
+* Refactor the ExProto so that anonymous clients can also be displayed on the dashboard [#6983]
+* Force shutdown of processe that cannot answer takeover event [#7026]

 * `topic` parameter in bridge configuration can have `${node}` substitution (just like in `clientid` parameter)

 ### Bug fixes

+* Fix the `{error,eexist}` error when do release upgrade again if last run failed. [#7121]
 * Fix case where publishing to a non-existent topic alias would crash the connection [#6979]
 * Fix HTTP-API 500 error on querying the lwm2m client list on the another node [#7009]
+* Fix the ExProto connection registry is not released after the client process abnormally exits [#6983]
+* Fix Server-KeepAlive wrongly applied on MQTT v3.0/v3.1 [#7085]
+* Fix Stomp client can not trigger `$event/client_connection` message [#7096]
+* Fix system memory false alarm at boot
+* Fix the MQTT-SN message replay when the topic is not registered to the client [#6970]

 ## v4.3.12
 ### Important changes
@ -55,9 +68,9 @@ Important notes:

 ### Important changes

-* Debian/Ubuntu package (deb) installed EMQ X now runs on systemd [#6389]<br>
+* Debian/Ubuntu package (deb) installed EMQX now runs on systemd [#6389]<br>
  This is to take advantage of systemd's supervision functionality to ensure
-  EMQ X service is restarted after crashes.
+  EMQX service is restarted after crashes.

 ### Minor changes

@ -73,7 +86,7 @@ Important notes:

 * Fix session takeover race condition which may lead to message loss [#6396]

-* EMQ X docker images are pushed to aws public ecr in an automated CI job [#6271]<br>
+* EMQX docker images are pushed to aws public ecr in an automated CI job [#6271]<br>
  `docker pull public.ecr.aws/emqx/emqx:4.3.10`

 * Fix webhook URL path to allow rule-engine variable substitution [#6399]
--- a/20
+++ b/20
@ -3,14 +3,17 @@ REBAR_VERSION = 3.14.3-emqx-8
 REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
+export EMQX_RELUP ?= true
 export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.2.7.2-emqx-3-alpine
 export EMQX_DEFAULT_RUNNER = alpine:3.12
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
-export EMQX_DESC ?= EMQ X
 export EMQX_CE_DASHBOARD_VERSION ?= v4.3.5
 export DOCKERFILE := deploy/docker/Dockerfile
 ifeq ($(OS),Windows_NT)
 	export REBAR_COLOR=none
+	FIND=/usr/bin/find
+else
+	FIND=find
 endif

 PROFILE ?= emqx
@ -90,8 +93,8 @@ $(PROFILES:%=clean-%):
 	@if [ -d _build/$(@:clean-%=%) ]; then \
 		rm rebar.lock \
 		rm -rf _build/$(@:clean-%=%)/rel; \
-		find _build/$(@:clean-%=%) -name '*.beam' -o -name '*.so' -o -name '*.app' -o -name '*.appup' -o -name '*.o' -o -name '*.d' -type f | xargs rm -f; \
-		find _build/$(@:clean-%=%) -type l -delete; \
+		$(FIND) _build/$(@:clean-%=%) -name '*.beam' -o -name '*.so' -o -name '*.app' -o -name '*.appup' -o -name '*.o' -o -name '*.d' -type f | xargs rm -f; \
+		$(FIND) _build/$(@:clean-%=%) -type l -delete; \
 	fi

 .PHONY: clean-all
@ -125,10 +128,19 @@ COMMON_DEPS := $(REBAR) get-dashboard $(CONF_SEGS)
 $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel): $(COMMON_DEPS)
 	@$(BUILD) $(subst -rel,,$(@)) rel

+## download relup base packages
+.PHONY: $(REL_PROFILES:%=%-relup-downloads)
+define download-relup-packages
+$1-relup-downloads:
+	@if [ "$${EMQX_RELUP}" = "true" ]; then $(CURDIR)/scripts/relup-base-packages.sh $1; fi
+endef
+ALL_ZIPS = $(REL_PROFILES)
+$(foreach zt,$(ALL_ZIPS),$(eval $(call download-relup-packages,$(zt))))
+
 ## relup target is to create relup instructions
 .PHONY: $(REL_PROFILES:%=%-relup)
 define gen-relup-target
-$1-relup: $(COMMON_DEPS)
+$1-relup: $1-relup-downloads $(COMMON_DEPS)
 	@$(BUILD) $1 relup
 endef
 ALL_ZIPS = $(REL_PROFILES)
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-EMQ X, a highly scalable, highly available distributed MQTT messaging broker for IoT.
+EMQX, a highly scalable, highly available distributed MQTT messaging broker for IoT.
 Copyright (c) 2017-2021 EMQ Technologies Co., Ltd. All Rights Reserved.

 This product contains code developed at EMQ Technologies Co., Ltd.
--- a/README-CN.md
+++ b/README-CN.md
@ -1,4 +1,4 @@
-# EMQ X Broker
+# EMQX Broker

 [![GitHub Release](https://img.shields.io/github/release/emqx/emqx?color=brightgreen)](https://github.com/emqx/emqx/releases)
 [![Build Status](https://travis-ci.org/emqx/emqx.svg)](https://travis-ci.org/emqx/emqx)
@ -13,20 +13,20 @@

 [English](./README.md) | 简体中文 | [日本語](./README-JP.md) | [русский](./README-RU.md)

-*EMQ X* 是一款完全开源，高度可伸缩，高可用的分布式 MQTT 消息服务器，适用于 IoT、M2M 和移动应用程序，可处理千万级别的并发客户端。
+*EMQX* 是一款完全开源，高度可伸缩，高可用的分布式 MQTT 消息服务器，适用于 IoT、M2M 和移动应用程序，可处理千万级别的并发客户端。

-从 3.0 版本开始，*EMQ X* 完整支持 MQTT V5.0 协议规范，向下兼容 MQTT V3.1 和 V3.1.1，并支持 MQTT-SN、CoAP、LwM2M、WebSocket 和 STOMP 等通信协议。EMQ X 3.0 单集群可支持千万级别的 MQTT 并发连接。
+从 3.0 版本开始，*EMQX* 完整支持 MQTT V5.0 协议规范，向下兼容 MQTT V3.1 和 V3.1.1，并支持 MQTT-SN、CoAP、LwM2M、WebSocket 和 STOMP 等通信协议。EMQX 3.0 单集群可支持千万级别的 MQTT 并发连接。

- 新功能的完整列表，请参阅 [EMQ X Release Notes](https://github.com/emqx/emqx/releases)。
- 获取更多信息，请访问 [EMQ X 官网](https://www.emqx.cn/)。
+- 新功能的完整列表，请参阅 [EMQX Release Notes](https://github.com/emqx/emqx/releases)。
+- 获取更多信息，请访问 [EMQX 官网](https://www.emqx.cn/)。

 ## 安装

-*EMQ X* 是跨平台的，支持 Linux、Unix、macOS 以及 Windows。这意味着 *EMQ X* 可以部署在 x86_64 架构的服务器上，也可以部署在 Raspberry Pi 这样的 ARM 设备上。
+*EMQX* 是跨平台的，支持 Linux、Unix、macOS 以及 Windows。这意味着 *EMQX* 可以部署在 x86_64 架构的服务器上，也可以部署在 Raspberry Pi 这样的 ARM 设备上。

-Windows 上编译和运行 *EMQ X* 的详情参考：[Windows.md](./Windows.md)
+Windows 上编译和运行 *EMQX* 的详情参考：[Windows.md](./Windows.md)

-#### EMQ X Docker 镜像安装
+#### EMQX Docker 镜像安装

 ```
 docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
@ -34,14 +34,14 @@ docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p

 #### 二进制软件包安装

-需从 [EMQ X 下载](https://www.emqx.cn/downloads) 页面获取相应操作系统的二进制软件包。
+需从 [EMQX 下载](https://www.emqx.cn/downloads) 页面获取相应操作系统的二进制软件包。

 - [单节点安装文档](https://docs.emqx.cn/broker/latest/getting-started/install.html)
 - [集群配置文档](https://docs.emqx.cn/broker/latest/advanced/cluster.html)

 ## 从源码构建

-3.0 版本开始，构建 *EMQ X* 需要 Erlang/OTP R21+。
+3.0 版本开始，构建 *EMQX* 需要 Erlang/OTP R21+。

 4.3 及以后的版本：

@ -77,7 +77,7 @@ _build/emqx/rel/emqx/bin/emqx console
 ./bin/emqx stop
 ```

-*EMQ X* 启动，可以使用浏览器访问 http://localhost:18083 来查看 Dashboard。
+*EMQX* 启动，可以使用浏览器访问 http://localhost:18083 来查看 Dashboard。

 ## 测试

@ -108,7 +108,7 @@ DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer

 ### FAQ

-访问 [EMQ X FAQ](https://docs.emqx.cn/broker/latest/faq/faq.html) 以获取常见问题的帮助。
+访问 [EMQX FAQ](https://docs.emqx.cn/broker/latest/faq/faq.html) 以获取常见问题的帮助。

 ### 问答

@ -117,7 +117,7 @@ DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer

 ### 参与设计

-如果对 EMQ X 有改进建议，可以向[EIP](https://github.com/emqx/eip) 提交 PR 和 ISSUE
+如果对 EMQX 有改进建议，可以向[EIP](https://github.com/emqx/eip) 提交 PR 和 ISSUE

 ### 插件开发

--- a/README-JP.md
+++ b/README-JP.md
@ -1,4 +1,4 @@
-# EMQ X Broker
+# EMQX Broker

 [![GitHub Release](https://img.shields.io/github/release/emqx/emqx?color=brightgreen)](https://github.com/emqx/emqx/releases)
 [![Build Status](https://travis-ci.org/emqx/emqx.svg)](https://travis-ci.org/emqx/emqx)
@ -12,22 +12,22 @@

 [English](./README.md) | [简体中文](./README-CN.md) | 日本語 | [русский](./README-RU.md)

-*EMQ X* は、高い拡張性と可用性をもつ、分散型のMQTTブローカーです。数千万のクライアントを同時に処理するIoT、M2M、モバイルアプリケーション向けです。
+*EMQX* は、高い拡張性と可用性をもつ、分散型のMQTTブローカーです。数千万のクライアントを同時に処理するIoT、M2M、モバイルアプリケーション向けです。

-version 3.0 以降、*EMQ X* は MQTT V5.0 の仕様を完全にサポートしており、MQTT V3.1およびV3.1.1とも下位互換性があります。
+version 3.0 以降、*EMQX* は MQTT V5.0 の仕様を完全にサポートしており、MQTT V3.1およびV3.1.1とも下位互換性があります。
 MQTT-SN、CoAP、LwM2M、WebSocket、STOMPなどの通信プロトコルをサポートしています。 MQTTの同時接続数は1つのクラスター上で1,000万以上にまでスケールできます。

- 新機能の一覧については、[EMQ Xリリースノート](https://github.com/emqx/emqx/releases)を参照してください。
- 詳細はこちら[EMQ X公式ウェブサイト](https://www.emqx.io/)をご覧ください。
+- 新機能の一覧については、[EMQXリリースノート](https://github.com/emqx/emqx/releases)を参照してください。
+- 詳細はこちら[EMQX公式ウェブサイト](https://www.emqx.io/)をご覧ください。

 ## インストール

-*EMQ X* はクロスプラットフォームで、Linux、Unix、macOS、Windowsをサポートしています。
-そのため、x86_64アーキテクチャサーバー、またはRaspberryPiなどのARMデバイスに *EMQ X* をデプロイすることもできます。
+*EMQX* はクロスプラットフォームで、Linux、Unix、macOS、Windowsをサポートしています。
+そのため、x86_64アーキテクチャサーバー、またはRaspberryPiなどのARMデバイスに *EMQX* をデプロイすることもできます。

-Windows上における *EMQ X* のビルドと実行については、[Windows.md](./Windows.md)をご参照ください。
+Windows上における *EMQX* のビルドと実行については、[Windows.md](./Windows.md)をご参照ください。

-#### Docker イメージによる EMQ X のインストール
+#### Docker イメージによる EMQX のインストール

 ```
 docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
@ -35,14 +35,14 @@ docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p

 #### バイナリパッケージによるインストール

-それぞれのOSに対応したバイナリソフトウェアパッケージは、[EMQ Xのダウンロード](https://www.emqx.io/downloads)ページから取得できます。
+それぞれのOSに対応したバイナリソフトウェアパッケージは、[EMQXのダウンロード](https://www.emqx.io/downloads)ページから取得できます。

 - [シングルノードインストール](https://docs.emqx.io/broker/latest/en/getting-started/installation.html)
 - [マルチノードインストール](https://docs.emqx.io/broker/latest/en/advanced/cluster.html)

 ## ソースからビルド

-version 3.0 以降の *EMQ X* をビルドするには Erlang/OTP R21+ が必要です。
+version 3.0 以降の *EMQX* をビルドするには Erlang/OTP R21+ が必要です。

 version 4.3 以降の場合：

@ -71,7 +71,7 @@ emqx をソースコードからビルドした場合は、
 ./bin/emqx stop
 ```

-*EMQ X* の起動後、ブラウザで http://localhost:18083 にアクセスするとダッシュボードが表示されます。
+*EMQX* の起動後、ブラウザで http://localhost:18083 にアクセスするとダッシュボードが表示されます。

 ## テスト

@ -102,7 +102,7 @@ DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer

 ### FAQ

-よくある質問については、[EMQ X FAQ](https://docs.emqx.io/broker/latest/en/faq/faq.html)をご確認ください。
+よくある質問については、[EMQX FAQ](https://docs.emqx.io/broker/latest/en/faq/faq.html)をご確認ください。

 ### 質問する

--- a/README-RU.md
+++ b/README-RU.md
@ -1,4 +1,4 @@
-# Брокер EMQ X
+# Брокер EMQX

 [![GitHub Release](https://img.shields.io/github/release/emqx/emqx?color=brightgreen)](https://github.com/emqx/emqx/releases)
 [![Build Status](https://travis-ci.org/emqx/emqx.svg)](https://travis-ci.org/emqx/emqx)
@ -13,20 +13,20 @@

 [English](./README.md) | [简体中文](./README-CN.md) | [日本語](./README-JP.md) | русский

-*EMQ X* — это масштабируемый, высоко доступный, распределённый MQTT брокер с полностью открытым кодом для интернета вещей, межмашинного взаимодействия и мобильных приложений, который поддерживает миллионы одновременных подключений.
+*EMQX* — это масштабируемый, высоко доступный, распределённый MQTT брокер с полностью открытым кодом для интернета вещей, межмашинного взаимодействия и мобильных приложений, который поддерживает миллионы одновременных подключений.

-Начиная с релиза 3.0, брокер *EMQ X* полностью поддерживает протокол MQTT версии 5.0, и обратно совместим с версиями 3.1 и 3.1.1, а также протоколами MQTT-SN, CoAP, LwM2M, WebSocket и STOMP. Начиная с релиза 3.0, брокер *EMQ X* может масштабироваться до более чем 10 миллионов одновременных MQTT соединений на один кластер.
+Начиная с релиза 3.0, брокер *EMQX* полностью поддерживает протокол MQTT версии 5.0, и обратно совместим с версиями 3.1 и 3.1.1, а также протоколами MQTT-SN, CoAP, LwM2M, WebSocket и STOMP. Начиная с релиза 3.0, брокер *EMQX* может масштабироваться до более чем 10 миллионов одновременных MQTT соединений на один кластер.

- Полный список возможностей доступен по ссылке: [EMQ X Release Notes](https://github.com/emqx/emqx/releases).
- Более подробная информация доступна на нашем сайте: [EMQ X homepage](https://www.emqx.io).
+- Полный список возможностей доступен по ссылке: [EMQX Release Notes](https://github.com/emqx/emqx/releases).
+- Более подробная информация доступна на нашем сайте: [EMQX homepage](https://www.emqx.io).

 ## Установка

-Брокер *EMQ X* кросплатформенный, и поддерживает Linux, Unix, macOS и Windows. Он может работать на серверах с архитектурой x86_64 и устройствах на архитектуре ARM, таких как Raspberry Pi.
+Брокер *EMQX* кросплатформенный, и поддерживает Linux, Unix, macOS и Windows. Он может работать на серверах с архитектурой x86_64 и устройствах на архитектуре ARM, таких как Raspberry Pi.

 Более подробная информация о запуске на Windows по ссылке: [Windows.md](./Windows.md)

-#### Установка EMQ X с помощью Docker-образа
+#### Установка EMQX с помощью Docker-образа

 ```
 docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
@ -34,7 +34,7 @@ docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p

 #### Установка бинарного пакета

-Сборки для различных операционных систем: [Загрузить EMQ X](https://www.emqx.io/downloads).
+Сборки для различных операционных систем: [Загрузить EMQX](https://www.emqx.io/downloads).

 - [Установка на одном сервере](https://docs.emqx.io/en/broker/latest/getting-started/install.html)
 - [Установка на кластере](https://docs.emqx.io/en/broker/latest/advanced/cluster.html)
@ -111,7 +111,7 @@ DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer

 ### FAQ

-Наиболее частые проблемы разобраны в [EMQ X FAQ](https://docs.emqx.io/en/broker/latest/faq/faq.html).
+Наиболее частые проблемы разобраны в [EMQX FAQ](https://docs.emqx.io/en/broker/latest/faq/faq.html).


 ### Вопросы
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# EMQ X Broker
+# EMQX Broker

 [![GitHub Release](https://img.shields.io/github/release/emqx/emqx?color=brightgreen)](https://github.com/emqx/emqx/releases)
 [![Build Status](https://travis-ci.org/emqx/emqx.svg)](https://travis-ci.org/emqx/emqx)
@ -12,20 +12,20 @@

 English | [简体中文](./README-CN.md) | [日本語](./README-JP.md) | [русский](./README-RU.md)

-*EMQ X* broker is a fully open source, highly scalable, highly available distributed MQTT messaging broker for IoT, M2M and Mobile applications that can handle tens of millions of concurrent clients.
+*EMQX* broker is a fully open source, highly scalable, highly available distributed MQTT messaging broker for IoT, M2M and Mobile applications that can handle tens of millions of concurrent clients.

-Starting from 3.0 release, *EMQ X* broker fully supports MQTT V5.0 protocol specifications and backward compatible with MQTT V3.1 and V3.1.1,  as well as other communication protocols such as MQTT-SN, CoAP, LwM2M, WebSocket and STOMP. The 3.0 release of the *EMQ X* broker can scaled to 10+ million concurrent MQTT connections on one cluster.
+Starting from 3.0 release, *EMQX* broker fully supports MQTT V5.0 protocol specifications and backward compatible with MQTT V3.1 and V3.1.1,  as well as other communication protocols such as MQTT-SN, CoAP, LwM2M, WebSocket and STOMP. The 3.0 release of the *EMQX* broker can scaled to 10+ million concurrent MQTT connections on one cluster.

- For full list of new features, please read [EMQ X Release Notes](https://github.com/emqx/emqx/releases).
- For more information, please visit [EMQ X homepage](https://www.emqx.io).
+- For full list of new features, please read [EMQX Release Notes](https://github.com/emqx/emqx/releases).
+- For more information, please visit [EMQX homepage](https://www.emqx.io).

 ## Installation

-The *EMQ X* broker is cross-platform, which supports Linux, Unix, macOS and Windows. It means *EMQ X* can be deployed on x86_64 architecture servers and ARM devices like Raspberry Pi.
+The *EMQX* broker is cross-platform, which supports Linux, Unix, macOS and Windows. It means *EMQX* can be deployed on x86_64 architecture servers and ARM devices like Raspberry Pi.

-See more details for building and running *EMQ X* on Windows in [Windows.md](./Windows.md)
+See more details for building and running *EMQX* on Windows in [Windows.md](./Windows.md)

-#### Installing via EMQ X Docker Image
+#### Installing via EMQX Docker Image

 ```
 docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
@ -33,7 +33,7 @@ docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p

 #### Installing via Binary Package

-Get the binary package of the corresponding OS from [EMQ X Download](https://www.emqx.io/downloads) page.
+Get the binary package of the corresponding OS from [EMQX Download](https://www.emqx.io/downloads) page.

 - [Single Node Install](https://docs.emqx.io/en/broker/latest/getting-started/install.html)
 - [Multi Node Install](https://docs.emqx.io/en/broker/latest/advanced/cluster.html)
@ -41,7 +41,7 @@ Get the binary package of the corresponding OS from [EMQ X Download](https://www

 ## Build From Source

-The *EMQ X* broker requires Erlang/OTP R21+ to build since 3.0 release.
+The *EMQX* broker requires Erlang/OTP R21+ to build since 3.0 release.

 For 4.3 and later versions.

@ -110,7 +110,7 @@ DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer

 ### FAQ

-Visiting [EMQ X FAQ](https://docs.emqx.io/en/broker/latest/faq/faq.html) to get help of common problems.
+Visiting [EMQX FAQ](https://docs.emqx.io/en/broker/latest/faq/faq.html) to get help of common problems.


 ### Questions
--- a/Windows.md
+++ b/Windows.md
@ -1,4 +1,4 @@
-# Build and run EMQ X on Windows
+# Build and run EMQX on Windows

 NOTE: The instructions and examples are based on Windows 10.

@ -6,7 +6,7 @@ NOTE: The instructions and examples are based on Windows 10.

 ### Visual studio for C/C++ compile and link

-EMQ X includes Erlang NIF (Native Implmented Function) components, implemented
+EMQX includes Erlang NIF (Native Implmented Function) components, implemented
 in C/C++. To compile and link C/C++ libraries, the easiest way is perhaps to
 install Visual Studio.

@ -51,7 +51,7 @@ Eshell V11.1.4  (abort with ^G)

 ### bash

-All EMQ X build/run scripts are either in `bash` or `escript`.
+All EMQX build/run scripts are either in `bash` or `escript`.
 `escript` is installed as a part of Erlang. To install a `bash`
 environment in Windows, there are quite a few options.

@ -68,7 +68,7 @@ Cygwin is what we tested with.

 ### Other tools

-Some of the unix world tools are required to build EMQ X.  Including:
+Some of the unix world tools are required to build EMQX.  Including:

 * git
 * curl
@ -84,7 +84,7 @@ When using scoop:
 scoop install git curl make jq zip unzip
 ```

-## Build EMQ X source code
+## Build EMQX source code

 * Clone the repo: `git clone https://github.com/emqx/emqx.git`

@ -112,11 +112,11 @@ scoop install git curl make jq zip unzip
  To fix it, Visual Studio's bin paths should be ordered prior to Cygwin's (or similar installation's)
  bin paths in `Path` environment variable.

-## Run EMQ X
+## Run EMQX

-To start EMQ X broker.
+To start EMQX broker.

-Execute `_build\emqx\rel\emqx>.\bin\emqx console` or `_build\emqx\rel\emqx>.\bin\emqx start` to start EMQ X.
+Execute `_build\emqx\rel\emqx>.\bin\emqx console` or `_build\emqx\rel\emqx>.\bin\emqx start` to start EMQX.

 Then execute `_build\emqx\rel\emqx>.\bin\emqx_ctl status` to check status.
 If everything works fine, it should print out
--- a/apps/emqx_auth_http/README.md
+++ b/apps/emqx_auth_http/README.md
@ -1,7 +1,7 @@
 emqx_auth_http
 ==============

-EMQ X HTTP Auth/ACL Plugin
+EMQX HTTP Auth/ACL Plugin

 Build
 -----
@ -96,5 +96,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_auth_http/etc/emqx_auth_http.conf
+++ b/apps/emqx_auth_http/etc/emqx_auth_http.conf
@ -168,7 +168,7 @@ auth.http.enable_pipelining = true

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `auth.http.auth_req.url` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
--- a/apps/emqx_auth_jwt/README.md
+++ b/apps/emqx_auth_jwt/README.md
@ -1,7 +1,7 @@

 # emqx-auth-jwt

-EMQ X JWT Authentication Plugin
+EMQX JWT Authentication Plugin

 Build
 -----
@ -87,4 +87,4 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.
--- a/apps/emqx_auth_ldap/README.md
+++ b/apps/emqx_auth_ldap/README.md
@ -1,7 +1,7 @@
 emqx_auth_ldap
 ==============

-EMQ X LDAP Authentication Plugin
+EMQX LDAP Authentication Plugin

 Build
 -----
@ -92,5 +92,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_auth_mongo/README.md
+++ b/apps/emqx_auth_mongo/README.md
@ -1,7 +1,7 @@
 emqx_auth_mongo
 ===============

-EMQ X Authentication/ACL with MongoDB
+EMQX Authentication/ACL with MongoDB

 Build the Plugin
 ----------------
@ -188,5 +188,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_auth_mongo/etc/emqx_auth_mongo.conf
+++ b/apps/emqx_auth_mongo/etc/emqx_auth_mongo.conf
@ -78,7 +78,7 @@ auth.mongo.database = mqtt

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `auth.mongo.server` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
--- a/apps/emqx_auth_mysql/README.md
+++ b/apps/emqx_auth_mysql/README.md
@ -164,4 +164,4 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.
--- a/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf
+++ b/apps/emqx_auth_mysql/etc/emqx_auth_mysql.conf
@ -123,7 +123,7 @@ auth.mysql.acl_query = select allow, ipaddr, username, clientid, access, topic f

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `auth.mysql.server` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
--- a/apps/emqx_auth_pgsql/README.md
+++ b/apps/emqx_auth_pgsql/README.md
@ -179,5 +179,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf
+++ b/apps/emqx_auth_pgsql/etc/emqx_auth_pgsql.conf
@ -70,7 +70,7 @@ auth.pgsql.ssl = off

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `auth.pgsql.server` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
--- a/apps/emqx_auth_redis/README.md
+++ b/apps/emqx_auth_redis/README.md
@ -1,7 +1,7 @@
 emqx_auth_redis
 ===============

-EMQ X Redis Authentication/ACL Plugin
+EMQX Redis Authentication/ACL Plugin

 Features
 ---------
@ -167,5 +167,5 @@ Load Plugin
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_auth_redis/etc/emqx_auth_redis.conf
+++ b/apps/emqx_auth_redis/etc/emqx_auth_redis.conf
@ -123,9 +123,9 @@ auth.redis.acl_cmd = HGETALL mqtt_acl:%u

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `auth.redis.server` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
 ## Value: String | disable
-## auth.redis.ssl.server_name_indication = disable
+## auth.redis.ssl.server_name_indication = disable
--- a/apps/emqx_bridge_mqtt/README.md
+++ b/apps/emqx_bridge_mqtt/README.md
@ -1,13 +1,13 @@
 # EMQ Bridge MQTT

-The concept of **Bridge** means that EMQ X supports forwarding messages
+The concept of **Bridge** means that EMQX supports forwarding messages
 of one of its own topics to another MQTT Broker in some way.

 **Bridge** differs from **Cluster** in that the bridge does not
 replicate the topic trie and routing tables and only forwards MQTT
 messages based on bridging rules.

-At present, the bridging methods supported by EMQ X are as follows:
+At present, the bridging methods supported by EMQX are as follows:

 -   RPC bridge: RPC Bridge only supports message forwarding and does not
    support subscribing to the topic of remote nodes to synchronize
@ -19,7 +19,7 @@ These concepts are shown below:

 ![bridge](docs/images/bridge.png)

-In addition, the EMQ X message broker supports multi-node bridge mode interconnection
+In addition, the EMQX message broker supports multi-node bridge mode interconnection

 ```
              ---------                     ---------                     ---------
@ -27,7 +27,7 @@ Publisher --> | Node1 | --Bridge Forward--> | Node2 | --Bridge Forward--> | Node
              ---------                     ---------                     ---------
 ```

-In EMQ X, bridge is configured by modifying `etc/emqx.conf`. EMQ X distinguishes between different bridges based on different names. E.g
+In EMQX, bridge is configured by modifying `etc/emqx.conf`. EMQX distinguishes between different bridges based on different names. E.g

 ```
 ## Bridge address: node name for local bridge, host:port for remote.
@ -38,7 +38,7 @@ This configuration declares a bridge named `aws` and specifies that it is bridge

 In case of creating multiple bridges, it is convenient to replicate all configuration items of the first bridge, and modify the bridge name and other configuration items if necessary (such as bridge.$name.address, where $name refers to the name of bridge)

-The next two sections describe how to create a bridge in RPC and MQTT mode respectively and create a forwarding rule that forwards the messages from sensors. Assuming that two EMQ X nodes are running on two hosts:
+The next two sections describe how to create a bridge in RPC and MQTT mode respectively and create a forwarding rule that forwards the messages from sensors. Assuming that two EMQX nodes are running on two hosts:


 | Name | Node              | MQTT Port |
@ -47,7 +47,7 @@ The next two sections describe how to create a bridge in RPC and MQTT mode respe
 | emqx2| emqx2@192.168.1.2 | 1883      |


-## EMQ X RPC Bridge Configuration
+## EMQX RPC Bridge Configuration

 The following is the basic configuration of RPC bridging. A simplest RPC bridging only requires the following three items

@ -72,13 +72,13 @@ Limitations of RPC bridging:

 1. The RPC bridge of emqx can only forward local messages to the remote node, and cannot synchronize the messages of the remote node to the local node;

-2. RPC bridge can only bridge two EMQ X broker together and cannot bridge EMQ X broker to other MQTT brokers.
+2. RPC bridge can only bridge two EMQX broker together and cannot bridge EMQX broker to other MQTT brokers.

-## EMQ X MQTT Bridge Configuration
+## EMQX MQTT Bridge Configuration

-EMQ X 3.0 officially introduced MQTT bridge, so that EMQ X can bridge any MQTT broker. Because of the characteristics of the MQTT protocol, EMQ X can subscribe to the remote mqtt broker's topic through MQTT bridge, and then synchronize the remote MQTT broker's message to the local.
+EMQX 3.0 officially introduced MQTT bridge, so that EMQX can bridge any MQTT broker. Because of the characteristics of the MQTT protocol, EMQX can subscribe to the remote mqtt broker's topic through MQTT bridge, and then synchronize the remote MQTT broker's message to the local.

-EMQ X MQTT bridging principle: Create an MQTT client on the EMQ X broker, and connect this MQTT client to the remote MQTT broker. Therefore, in the MQTT bridge configuration, following fields may be set for the EMQ X to connect to the remote broker as an mqtt client
+EMQX MQTT bridging principle: Create an MQTT client on the EMQX broker, and connect this MQTT client to the remote MQTT broker. Therefore, in the MQTT bridge configuration, following fields may be set for the EMQX to connect to the remote broker as an mqtt client

 ```
 ## Bridge Address: Use node name for rpc bridging, use host:port for mqtt connection
@ -159,7 +159,7 @@ bridge.mqtt.emqx2.max_inflight_batches = 32

 ## Bridge Cache Configuration

-The bridge of EMQ X has a message caching mechanism. The caching mechanism is applicable to both RPC bridging and MQTT bridging. When the bridge is disconnected (such as when the network connection is unstable), the messages with a topic specified in `forwards` can be cached to the local message queue. Until the bridge is restored, these messages are re-forwarded to the remote node. The configuration of the cache queue is as follows
+The bridge of EMQX has a message caching mechanism. The caching mechanism is applicable to both RPC bridging and MQTT bridging. When the bridge is disconnected (such as when the network connection is unstable), the messages with a topic specified in `forwards` can be cached to the local message queue. Until the bridge is restored, these messages are re-forwarded to the remote node. The configuration of the cache queue is as follows

 ```
 ## emqx_bridge internal number of messages used for batch
@ -179,9 +179,9 @@ bridge.mqtt.emqx2.queue.replayq_seg_bytes = 10MB

 `bridge.mqtt.emqx2.queue.replayq_seg_bytes` is used to specify the size of the largest single file of the message queue that is cached on disk. If the message queue size exceeds the specified value, a new file is created to store the message queue.

-## CLI for EMQ X Bridge MQTT
+## CLI for EMQX Bridge MQTT

-CLI for EMQ X Bridge MQTT:
+CLI for EMQX Bridge MQTT:

 ``` bash
 $ cd emqx1/ && ./bin/emqx_ctl bridges
--- a/apps/emqx_bridge_mqtt/docs/guide.rst
+++ b/apps/emqx_bridge_mqtt/docs/guide.rst
@ -2,14 +2,14 @@
 EMQ Bridge MQTT
 ===============

-The concept of **Bridge** means that EMQ X supports forwarding messages
+The concept of **Bridge** means that EMQX supports forwarding messages
 of one of its own topics to another MQTT Broker in some way.

 **Bridge** differs from **Cluster** in that the bridge does not
 replicate the topic trie and routing tables and only forwards MQTT
 messages based on bridging rules.

-At present, the bridging methods supported by EMQ X are as follows:
+At present, the bridging methods supported by EMQX are as follows:


 * RPC bridge: RPC Bridge only supports message forwarding and does not
@ -26,7 +26,7 @@ These concepts are shown below:
   :alt: bridge


-In addition, the EMQ X message broker supports multi-node bridge mode interconnection
+In addition, the EMQX message broker supports multi-node bridge mode interconnection

 .. code-block::

@ -34,7 +34,7 @@ In addition, the EMQ X message broker supports multi-node bridge mode interconne
   Publisher --> | Node1 | --Bridge Forward--> | Node2 | --Bridge Forward--> | Node3 | --> Subscriber
                 ---------                     ---------                     ---------

-In EMQ X, bridge is configured by modifying ``etc/emqx.conf``. EMQ X distinguishes between different bridges based on different names. E.g
+In EMQX, bridge is configured by modifying ``etc/emqx.conf``. EMQX distinguishes between different bridges based on different names. E.g

 .. code-block::

@ -45,7 +45,7 @@ This configuration declares a bridge named ``aws`` and specifies that it is brid

 In case of creating multiple bridges, it is convenient to replicate all configuration items of the first bridge, and modify the bridge name and other configuration items if necessary (such as bridge.$name.address, where $name refers to the name of bridge)

-The next two sections describe how to create a bridge in RPC and MQTT mode respectively and create a forwarding rule that forwards the messages from sensors. Assuming that two EMQ X nodes are running on two hosts:
+The next two sections describe how to create a bridge in RPC and MQTT mode respectively and create a forwarding rule that forwards the messages from sensors. Assuming that two EMQX nodes are running on two hosts:

 .. list-table::
   :header-rows: 1
@ -61,7 +61,7 @@ The next two sections describe how to create a bridge in RPC and MQTT mode respe
     - 1883


-EMQ X RPC Bridge Configuration
+EMQX RPC Bridge Configuration
 ------------------------------

 The following is the basic configuration of RPC bridging. A simplest RPC bridging only requires the following three items
@ -90,14 +90,14 @@ Limitations of RPC bridging:
   The RPC bridge of emqx can only forward local messages to the remote node, and cannot synchronize the messages of the remote node to the local node;

 #. 
-   RPC bridge can only bridge two EMQ X broker together and cannot bridge EMQ X broker to other MQTT brokers.
+   RPC bridge can only bridge two EMQX broker together and cannot bridge EMQX broker to other MQTT brokers.

-EMQ X MQTT Bridge Configuration
+EMQX MQTT Bridge Configuration
 -------------------------------

-EMQ X 3.0 officially introduced MQTT bridge, so that EMQ X can bridge any MQTT broker. Because of the characteristics of the MQTT protocol, EMQ X can subscribe to the remote mqtt broker's topic through MQTT bridge, and then synchronize the remote MQTT broker's message to the local.
+EMQX 3.0 officially introduced MQTT bridge, so that EMQX can bridge any MQTT broker. Because of the characteristics of the MQTT protocol, EMQX can subscribe to the remote mqtt broker's topic through MQTT bridge, and then synchronize the remote MQTT broker's message to the local.

-EMQ X MQTT bridging principle: Create an MQTT client on the EMQ X broker, and connect this MQTT client to the remote MQTT broker. Therefore, in the MQTT bridge configuration, following fields may be set for the EMQ X to connect to the remote broker as an mqtt client
+EMQX MQTT bridging principle: Create an MQTT client on the EMQX broker, and connect this MQTT client to the remote MQTT broker. Therefore, in the MQTT bridge configuration, following fields may be set for the EMQX to connect to the remote broker as an mqtt client

 .. code-block::

@ -179,7 +179,7 @@ EMQ X MQTT bridging principle: Create an MQTT client on the EMQ X broker, and co
 Bridge Cache Configuration
 --------------------------

-The bridge of EMQ X has a message caching mechanism. The caching mechanism is applicable to both RPC bridging and MQTT bridging. When the bridge is disconnected (such as when the network connection is unstable), the messages with a topic specified in ``forwards`` can be cached to the local message queue. Until the bridge is restored, these messages are re-forwarded to the remote node. The configuration of the cache queue is as follows
+The bridge of EMQX has a message caching mechanism. The caching mechanism is applicable to both RPC bridging and MQTT bridging. When the bridge is disconnected (such as when the network connection is unstable), the messages with a topic specified in ``forwards`` can be cached to the local message queue. Until the bridge is restored, these messages are re-forwarded to the remote node. The configuration of the cache queue is as follows

 .. code-block::

@ -199,10 +199,10 @@ The bridge of EMQ X has a message caching mechanism. The caching mechanism is ap

 ``bridge.mqtt.emqx2.queue.replayq_seg_bytes`` is used to specify the size of the largest single file of the message queue that is cached on disk. If the message queue size exceeds the specified value, a new file is created to store the message queue.

-CLI for EMQ X Bridge MQTT
+CLI for EMQX Bridge MQTT
 -------------------------

-CLI for EMQ X Bridge MQTT:
+CLI for EMQX Bridge MQTT:

 .. code-block:: bash

--- a/apps/emqx_bridge_mqtt/etc/emqx_bridge_mqtt.conf
+++ b/apps/emqx_bridge_mqtt/etc/emqx_bridge_mqtt.conf
@ -1,5 +1,5 @@
 ##====================================================================
-## Configuration for EMQ X MQTT Broker Bridge
+## Configuration for EMQX MQTT Broker Bridge
 ##====================================================================

 ##--------------------------------------------------------------------
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src
@ -1,20 +1,34 @@
-%% -*- mode: erlang -*-
-{VSN,
-  [{"4.3.3",[{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]}]},
-   {<<"4\\.3\\.[1-2]">>,
-    [{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
-   {"4.3.0",
-    [{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_worker,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
-   {<<".*">>,[]}],
-  [{"4.3.3",[{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]}]},
-   {<<"4\\.3\\.[1-2]">>,
-    [{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
-   {"4.3.0",
-    [{load_module,emqx_bridge_mqtt,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_worker,brutal_purge,soft_purge,[]},
-     {load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
-   {<<".*">>,[]}]}.
+%% -*-: erlang -*-
+
+{"4.3.4",
+  [
+    {<<"4.3.3">>, [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []}
+    ]},
+    {<<"4.3.[1-2]">>, [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_mqtt_actions, brutal_purge, soft_purge, []}
+    ]},
+    {"4.3.0", [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_worker, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_mqtt_actions, brutal_purge, soft_purge, []}
+    ]},
+    {<<".*">>, []}
+  ],
+  [
+    {<<"4.3.3">>, [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []}
+    ]},
+    {<<"4.3.[1-2]">>, [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_mqtt_actions, brutal_purge, soft_purge, []}
+    ]},
+    {"4.3.0", [
+      {load_module, emqx_bridge_mqtt, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_worker, brutal_purge, soft_purge, []},
+      {load_module, emqx_bridge_mqtt_actions, brutal_purge, soft_purge, []}
+    ]},
+    {<<".*">>, []}
+  ]
+}.
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl
@ -149,7 +149,7 @@ send(#{client_pid := ClientPid} = Conn, [Msg | Rest], PktIds) ->
        {ok, PktId} ->
            send(Conn, Rest, [PktId | PktIds]);
        {error, Reason} ->
-            %% NOTE: There is no partial sucess of a batch and recover from the middle
+            %% NOTE: There is no partial success of a batch and recover from the middle
            %% only to retry all messages in one batch
            {error, Reason}
    end.
@ -159,7 +159,7 @@ handle_puback(#{packet_id := PktId, reason_code := RC}, Parent)
       RC =:= ?RC_NO_MATCHING_SUBSCRIBERS ->
    Parent ! {batch_ack, PktId}, ok;
 handle_puback(#{packet_id := PktId, reason_code := RC}, _Parent) ->
-    ?LOG(warning, "Publish ~p to remote node falied, reason_code: ~p", [PktId, RC]).
+    ?LOG(warning, "Publish ~p to remote node failed, reason_code: ~p", [PktId, RC]).

 handle_publish(Msg, Mountpoint) ->
    emqx_broker:publish(emqx_bridge_msg:to_broker_msg(Msg, Mountpoint)).
--- a/apps/emqx_coap/README.md
+++ b/apps/emqx_coap/README.md
@ -1,7 +1,7 @@

 # emqx-coap

-emqx-coap is a CoAP Gateway for EMQ X Broker. It translates CoAP messages into MQTT messages and make it possible to communiate between CoAP clients and MQTT clients.
+emqx-coap is a CoAP Gateway for EMQX Broker. It translates CoAP messages into MQTT messages and make it possible to communiate between CoAP clients and MQTT clients.

 ### Client Usage Example
 libcoap is an excellent coap library which has a simple client tool. It is recommended to use libcoap as a coap client.
@ -252,5 +252,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_exhook/README.md
+++ b/apps/emqx_exhook/README.md
@ -1,6 +1,6 @@
 # emqx_exhook

-The `emqx_exhook` extremly enhance the extensibility for EMQ X. It allow using an others programming language to mount the hooks intead of erlang.
+The `emqx_exhook` extremly enhance the extensibility for EMQX. It allow using an others programming language to mount the hooks intead of erlang.

 ## Feature

@ -10,7 +10,7 @@ The `emqx_exhook` extremly enhance the extensibility for EMQ X. It allow using a
 ## Architecture

 ```
-EMQ X                                      Third-party Runtime
+EMQX                                      Third-party Runtime
 +========================+                 +========+==========+
 |    ExHook              |                 |        |          |
 |   +----------------+   |      gRPC       | gRPC   |  User's  |
--- a/apps/emqx_exhook/docs/design-cn.md
+++ b/apps/emqx_exhook/docs/design-cn.md
@ -2,7 +2,7 @@

 ## 动机

-在 EMQ X Broker v4.1-v4.2 中，我们发布了 2 个插件来扩展 emqx 的编程能力：
+在 EMQX Broker v4.1-v4.2 中，我们发布了 2 个插件来扩展 emqx 的编程能力：

 1. `emqx-extension-hook` 提供了使用 Java, Python 向 Broker 挂载钩子的功能
 2. `emqx-exproto` 提供了使用 Java，Python 编写用户自定义协议接入插件的功能
@ -26,7 +26,7 @@
 架构如下：

 ```
-  EMQ X                                    
+  EMQX
 +========================+                 +========+==========+
 |    ExHook              |                 |        |          |
 |   +----------------+   |      gRPC       | gRPC   |  User's  |
--- a/apps/emqx_exhook/etc/emqx_exhook.conf
+++ b/apps/emqx_exhook/etc/emqx_exhook.conf
@ -1,5 +1,5 @@
 ##====================================================================
-## EMQ X Hooks
+## EMQX Hooks
 ##====================================================================

 ## The default value or action will be returned, while the request to
--- a/apps/emqx_exproto/README.md
+++ b/apps/emqx_exproto/README.md
@ -1,6 +1,6 @@
 # emqx-exproto

-The `emqx_exproto` extremly enhance the extensibility for EMQ X. It allow using an others programming language to **replace the protocol handling layer in EMQ X Broker**.
+The `emqx_exproto` extremly enhance the extensibility for EMQX. It allow using an others programming language to **replace the protocol handling layer in EMQX Broker**.

 ## Feature

@ -9,7 +9,7 @@ The `emqx_exproto` extremly enhance the extensibility for EMQ X. It allow using

 ## Architecture

-![EMQ X ExProto Arch](./docs/images/exproto-arch.jpg)
+![EMQX ExProto Arch](./docs/images/exproto-arch.jpg)

 ## Usage

--- a/apps/emqx_exproto/docs/design-cn.md
+++ b/apps/emqx_exproto/docs/design-cn.md
@ -2,7 +2,7 @@

 `emqx-exproto` 插件用于协议解析的多语言支持。它能够允许其他编程语言（例如：Python，Java 等）直接处理数据流实现协议的解析，并提供 Pub/Sub 接口以实现与系统其它组件的通信。

-该插件给 EMQ X 带来的扩展性十分的强大，它能以你熟悉语言处理任何的私有协议，并享受由 EMQ X 系统带来的高连接，和高并发的优点。
+该插件给 EMQX 带来的扩展性十分的强大，它能以你熟悉语言处理任何的私有协议，并享受由 EMQX 系统带来的高连接，和高并发的优点。

 ## 特性

@ -25,12 +25,12 @@
    - 提供 `Send` 接口。供外部模块调用，**用于发送数据包**。
    - 提供 `Close` 接口。供外部模块调用，**用于主动关闭连接**。

-2. **协议/会话层：**该部分主要**提供 PUB/SUB 接口**，以实现与 EMQ X Broker 系统的消息互通。包括：
+2. **协议/会话层：**该部分主要**提供 PUB/SUB 接口**，以实现与 EMQX Broker 系统的消息互通。包括：

    - 提供 `Authenticate` 接口。供外部模块调用，用于向集群注册客户端。
    - 提供 `StartTimer` 接口。供外部模块调用，用于为该连接进程启动心跳等定时器。
-    - 提供 `Publish` 接口。供外部模块调用，用于发布消息 EMQ X Broker 中。
-    - 提供 `Subscribe` 接口。供外部模块调用，用于订阅某主题，以实现从 EMQ X Broker 中接收某些下行消息。
+    - 提供 `Publish` 接口。供外部模块调用，用于发布消息 EMQX Broker 中。
+    - 提供 `Subscribe` 接口。供外部模块调用，用于订阅某主题，以实现从 EMQX Broker 中接收某些下行消息。
    - 提供 `Unsubscribe` 接口。供外部模块调用，用于取消订阅某主题。
    - 调用 `OnTimerTimeout` 回调。用于处理定时器超时的事件。
    - 调用 `OnReceivedMessages` 回调。用于接收下行消息（在订阅主题成功后，如果主题上有消息，便会回调该方法）
--- a/apps/emqx_exproto/etc/emqx_exproto.conf
+++ b/apps/emqx_exproto/etc/emqx_exproto.conf
@ -1,5 +1,5 @@
 ##====================================================================
-## EMQ X ExProto
+## EMQX ExProto
 ##====================================================================

 exproto.server.http.port = 9100
@ -65,7 +65,7 @@ exproto.listener.protoname.idle_timeout = 30s
 ## Example: allow 192.168.0.0/24
 exproto.listener.protoname.access.1 = allow all

-## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
 ## behind HAProxy or Nginx.
 ##
 ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@ -73,7 +73,7 @@ exproto.listener.protoname.access.1 = allow all
 ## Value: on | off
 ## exproto.listener.protoname.proxy_protocol = on

-## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+## Sets the timeout for proxy protocol. EMQX will close the TCP connection
 ## if no proxy protocol packet recevied within the timeout.
 ##
 ## Value: Duration
--- a/apps/emqx_exproto/src/emqx_exproto.app.src
+++ b/apps/emqx_exproto/src/emqx_exproto.app.src
@ -1,6 +1,6 @@
 {application, emqx_exproto,
 [{description, "EMQ X Extension for Protocol"},
-  {vsn, "4.3.5"}, %% 4.3.3 is used by ee
+  {vsn, "4.3.6"}, %% 4.3.3 is used by ee
  {modules, []},
  {registered, []},
  {mod, {emqx_exproto_app, []}},
--- a/apps/emqx_exproto/src/emqx_exproto.appup.src
+++ b/apps/emqx_exproto/src/emqx_exproto.appup.src
@ -1,28 +1,24 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{"4.3.4",
-    [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {"4.3.3",
+  [{<<"4\\.3\\.[4-5]">>,
    [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {"4.3.2",
+   {<<"4\\.3\\.[2-3]">>,
    [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {<<"4.3.[0-1]">>,
+   {<<"4\\.3\\.[0-1]">>,
    [{load_module,emqx_exproto_gsvr,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_gcli,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
   {<<".*">>,[]}],
-  [{"4.3.4",
-    [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {"4.3.3",
+  [{<<"4\\.3\\.[4-5]">>,
    [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {"4.3.2",
+   {<<"4\\.3\\.[2-3]">>,
    [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]},
-   {<<"4.3.[0-1]">>,
+   {<<"4\\.3\\.[0-1]">>,
    [{load_module,emqx_exproto_gsvr,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_gcli,brutal_purge,soft_purge,[]},
     {load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]},
--- a/apps/emqx_exproto/src/emqx_exproto_channel.erl
+++ b/apps/emqx_exproto/src/emqx_exproto_channel.erl
@ -94,9 +94,6 @@
         awaiting_rel_max
        ]).

-define(CHANMOCK(P), {exproto_anonymous_client, P}).
-define(CHAN_CONN_TAB, emqx_channel_conn).
-
 %%--------------------------------------------------------------------
 %% Info, Attrs and Caps
 %%--------------------------------------------------------------------
@ -155,15 +152,14 @@ init(ConnInfo = #{socktype := Socktype,
    Channel = #channel{gcli = #{channel => GRpcChann},
                       conninfo = NConnInfo,
                       clientinfo = ClientInfo,
-                       conn_state = connecting,
+                       conn_state = accepted,
                       timers = #{}
                      },
    case emqx_hooks:run_fold('client.connect', [NConnInfo], #{}) of
        {error, _Reason} ->
            throw(nopermission);
        _ ->
-            ConnMod = maps:get(conn_mod, NConnInfo),
-            true = ets:insert(?CHAN_CONN_TAB, {?CHANMOCK(self()), ConnMod}),
+            ok = register_the_anonymous_client(ClientInfo, NConnInfo),
            Req = #{conninfo =>
                    peercert(Peercert,
                             #{socktype => socktype(Socktype),
@ -172,6 +168,22 @@ init(ConnInfo = #{socktype := Socktype,
            try_dispatch(on_socket_created, wrap(Req), Channel)
    end.

+register_the_anonymous_client(ClientInfo, ConnInfo) ->
+    ClientId = maps:get(clientid, ClientInfo),
+    case emqx_cm:open_session(true, ClientInfo, ConnInfo) of
+        {ok, _} ->
+            ?LOG(debug, "Registered an anonymous connection, "
+                        "temporary clientid: ~s", [ClientId]),
+            emqx_logger:set_metadata_clientid(ClientId),
+            _ = self() ! {event, accepted},
+            ok;
+        {error, Reason} ->
+            throw({register_anonymous_error, Reason})
+    end.
+
+unregister_the_anonymous_client(ClientId) ->
+    emqx_cm:unregister_channel(ClientId).
+
 %% @private
 peercert(NoSsl, ConnInfo) when NoSsl == nossl;
                               NoSsl == undefined ->
@ -274,15 +286,14 @@ handle_call(close, Channel) ->
 handle_call({auth, ClientInfo, _Password}, Channel = #channel{conn_state = connected}) ->
    ?LOG(warning, "Duplicated authorized command, dropped ~p", [ClientInfo]),
    {reply, {error, ?RESP_PERMISSION_DENY, <<"Duplicated authenticate command">>}, Channel};
-handle_call({auth, ClientInfo0, Password},
+handle_call({auth, RequestedClientInfo, Password},
            Channel = #channel{conninfo = ConnInfo,
-                               clientinfo = ClientInfo}) ->
-    ClientInfo1 = enrich_clientinfo(ClientInfo0, ClientInfo),
-    NConnInfo = enrich_conninfo(ClientInfo0, ConnInfo),
+                               clientinfo = ClientInfo0}) ->
+    ClientInfo1 = enrich_clientinfo(RequestedClientInfo, ClientInfo0),
+    NConnInfo = enrich_conninfo(RequestedClientInfo, ConnInfo),

    Channel1 = Channel#channel{conninfo = NConnInfo,
                               clientinfo = ClientInfo1},
-
    #{clientid := ClientId, username := Username} = ClientInfo1,

    case emqx_access_control:authenticate(ClientInfo1#{password => Password}) of
@ -292,9 +303,10 @@ handle_call({auth, ClientInfo0, Password},
                emqx_metrics:inc('client.auth.anonymous'),
            NClientInfo = maps:merge(ClientInfo1, AuthResult),
            NChannel = Channel1#channel{clientinfo = NClientInfo},
-            clean_anonymous_clients(),
            case emqx_cm:open_session(true, NClientInfo, NConnInfo) of
                {ok, _Session} ->
+                    AnonymousClientId = maps:get(clientid, ClientInfo0),
+                    unregister_the_anonymous_client(AnonymousClientId),
                    ?LOG(debug, "Client ~s (Username: '~s') authorized successfully!",
                                [ClientId, Username]),
                    {reply, ok, [{event, connected}], ensure_connected(NChannel)};
@ -354,6 +366,9 @@ handle_call({publish, Topic, Qos, Payload},
 handle_call(kick, Channel) ->
    {shutdown, kicked, ok, Channel};

+handle_call(discard, Channel) ->
+    {shutdown, discarded, ok, Channel};
+
 handle_call(Req, Channel) ->
    ?LOG(warning, "Unexpected call: ~p", [Req]),
    {reply, {error, unexpected_call}, Channel}.
@ -406,16 +421,12 @@ handle_info(Info, Channel) ->

 -spec(terminate(any(), channel()) -> channel()).
 terminate(Reason, Channel) ->
-    clean_anonymous_clients(),
    Req = #{reason => stringfy(Reason)},
    try_dispatch(on_socket_closed, wrap(Req), Channel).

 is_anonymous(#{anonymous := true}) -> true;
 is_anonymous(_AuthResult)          -> false.

-clean_anonymous_clients() ->
-    ets:delete(?CHAN_CONN_TAB, ?CHANMOCK(self())).
-
 packet_to_message(Topic, Qos, Payload,
                  #channel{
                     conninfo = #{proto_ver := ProtoVer},
@ -608,23 +619,32 @@ default_conninfo(ConnInfo) ->
              username => undefined,
              conn_props => #{},
              connected => true,
+              proto_name => <<"exproto">>,
+              proto_ver => <<"1.0">>,
              connected_at => erlang:system_time(millisecond),
              keepalive => 0,
              receive_maximum => 0,
              expiry_interval => 0}.

-default_clientinfo(#{peername := {PeerHost, _},
+default_clientinfo(#{peername := {PeerHost, PeerPort},
                     sockname := {_, SockPort}}) ->
    #{zone         => external,
-      protocol     => undefined,
+      protocol     => exproto,
      peerhost     => PeerHost,
      sockport     => SockPort,
-      clientid     => undefined,
+      clientid     => anonymous_clientid(PeerHost, PeerPort),
      username     => undefined,
      is_bridge    => false,
      is_superuser => false,
      mountpoint   => undefined}.

+anonymous_clientid(PeerHost, PeerPort) ->
+    iolist_to_binary(
+      ["exproto-anonymous-",
+       inet:ntoa(PeerHost), "-", integer_to_list(PeerPort),
+       "-", emqx_rule_id:gen()
+      ]).
+
 stringfy(Reason) ->
    unicode:characters_to_binary((io_lib:format("~0p", [Reason]))).

--- a/apps/emqx_exproto/src/emqx_exproto_conn.erl
+++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl
@ -439,7 +439,8 @@ handle_msg({close, Reason}, State) ->
    ?LOG(debug, "Force to close the socket due to ~p", [Reason]),
    handle_info({sock_closed, Reason}, close_socket(State));

-handle_msg({event, connected}, State = #state{channel = Channel}) ->
+handle_msg({event, Event}, State = #state{channel = Channel})
+  when Event == connected; Event == accepted ->
    ClientId = emqx_exproto_channel:info(clientid, Channel),
    emqx_cm:insert_channel_info(ClientId, info(State), stats(State));

--- a/apps/emqx_lua_hook/README.md
+++ b/apps/emqx_lua_hook/README.md
@ -334,5 +334,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_lua_hook/etc/emqx_lua_hook.conf
+++ b/apps/emqx_lua_hook/etc/emqx_lua_hook.conf
@ -1,4 +1,4 @@
 ##--------------------------------------------------------------------
-## EMQ X Lua Hook
+## EMQX Lua Hook
 ##--------------------------------------------------------------------

--- a/apps/emqx_lwm2m/README.md
+++ b/apps/emqx_lwm2m/README.md
@ -1,5 +1,5 @@

-# LwM2M Gateway for the EMQ X Broker.
+# LwM2M Gateway for the EMQX Broker.

 [The LwM2M Specifications](http://www.openmobilealliance.org/release/LightweightM2M) is a Lightweight Machine to Machine protocol.

@ -354,4 +354,4 @@ Apache License Version 2.0

 ## Author

-EMQ X-Men Team.
+EMQX-Men Team.
--- a/apps/emqx_management/README.md
+++ b/apps/emqx_management/README.md
@ -1,7 +1,7 @@

 # emqx-management

-EMQ X Management API
+EMQX Management API

 ## How to Design RESTful API?

--- a/apps/emqx_management/etc/emqx_management.conf
+++ b/apps/emqx_management/etc/emqx_management.conf
@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Management Plugin
+## EMQX Management Plugin
 ##--------------------------------------------------------------------

 ## Max Row Limit
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@ -1,6 +1,6 @@
 {application, emqx_management,
 [{description, "EMQ X Management API and CLI"},
-  {vsn, "4.3.11"}, % strict semver, bump manually!
+  {vsn, "4.3.12"}, % strict semver, bump manually!
  {modules, []},
  {registered, [emqx_management_sup]},
  {applications, [kernel,stdlib,minirest]},
--- a/apps/emqx_management/src/emqx_management.appup.src
+++ b/apps/emqx_management/src/emqx_management.appup.src
@ -1,13 +1,13 @@
 %% -*- mode: erlang -*-
 {VSN,
- [ {<<"4\\.3\\.[0-9]+">>,
+ [ {<<"4\\.3\\.([0-9]|1[0])">>,
    [ {apply,{minirest,stop_http,['http:management']}},
      {apply,{minirest,stop_http,['https:management']}},
      {restart_application, emqx_management}
    ]},
   {<<".*">>, []}
 ],
- [ {<<"4\\.3\\.[0-9]+">>,
+ [ {<<"4\\.3\\.([0-9]|1[0])">>,
    [ {apply,{minirest,stop_http,['http:management']}},
      {apply,{minirest,stop_http,['https:management']}},
      {restart_application, emqx_management}
--- a/apps/emqx_management/src/emqx_mgmt.erl
+++ b/apps/emqx_management/src/emqx_mgmt.erl
@ -123,8 +123,6 @@
 -define(MAX_ROW_LIMIT, 10000).

 -define(APP, emqx_management).
-
-elvis([{elvis_style, god_modules, disable}]).
 %%--------------------------------------------------------------------
 %% Node Info
 %%--------------------------------------------------------------------
--- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl
@ -271,6 +271,7 @@ format_channel_info({_Key, Info, Stats0}) ->
    SessCreated = maps:get(created_at, Session, maps:get(connected_at, ConnInfo)),
    Connected = case maps:get(conn_state, Info, connected) of
                    connected -> true;
+                    accepted -> true;  %% for exproto anonymous clients
                    _ -> false
                end,
    NStats = Stats#{max_subscriptions => maps:get(subscriptions_max, Stats, 0),
--- a/apps/emqx_management/test/etc/emqx_management.conf
+++ b/apps/emqx_management/test/etc/emqx_management.conf
@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Management Plugin
+## EMQX Management Plugin
 ##--------------------------------------------------------------------

 ## Max Row Limit
--- a/apps/emqx_prometheus/README.md
+++ b/apps/emqx_prometheus/README.md
@ -1,6 +1,6 @@
 # emqx-prometheus

-EMQ X Prometheus Agent
+EMQX Prometheus Agent

 ## push emqx stats/metrics to prometheus PushGateway

@ -48,7 +48,7 @@ json data
 ```


-## Before EMQ X v4.0.0
+## Before EMQX v4.0.0
 The prometheus data simple is:


@ -279,5 +279,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_prometheus/etc/emqx_prometheus.conf
+++ b/apps/emqx_prometheus/etc/emqx_prometheus.conf
@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## emqx_prometheus for EMQ X
+## emqx_prometheus for EMQX
 ##--------------------------------------------------------------------

 ## The Prometheus Push Gateway URL address
--- a/apps/emqx_recon/README.md
+++ b/apps/emqx_recon/README.md
@ -2,7 +2,7 @@
 emqx-recon
 ==========

-EMQ X Recon Debug/Optimize Plugin
+EMQX Recon Debug/Optimize Plugin

 emqx_recon.conf
 ----=----------
@ -57,5 +57,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_retainer/README.md
+++ b/apps/emqx_retainer/README.md
@ -1,5 +1,5 @@

-EMQ X Retainer
+EMQX Retainer
 ==============

 The retainer plugin is responsible for storing retained MQTT messages.
@ -55,5 +55,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team
+EMQX Team

--- a/apps/emqx_retainer/etc/emqx_retainer.conf
+++ b/apps/emqx_retainer/etc/emqx_retainer.conf
@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Retainer
+## EMQX Retainer
 ##--------------------------------------------------------------------

 ## Where to store the retained messages.
--- a/apps/emqx_rule_engine/README.md
+++ b/apps/emqx_rule_engine/README.md
@ -1,7 +1,7 @@

 # emqx-rule-engine

-IoT Rule Engine for EMQ X Broker.
+IoT Rule Engine for EMQX Broker.

 ## Concept

--- a/apps/emqx_rule_engine/docs/design.md
+++ b/apps/emqx_rule_engine/docs/design.md
@ -1,7 +1,7 @@

-# EMQ X Rule Engine
+# EMQX Rule Engine

-This is the design guide of message routing rule engine for the EMQ X Broker.
+This is the design guide of message routing rule engine for the EMQX Broker.

 ## Concept

@ -149,7 +149,7 @@ The properties and behaviors of resources is defined by resource types. A resour

 ### Resource Type Provider

-Provider of resource type is a EMQ X Plugin.
+Provider of resource type is a EMQX Plugin.

 ### Resource Manager

--- a/apps/emqx_rule_engine/etc/emqx_rule_engine.conf
+++ b/apps/emqx_rule_engine/etc/emqx_rule_engine.conf
@ -1,5 +1,5 @@
 ##====================================================================
-## Rule Engine for EMQ X R4.0
+## EMQX Rule Engine
 ##====================================================================

 rule_engine.ignore_sys_message = on
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
@ -1,7 +1,8 @@
 %% -*- mode: erlang -*-
 {VSN,
  [{"4.3.6",
-    [{update,emqx_rule_metrics,{advanced,["4.3.6"]}},
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_metrics,{advanced,["4.3.6"]}},
     {load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
     {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
@ -58,7 +59,8 @@
     {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
   {<<".*">>,[]}],
  [{"4.3.6",
-    [{update,emqx_rule_metrics,{advanced,["4.3.6"]}},
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_metrics,{advanced,["4.3.6"]}},
     {load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
     {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
--- a/apps/emqx_sn/README.md
+++ b/apps/emqx_sn/README.md
@ -1,7 +1,7 @@
 emqx-sn
 =======

-EMQ X MQTT-SN Gateway.
+EMQX MQTT-SN Gateway.

 Configure Plugin
 ----------------
@ -113,5 +113,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X-Men Team.
+EMQX-Men Team.

--- a/apps/emqx_sn/src/emqx_sn.app.src
+++ b/apps/emqx_sn/src/emqx_sn.app.src
@ -1,6 +1,6 @@
 {application, emqx_sn,
 [{description, "EMQ X MQTT-SN Plugin"},
-  {vsn, "4.3.5"}, % strict semver, bump manually!
+  {vsn, "4.3.6"}, % strict semver, bump manually!
  {modules, []},
  {registered, []},
  {applications, [kernel,stdlib,esockd]},
--- a/apps/emqx_sn/src/emqx_sn.appup.src
+++ b/apps/emqx_sn/src/emqx_sn.appup.src
@ -1,29 +1,25 @@
 %% -*- mode: erlang -*-
 {VSN,
  [
-   {"4.3.4",[
+   {<<"4\\.3\\.[4-5]">>,[
+       {load_module,emqx_sn_frame,brutal_purge,soft_purge,[]},
       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
   ]},
-   {"4.3.3",[
-       {load_module,emqx_sn_registry,brutal_purge,soft_purge,[]},
-       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
-    ]},
-   {"4.3.2", [
+   {<<"4.3.[2-3]">>,[
       {load_module,emqx_sn_registry,brutal_purge,soft_purge,[]},
+       {load_module,emqx_sn_frame,brutal_purge,soft_purge,[]},
       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
    ]},
   {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]}
  ],
  [
-   {"4.3.4",[
+   {<<"4\\.3\\.[4-5]">>,[
+       {load_module,emqx_sn_frame,brutal_purge,soft_purge,[]},
       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
   ]},
-   {"4.3.3",[
-       {load_module,emqx_sn_registry,brutal_purge,soft_purge,[]},
-       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
-    ]},
-   {"4.3.2", [
+   {<<"4.3.[2-3]">>,[
       {load_module,emqx_sn_registry,brutal_purge,soft_purge,[]},
+       {load_module,emqx_sn_frame,brutal_purge,soft_purge,[]},
       {load_module,emqx_sn_gateway,brutal_purge,soft_purge,[]}
    ]},
   {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]}
--- a/apps/emqx_sn/src/emqx_sn_frame.erl
+++ b/apps/emqx_sn/src/emqx_sn_frame.erl
@ -268,40 +268,81 @@ message_type(16#1d) ->
 message_type(Type) ->
    io_lib:format("Unknown Type ~p", [Type]).

+format(?SN_CONNECT_MSG(Flags, ProtocolId, Duration, ClientId)) ->
+    #mqtt_sn_flags{
+       will = Will,
+       clean_start = CleanStart} = Flags,
+    io_lib:format("SN_CONNECT(W~w, C~w, ProtocolId=~w, Duration=~w, "
+                  "ClientId=~s)",
+                  [bool(Will), bool(CleanStart),
+                   ProtocolId, Duration, ClientId]);
+format(?SN_CONNACK_MSG(ReturnCode)) ->
+    io_lib:format("SN_CONNACK(ReturnCode=~w)", [ReturnCode]);
+format(?SN_WILLTOPICREQ_MSG()) ->
+    "SN_WILLTOPICREQ()";
+format(?SN_WILLTOPIC_MSG(Flags, Topic)) ->
+    #mqtt_sn_flags{
+       qos = QoS,
+       retain = Retain} = Flags,
+    io_lib:format("SN_WILLTOPIC(Q~w, R~w, Topic=~s)",
+                  [QoS, bool(Retain), Topic]);
+format(?SN_WILLTOPIC_EMPTY_MSG) ->
+    "SN_WILLTOPIC(_)";
+format(?SN_WILLMSGREQ_MSG()) ->
+    "SN_WILLMSGREQ()";
+format(?SN_WILLMSG_MSG(Msg)) ->
+    io_lib:format("SN_WILLMSG_MSG(Msg=~p)", [Msg]);
 format(?SN_PUBLISH_MSG(Flags, TopicId, MsgId, Data)) ->
-    io_lib:format("mqtt_sn_message SN_PUBLISH, ~s, TopicId=~w, MsgId=~w, Payload=~w",
-                  [format_flag(Flags), TopicId, MsgId, Data]);
-format(?SN_PUBACK_MSG(Flags, MsgId, ReturnCode)) ->
-    io_lib:format("mqtt_sn_message SN_PUBACK, ~s, MsgId=~w, ReturnCode=~w",
-                  [format_flag(Flags), MsgId, ReturnCode]);
+    #mqtt_sn_flags{
+       dup = Dup,
+       qos = QoS,
+       retain = Retain,
+       topic_id_type = TopicIdType} = Flags,
+    io_lib:format("SN_PUBLISH(D~w, Q~w, R~w, TopicIdType=~w, TopicId=~w, "
+                  "MsgId=~w, Payload=~p)",
+                  [bool(Dup), QoS, bool(Retain),
+                   TopicIdType, TopicId, MsgId, Data]);
+format(?SN_PUBACK_MSG(TopicId, MsgId, ReturnCode)) ->
+    io_lib:format("SN_PUBACK(TopicId=~w, MsgId=~w, ReturnCode=~w)",
+                  [TopicId, MsgId, ReturnCode]);
 format(?SN_PUBREC_MSG(?SN_PUBCOMP, MsgId)) ->
-    io_lib:format("mqtt_sn_message SN_PUBCOMP, MsgId=~w", [MsgId]);
+    io_lib:format("SN_PUBCOMP(MsgId=~w)", [MsgId]);
 format(?SN_PUBREC_MSG(?SN_PUBREC, MsgId)) ->
-    io_lib:format("mqtt_sn_message SN_PUBREC, MsgId=~w", [MsgId]);
+    io_lib:format("SN_PUBREC(MsgId=~w)", [MsgId]);
 format(?SN_PUBREC_MSG(?SN_PUBREL, MsgId)) ->
-    io_lib:format("mqtt_sn_message SN_PUBREL, MsgId=~w", [MsgId]);
+    io_lib:format("SN_PUBREL(MsgId=~w)", [MsgId]);
 format(?SN_SUBSCRIBE_MSG(Flags, Msgid, Topic)) ->
-    io_lib:format("mqtt_sn_message SN_SUBSCRIBE, ~s, MsgId=~w, TopicId=~w",
-                  [format_flag(Flags), Msgid, Topic]);
+    #mqtt_sn_flags{
+       dup = Dup,
+       qos = QoS,
+       topic_id_type = TopicIdType} = Flags,
+    io_lib:format("SN_SUBSCRIBE(D~w, Q~w, TopicIdType=~w, MsgId=~w, "
+                  "TopicId=~w)",
+                  [bool(Dup), QoS, TopicIdType, Msgid, Topic]);
 format(?SN_SUBACK_MSG(Flags, TopicId, MsgId, ReturnCode)) ->
-    io_lib:format("mqtt_sn_message SN_SUBACK, ~s, MsgId=~w, TopicId=~w, ReturnCode=~w",
-                  [format_flag(Flags), MsgId, TopicId, ReturnCode]);
+    #mqtt_sn_flags{qos = QoS} = Flags,
+    io_lib:format("SN_SUBACK(GrantedQoS=~w, MsgId=~w, TopicId=~w, "
+                  "ReturnCode=~w)",
+                  [QoS, MsgId, TopicId, ReturnCode]);
 format(?SN_UNSUBSCRIBE_MSG(Flags, Msgid, Topic)) ->
-    io_lib:format("mqtt_sn_message SN_UNSUBSCRIBE, ~s, MsgId=~w, TopicId=~w",
-                  [format_flag(Flags), Msgid, Topic]);
+    #mqtt_sn_flags{topic_id_type = TopicIdType} = Flags,
+    io_lib:format("SN_UNSUBSCRIBE(TopicIdType=~s, MsgId=~w, TopicId=~w)",
+                  [TopicIdType, Msgid, Topic]);
 format(?SN_UNSUBACK_MSG(MsgId)) ->
-    io_lib:format("mqtt_sn_message SN_UNSUBACK, MsgId=~w", [MsgId]);
+    io_lib:format("SN_UNSUBACK(MsgId=~w)", [MsgId]);
 format(?SN_REGISTER_MSG(TopicId, MsgId, TopicName)) ->
-    io_lib:format("mqtt_sn_message SN_REGISTER, TopicId=~w, MsgId=~w, TopicName=~w",
+    io_lib:format("SN_REGISTER(TopicId=~w, MsgId=~w, TopicName=~s)",
                  [TopicId, MsgId, TopicName]);
 format(?SN_REGACK_MSG(TopicId, MsgId, ReturnCode)) ->
-    io_lib:format("mqtt_sn_message SN_REGACK, TopicId=~w, MsgId=~w, ReturnCode=~w",
+    io_lib:format("SN_REGACK(TopicId=~w, MsgId=~w, ReturnCode=~w)",
                  [TopicId, MsgId, ReturnCode]);
+format(?SN_PINGREQ_MSG(ClientId)) ->
+    io_lib:format("SN_PINGREQ(ClientId=~s)", [ClientId]);
+format(?SN_PINGRESP_MSG()) ->
+    "SN_PINGREQ()";
+format(?SN_DISCONNECT_MSG(Duration)) ->
+    io_lib:format("SN_DISCONNECT(Duration=~s)", [Duration]);
+
 format(#mqtt_sn_message{type = Type, variable = Var}) ->
-    io_lib:format("mqtt_sn_message type=~s, Var=~w", [emqx_sn_frame:message_type(Type), Var]).
-
-format_flag(#mqtt_sn_flags{dup = Dup, qos = QoS, retain = Retain, will = Will, clean_start = CleanStart, topic_id_type = TopicType}) ->
-    io_lib:format("mqtt_sn_flags{dup=~p, qos=~p, retain=~p, will=~p, clean_session=~p, topic_id_type=~p}",
-                  [Dup, QoS, Retain, Will, CleanStart, TopicType]);
-format_flag(_Flag) -> "invalid flag".
-
+    io_lib:format("mqtt_sn_message(type=~s, Var=~w)",
+                  [emqx_sn_frame:message_type(Type), Var]).
--- a/apps/emqx_sn/src/emqx_sn_gateway.erl
+++ b/apps/emqx_sn/src/emqx_sn_gateway.erl
@ -94,6 +94,8 @@
                idle_timeout         :: integer(),
                enable_qos3 = false  :: boolean(),
                has_pending_pingresp = false :: boolean(),
+                %% Store all qos0 messages for waiting REGACK
+                %% Note: QoS1/QoS2 messages will kept inflight queue
                pending_topic_ids = #{} :: pending_msgs()
               }).

@ -490,7 +492,7 @@ handle_event({call, From}, Req, _StateName, State) ->
        {reply, Reply, NState} ->
            gen_server:reply(From, Reply),
            {keep_state, NState};
-        {stop, Reason, Reply, NState} ->
+        {shutdown, Reason, Reply, NState} ->
            State0 = case NState#state.sockstate of
                running ->
                    send_message(?SN_DISCONNECT_MSG(undefined), NState);
@ -518,10 +520,9 @@ handle_event(info, {datagram, SockPid, Data}, StateName,
    end;

 handle_event(info, {deliver, _Topic, Msg}, asleep,
-             State = #state{channel = Channel, pending_topic_ids = Pendings}) ->
+             State = #state{channel = Channel}) ->
    % section 6.14, Support of sleeping clients
-    ?LOG(debug, "enqueue downlink message in asleep state, msg: ~0p, pending_topic_ids: ~0p",
-         [Msg, Pendings]),
+    ?LOG(debug, "enqueue downlink message in asleep state, msg: ~0p", [Msg]),
    Session = emqx_session:enqueue(emqx_channel:info(clientinfo, Channel),
                Msg, emqx_channel:get_session(Channel)),
    {keep_state, State#state{channel = emqx_channel:set_session(Session, Channel)}};
@ -610,7 +611,7 @@ handle_call(_From, Req, State = #state{channel = Channel}) ->
        {reply, Reply, NChannel} ->
            {reply, Reply, State#state{channel = NChannel}};
        {shutdown, Reason, Reply, NChannel} ->
-            stop(Reason, Reply, State#state{channel = NChannel})
+            {shutdown, Reason, Reply, State#state{channel = NChannel}}
    end.

 handle_info({sock_closed, Reason} = Info, State = #state{channel = Channel}) ->
@ -723,11 +724,19 @@ mqtt2sn(?PUBCOMP_PACKET(MsgId), _State) ->
 mqtt2sn(?UNSUBACK_PACKET(MsgId), _State)->
    ?SN_UNSUBACK_MSG(MsgId);

-mqtt2sn(?PUBLISH_PACKET(QoS, Topic, PacketId, Payload), #state{channel  = Channel}) ->
-    NewPacketId = if QoS =:= ?QOS_0 -> 0;
+mqtt2sn(
+  #mqtt_packet{header = #mqtt_packet_header{
+                           type = ?PUBLISH,
+                           qos = QoS,
+                           %dup = Dup,
+                           retain = Retain},
+               variable = #mqtt_packet_publish{
+                             topic_name = Topic,
+                             packet_id = PacketId},
+               payload = Payload}, #state{clientid = ClientId}) ->
+    NPacketId = if QoS =:= ?QOS_0 -> 0;
                     true -> PacketId
                  end,
-    ClientId = emqx_channel:info(clientid, Channel),
    {TopicIdType, TopicContent} = case emqx_sn_registry:lookup_topic_id(ClientId, Topic) of
                                      {predef, PredefTopicId} ->
                                          {?SN_PREDEFINED_TOPIC, PredefTopicId};
@ -737,8 +746,12 @@ mqtt2sn(?PUBLISH_PACKET(QoS, Topic, PacketId, Payload), #state{channel  = Channe
                                          {?SN_SHORT_TOPIC, Topic}
                                  end,

-    Flags = #mqtt_sn_flags{qos = QoS, topic_id_type = TopicIdType},
-    ?SN_PUBLISH_MSG(Flags, TopicContent, NewPacketId, Payload);
+    Flags = #mqtt_sn_flags{
+               %dup = Dup,
+               qos = QoS,
+               retain = Retain,
+               topic_id_type = TopicIdType},
+    ?SN_PUBLISH_MSG(Flags, TopicContent, NPacketId, Payload);

 mqtt2sn(?SUBACK_PACKET(MsgId, ReturnCodes), _State)->
    % if success, suback is sent by handle_info({suback, MsgId, [GrantedQoS]}, ...)
@ -766,9 +779,10 @@ send_connack(State) ->

 send_message(Msg = #mqtt_sn_message{type = Type},
             State = #state{sockpid = SockPid, peername = Peername}) ->
-    ?LOG(debug, "SEND ~s~n", [emqx_sn_frame:format(Msg)]),
+    ?LOG(info, "SEND ~s~n", [emqx_sn_frame:format(Msg)]),
    inc_outgoing_stats(Type),
    Data = emqx_sn_frame:serialize(Msg),
+    ?LOG(debug, "SEND ~0p", [Data]),
    ok = emqx_metrics:inc('bytes.sent', iolist_size(Data)),
    SockPid ! {datagram, Peername, Data},
    State.
@ -793,13 +807,6 @@ stop(Reason, State) ->
    maybe_send_will_msg(Reason, State),
    {stop, {shutdown, Reason}, State}.

-stop({shutdown, Reason}, Reply, State) ->
-    stop(Reason, Reply, State);
-stop(Reason, Reply, State) ->
-    ?LOG(stop_log_level(Reason), "stop due to ~p", [Reason]),
-    maybe_send_will_msg(Reason, State),
-    {stop, {shutdown, Reason}, Reply, State}.
-
 maybe_send_will_msg(normal, _State) ->
    ok;
 maybe_send_will_msg(_Reason, State) ->
@ -825,6 +832,9 @@ do_connect(ClientId, CleanStart, WillFlag, Duration, State) ->
    %% At any point in time a client may have only one QoS level 1 or 2 PUBLISH message
    %% outstanding, i.e. it has to wait for the termination of this PUBLISH message exchange
    %% before it could start a new level 1 or 2 transaction.
+    %%
+    %% FIXME: But we should have a re-try timer to re-send the inflight
+    %% qos1/qos2 message
    OnlyOneInflight = #{'Receive-Maximum' => 1},
    ConnPkt = #mqtt_packet_connect{clientid    = ClientId,
                                   clean_start = CleanStart,
@ -973,11 +983,16 @@ do_puback(TopicId, MsgId, ReturnCode, StateName,
            case emqx_sn_registry:lookup_topic(ClientId, TopicId) of
                undefined -> {keep_state, State};
                TopicName ->
-                    %%notice that this TopicName maybe normal or predefined,
-                    %% involving the predefined topic name in register to enhance the gateway's robustness even inconsistent with MQTT-SN channels
-                    {keep_state, send_register(TopicName, TopicId, MsgId, State)}
+                    %% notice that this TopicName maybe normal or predefined,
+                    %% involving the predefined topic name in register to
+                    %% enhance the gateway's robustness even inconsistent
+                    %% with MQTT-SN channel
+                    {keep_state,
+                     send_register(TopicName, TopicId, MsgId, State)}
            end;
        _ ->
+            %% XXX: We need to handle others error code
+            %% 'Rejection: congestion'
            ?LOG(error, "CAN NOT handle PUBACK ReturnCode=~p", [ReturnCode]),
            {keep_state, State}
    end.
@ -1050,7 +1065,7 @@ handle_incoming(Packet, _StName, State) ->
 channel_handle_in(Packet = ?PACKET(Type), #state{channel = Channel}) ->
    _ = inc_incoming_stats(Type),
    ok = emqx_metrics:inc_recv(Packet),
-    ?LOG(debug, "RECV ~s", [emqx_packet:format(Packet)]),
+    ?LOG(debug, "Transed-RECV ~s", [emqx_packet:format(Packet)]),
    emqx_channel:handle_in(Packet, Channel).

 handle_outgoing(Packets, State) when is_list(Packets) ->
@ -1064,7 +1079,9 @@ handle_outgoing(PubPkt = ?PUBLISH_PACKET(_, TopicName, _, _),
    ClientId = emqx_channel:info(clientid, Channel),
    TopicId = emqx_sn_registry:lookup_topic_id(ClientId, TopicName),
    case (TopicId == undefined) andalso (byte_size(TopicName) =/= 2) of
-        true -> register_and_notify_client(PubPkt, State);
+        true ->
+            %% TODO: only one REGISTER inflight if qos=0??
+            register_and_notify_client(PubPkt, State);
        false -> send_message(mqtt2sn(PubPkt, State), State)
    end;

@ -1077,13 +1094,40 @@ cache_no_reg_publish_message(Pendings, TopicId, PubPkt, State) ->
    Msgs = maps:get(pending_topic_ids, Pendings, []),
    Pendings#{TopicId => Msgs ++ [mqtt2sn(PubPkt, State)]}.

-replay_no_reg_pending_publishes(TopicId, #state{pending_topic_ids = Pendings} = State0) ->
-    ?LOG(debug, "replay non-registered publish message for topic-id: ~p, pendings: ~0p",
-        [TopicId, Pendings]),
+replay_no_reg_pending_publishes(TopicId,
+                                State0 = #state{
+                                            pending_topic_ids = Pendings}) ->
+    ?LOG(debug, "replay non-registered qos0 publish message for "
+                "topic-id: ~p, pendings: ~0p", [TopicId, Pendings]),
    State = lists:foldl(fun(Msg, State1) ->
        send_message(Msg, State1)
    end, State0, maps:get(TopicId, Pendings, [])),
-    State#state{pending_topic_ids = maps:remove(TopicId, Pendings)}.
+
+    NState = State#state{pending_topic_ids = maps:remove(TopicId, Pendings)},
+    case replay_inflight_messages(TopicId, State#state.channel) of
+        [] -> ok;
+        Outgoings ->
+            ?LOG(debug, "replay non-registered qos1/qos2 publish message "
+                        "for topic-id: ~0p, messages: ~0p",
+                        [TopicId, Outgoings]),
+            handle_outgoing(Outgoings, NState)
+    end.
+
+replay_inflight_messages(TopicId, Channel) ->
+    Inflight = emqx_session:info(inflight, emqx_channel:get_session(Channel)),
+
+    case emqx_inflight:to_list(Inflight) of
+        [] -> [];
+        [{PktId, {Msg, _Ts}}] -> %% Fixed inflight size 1
+            ClientId = emqx_channel:info(clientid, Channel),
+            ReplayTopic = emqx_sn_registry:lookup_topic(ClientId, TopicId),
+            case ReplayTopic =:= emqx_message:topic(Msg) of
+                false -> [];
+                true ->
+                    NMsg = emqx_message:set_flag(dup, true, Msg),
+                    [emqx_message:to_packet(PktId, NMsg)]
+            end
+    end.

 register_and_notify_client(?PUBLISH_PACKET(QoS, TopicName, PacketId, Payload) = PubPkt,
        State = #state{pending_topic_ids = Pendings, channel = Channel}) ->
@ -1091,10 +1135,17 @@ register_and_notify_client(?PUBLISH_PACKET(QoS, TopicName, PacketId, Payload) =
    #mqtt_packet{header = #mqtt_packet_header{dup = Dup, retain = Retain}} = PubPkt,
    ClientId = emqx_channel:info(clientid, Channel),
    TopicId = emqx_sn_registry:register_topic(ClientId, TopicName),
-    ?LOG(debug, "Register TopicId=~p, TopicName=~p, Payload=~p, Dup=~p, QoS=~p, "
-                "Retain=~p, MsgId=~p", [TopicId, TopicName, Payload, Dup, QoS, Retain, MsgId]),
-    NewPendings = cache_no_reg_publish_message(Pendings, TopicId, PubPkt, State),
-    send_register(TopicName, TopicId, MsgId, State#state{pending_topic_ids = NewPendings}).
+    ?LOG(debug, "Register TopicId=~p, TopicName=~p, Payload=~p, Dup=~p, "
+                "QoS=~p,Retain=~p, MsgId=~p",
+                [TopicId, TopicName, Payload, Dup, QoS, Retain, MsgId]),
+    NPendings = case QoS == ?QOS_0 of
+                    true ->
+                        cache_no_reg_publish_message(
+                          Pendings, TopicId, PubPkt, State);
+                    _ -> Pendings
+                end,
+    send_register(TopicName, TopicId, MsgId,
+                  State#state{pending_topic_ids = NPendings}).

 message_id(undefined) ->
    rand:uniform(16#FFFF);
--- a/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl
+++ b/apps/emqx_sn/test/emqx_sn_protocol_SUITE.erl
@ -819,6 +819,151 @@ t_publish_qos2_case03(_) ->
    ?assertEqual(<<2, ?SN_DISCONNECT>>, receive_response(Socket)),
    gen_udp:close(Socket).

+t_delivery_qos1_register_invalid_topic_id(_) ->
+    Dup = 0,
+    QoS = 1,
+    Retain = 0,
+    Will = 0,
+    CleanSession = 0,
+    MsgId = 1,
+    TopicId = ?MAX_PRED_TOPIC_ID + 1,
+    {ok, Socket} = gen_udp:open(0, [binary]),
+    send_connect_msg(Socket, <<"test">>),
+    ?assertEqual(<<3, ?SN_CONNACK, 0>>, receive_response(Socket)),
+
+    send_subscribe_msg_normal_topic(Socket, QoS, <<"ab">>, MsgId),
+    ?assertEqual(<<8, ?SN_SUBACK, Dup:1, QoS:2, Retain:1, Will:1, CleanSession:1,
+                   ?SN_NORMAL_TOPIC:2, TopicId:16, MsgId:16, ?SN_RC_ACCEPTED>>,
+                 receive_response(Socket)),
+
+    Payload = <<"test-registration-inconsistent">>,
+    _ = emqx:publish(emqx_message:make(test, ?QOS_1, <<"ab">>, Payload)),
+
+    ?assertEqual(
+       <<(7 + byte_size(Payload)), ?SN_PUBLISH,
+         Dup:1, QoS:2, Retain:1,
+         Will:1, CleanSession:1, ?SN_NORMAL_TOPIC:2,
+         TopicId:16, MsgId:16, Payload/binary>>, receive_response(Socket)),
+    %% acked with ?SN_RC_INVALID_TOPIC_ID to
+    send_puback_msg(Socket, TopicId, MsgId, ?SN_RC_INVALID_TOPIC_ID),
+    ?assertEqual(
+       {TopicId, MsgId},
+       check_register_msg_on_udp(<<"ab">>, receive_response(Socket))),
+    send_regack_msg(Socket, TopicId, MsgId + 1),
+
+    %% receive the replay message
+    ?assertEqual(
+       <<(7 + byte_size(Payload)), ?SN_PUBLISH,
+         Dup:1, QoS:2, Retain:1,
+         Will:1, CleanSession:1, ?SN_NORMAL_TOPIC:2,
+         TopicId:16, (MsgId):16, Payload/binary>>, receive_response(Socket)),
+
+    send_disconnect_msg(Socket, undefined),
+    ?assertEqual(<<2, ?SN_DISCONNECT>>, receive_response(Socket)),
+    gen_udp:close(Socket).
+
+t_delivery_takeover_and_re_register(_) ->
+    MsgId = 1,
+    {ok, Socket} = gen_udp:open(0, [binary]),
+    send_connect_msg(Socket, <<"test">>, 0),
+    ?assertMatch(<<_, ?SN_CONNACK, ?SN_RC_ACCEPTED>>,
+                 receive_response(Socket)),
+
+    send_subscribe_msg_normal_topic(Socket, ?QOS_1, <<"topic-a">>, MsgId+1),
+    <<_, ?SN_SUBACK, 2#00100000,
+      TopicIdA:16, _:16, ?SN_RC_ACCEPTED>> = receive_response(Socket),
+
+    send_subscribe_msg_normal_topic(Socket, ?QOS_2, <<"topic-b">>, MsgId+2),
+    <<_, ?SN_SUBACK, 2#01000000,
+      TopicIdB:16, _:16, ?SN_RC_ACCEPTED>> = receive_response(Socket),
+
+    _ = emqx:publish(
+          emqx_message:make(test, ?QOS_1, <<"topic-a">>, <<"test-a">>)),
+    _ = emqx:publish(
+          emqx_message:make(test, ?QOS_2, <<"topic-b">>, <<"test-b">>)),
+
+    <<_, ?SN_PUBLISH, 2#00100000,
+      TopicIdA:16, MsgId1:16, "test-a">> = receive_response(Socket),
+    send_puback_msg(Socket, TopicIdA, MsgId1, ?SN_RC_ACCEPTED),
+
+    <<_, ?SN_PUBLISH, 2#01000000,
+      TopicIdB:16, MsgId2:16, "test-b">> = receive_response(Socket),
+    send_puback_msg(Socket, TopicIdB, MsgId2, ?SN_RC_ACCEPTED),
+
+    send_disconnect_msg(Socket, undefined),
+    ?assertMatch(<<2, ?SN_DISCONNECT>>, receive_response(Socket)),
+    gen_udp:close(Socket),
+
+    %% offline messages will be queued into the MQTT-SN session
+    _ = emqx:publish(emqx_message:make(test, ?QOS_1, <<"topic-a">>, <<"m1">>)),
+    _ = emqx:publish(emqx_message:make(test, ?QOS_1, <<"topic-a">>, <<"m2">>)),
+    _ = emqx:publish(emqx_message:make(test, ?QOS_1, <<"topic-a">>, <<"m3">>)),
+    _ = emqx:publish(emqx_message:make(test, ?QOS_2, <<"topic-b">>, <<"m1">>)),
+    _ = emqx:publish(emqx_message:make(test, ?QOS_2, <<"topic-b">>, <<"m2">>)),
+    _ = emqx:publish(emqx_message:make(test, ?QOS_2, <<"topic-b">>, <<"m3">>)),
+
+    {ok, NSocket} = gen_udp:open(0, [binary]),
+    send_connect_msg(NSocket, <<"test">>, 0),
+    ?assertMatch(<<_, ?SN_CONNACK, ?SN_RC_ACCEPTED>>,
+                 receive_response(NSocket)),
+
+    %% qos1
+
+    %% received the resume messages
+    <<_, ?SN_PUBLISH, 2#00100000,
+      TopicIdA:16, MsgIdA0:16, "m1">> = receive_response(NSocket),
+    %% only one qos1/qos2 inflight
+    ?assertEqual(udp_receive_timeout, receive_response(NSocket)),
+    send_puback_msg(NSocket, TopicIdA, MsgIdA0, ?SN_RC_INVALID_TOPIC_ID),
+    %% recv register
+    <<_, ?SN_REGISTER,
+      TopicIdA:16, RegMsgIdA:16, "topic-a">> = receive_response(NSocket),
+    send_regack_msg(NSocket, TopicIdA, RegMsgIdA),
+    %% received the replay messages
+    <<_, ?SN_PUBLISH, 2#00100000,
+      TopicIdA:16, MsgIdA1:16, "m1">> = receive_response(NSocket),
+    send_puback_msg(NSocket, TopicIdA, MsgIdA1, ?SN_RC_ACCEPTED),
+
+    <<_, ?SN_PUBLISH, 2#00100000,
+      TopicIdA:16, MsgIdA2:16, "m2">> = receive_response(NSocket),
+    send_puback_msg(NSocket, TopicIdA, MsgIdA2, ?SN_RC_ACCEPTED),
+
+    <<_, ?SN_PUBLISH, 2#00100000,
+      TopicIdA:16, MsgIdA3:16, "m3">> = receive_response(NSocket),
+    send_puback_msg(NSocket, TopicIdA, MsgIdA3, ?SN_RC_ACCEPTED),
+
+    %% qos2
+    <<_, ?SN_PUBLISH, 2#01000000,
+      TopicIdB:16, MsgIdB0:16, "m1">> = receive_response(NSocket),
+    %% only one qos1/qos2 inflight
+    ?assertEqual(udp_receive_timeout, receive_response(NSocket)),
+    send_puback_msg(NSocket, TopicIdB, MsgIdB0, ?SN_RC_INVALID_TOPIC_ID),
+    %% recv register
+    <<_, ?SN_REGISTER,
+      TopicIdB:16, RegMsgIdB:16, "topic-b">> = receive_response(NSocket),
+    send_regack_msg(NSocket, TopicIdB, RegMsgIdB),
+    %% received the replay messages
+    <<_, ?SN_PUBLISH, 2#01000000,
+      TopicIdB:16, MsgIdB1:16, "m1">> = receive_response(NSocket),
+    send_pubrec_msg(NSocket, MsgIdB1),
+    <<_, ?SN_PUBREL, MsgIdB1:16>> = receive_response(NSocket),
+    send_pubcomp_msg(NSocket, MsgIdB1),
+
+    <<_, ?SN_PUBLISH, 2#01000000,
+      TopicIdB:16, MsgIdB2:16, "m2">> = receive_response(NSocket),
+    send_puback_msg(NSocket, TopicIdB, MsgIdB2, ?SN_RC_ACCEPTED),
+
+    <<_, ?SN_PUBLISH, 2#01000000,
+      TopicIdB:16, MsgIdB3:16, "m3">> = receive_response(NSocket),
+    send_puback_msg(NSocket, TopicIdB, MsgIdB3, ?SN_RC_ACCEPTED),
+
+    %% no more messages
+    ?assertEqual(udp_receive_timeout, receive_response(NSocket)),
+
+    send_disconnect_msg(NSocket, undefined),
+    ?assertMatch(<<2, ?SN_DISCONNECT>>, receive_response(NSocket)),
+    gen_udp:close(NSocket).
+
 t_will_case01(_) ->
    QoS = 1,
    Duration = 1,
@ -1591,13 +1736,16 @@ send_searchgw_msg(Socket) ->
    ok = gen_udp:send(Socket, ?HOST, ?PORT, <<Length:8, MsgType:8, Radius:8>>).

 send_connect_msg(Socket, ClientId) ->
+    send_connect_msg(Socket, ClientId, 1).
+
+send_connect_msg(Socket, ClientId, CleanSession) when CleanSession == 0;
+                                                      CleanSession == 1 ->
    Length = 6 + byte_size(ClientId),
    MsgType = ?SN_CONNECT,
    Dup = 0,
    QoS = 0,
    Retain = 0,
    Will = 0,
-    CleanSession = 1,
    TopicIdType = 0,
    ProtocolId = 1,
    Duration = 10,
@ -1713,9 +1861,12 @@ send_publish_msg_short_topic(Socket, QoS, MsgId, TopicName, Data) ->
    ok = gen_udp:send(Socket, ?HOST, ?PORT, PublishPacket).

 send_puback_msg(Socket, TopicId, MsgId) ->
+    send_puback_msg(Socket, TopicId, MsgId, ?SN_RC_ACCEPTED).
+
+send_puback_msg(Socket, TopicId, MsgId, Rc) ->
    Length = 7,
    MsgType = ?SN_PUBACK,
-    PubAckPacket = <<Length:8, MsgType:8, TopicId:16, MsgId:16, ?SN_RC_ACCEPTED:8>>,
+    PubAckPacket = <<Length:8, MsgType:8, TopicId:16, MsgId:16, Rc:8>>,
    ?LOG("send_puback_msg TopicId=~p, MsgId=~p", [TopicId, MsgId]),
    ok = gen_udp:send(Socket, ?HOST, ?PORT, PubAckPacket).

--- a/apps/emqx_stomp/README.md
+++ b/apps/emqx_stomp/README.md
@ -2,7 +2,7 @@
 emqx-stomp
 ==========

-The plugin adds STOMP 1.0/1.1/1.2 protocol supports to the EMQ X broker.
+The plugin adds STOMP 1.0/1.1/1.2 protocol supports to the EMQX broker.

 The STOMP clients could PubSub to the MQTT clients.

@ -73,5 +73,5 @@ Apache License Version 2.0
 Author
 ------

-EMQ X Team.
+EMQX Team.

--- a/apps/emqx_stomp/src/emqx_stomp.app.src
+++ b/apps/emqx_stomp/src/emqx_stomp.app.src
@ -1,6 +1,6 @@
 {application, emqx_stomp,
 [{description, "EMQ X Stomp Protocol Plugin"},
-  {vsn, "4.3.4"}, % strict semver, bump manually!
+  {vsn, "4.3.5"}, % strict semver, bump manually!
  {modules, []},
  {registered, [emqx_stomp_sup]},
  {applications, [kernel,stdlib]},
--- a/apps/emqx_stomp/src/emqx_stomp.appup.src
+++ b/apps/emqx_stomp/src/emqx_stomp.appup.src
@ -1,8 +1,15 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{"4.3.3",[{load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
-   {"4.3.2",
+  [{"4.3.4",
    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
+   {"4.3.3",
+    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+   {"4.3.2",
+    [{load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
   {"4.3.1",
    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
@ -12,14 +19,20 @@
    [{restart_application,emqx_stomp},
     {apply,{emqx_stomp,force_clear_after_app_stoped,[]}}]},
   {<<".*">>,[]}],
-  [{"4.3.3",[{load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
-   {"4.3.2",
+  [{"4.3.4",
    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
+   {"4.3.3",
+    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+   {"4.3.2",
+    [{load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
   {"4.3.1",
    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]},
     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
-   {"4.3.0",
-    [{restart_application,emqx_stomp}]},
+   {"4.3.0",[{restart_application,emqx_stomp}]},
   {<<".*">>,[]}]}.
--- a/apps/emqx_stomp/src/emqx_stomp_connection.erl
+++ b/apps/emqx_stomp/src/emqx_stomp_connection.erl
@ -91,8 +91,6 @@

 -define(ENABLED(X), (X =/= undefined)).

-elvis([{elvis_style, invalid_dynamic_call, #{ignore => [emqx_stomp_connection]}}]).
-
 -dialyzer({nowarn_function, [ ensure_stats_timer/2
                            ]}).

--- a/apps/emqx_stomp/src/emqx_stomp_protocol.erl
+++ b/apps/emqx_stomp/src/emqx_stomp_protocol.erl
@ -108,8 +108,6 @@
                            , init/2
                            ]}).

-elvis([{elvis_style, dont_repeat_yourself, disable}]).
-
 -type(pstate() :: #pstate{}).

 %% @doc Init protocol
@ -154,7 +152,7 @@ default_conninfo(ConnInfo) ->
      clean_start => true,
      clientid => undefined,
      username => undefined,
-      conn_props => [],
+      conn_props => #{},
      connected => false,
      connected_at => undefined,
      keepalive => undefined,
@ -816,4 +814,3 @@ interval(outgoing_timer, #pstate{heart_beats = HrtBt}) ->
    emqx_stomp_heartbeat:interval(outgoing, HrtBt);
 interval(clean_trans_timer, _) ->
    ?TRANS_TIMEOUT.
-
--- a/apps/emqx_web_hook/README.md
+++ b/apps/emqx_web_hook/README.md
@ -1,9 +1,9 @@

 # emqx-web-hook

-EMQ X WebHook plugin.
+EMQX WebHook plugin.

-Please see: [EMQ X - WebHook](https://docs.emqx.io/broker/latest/en/advanced/webhook.html)
+Please see: [EMQX - WebHook](https://docs.emqx.io/broker/latest/en/advanced/webhook.html)

 ## emqx_web_hook.conf

--- a/apps/emqx_web_hook/etc/emqx_web_hook.conf
+++ b/apps/emqx_web_hook/etc/emqx_web_hook.conf
@ -45,7 +45,7 @@ web.hook.body.encoding_of_payload_field = plain

 ## If not specified, the server's names returned in server's certificate is validated against
 ## what's provided `web.hook.url` config's host part.
-## Setting to 'disable' will make EMQ X ignore unmatched server names.
+## Setting to 'disable' will make EMQX ignore unmatched server names.
 ## If set with a host name, the server's names returned in server's certificate is validated
 ## against this value.
 ##
--- a/apps/emqx_web_hook/priv/emqx_web_hook.schema
+++ b/apps/emqx_web_hook/priv/emqx_web_hook.schema
@ -1,5 +1,5 @@
 %%-*- mode: erlang -*-
-%% EMQ X R3.0 config mapping
+%% EMQX config mapping

 {mapping, "web.hook.url", "emqx_web_hook.url", [
  {datatype, string}
--- a/apps/emqx_web_hook/src/emqx_web_hook.app.src
+++ b/apps/emqx_web_hook/src/emqx_web_hook.app.src
@ -1,6 +1,6 @@
 {application, emqx_web_hook,
 [{description, "EMQ X WebHook Plugin"},
-  {vsn, "4.3.9"}, % strict semver, bump manually!
+  {vsn, "4.3.10"}, % strict semver, bump manually!
  {modules, []},
  {registered, [emqx_web_hook_sup]},
  {applications, [kernel,stdlib,ehttpc]},
--- a/apps/emqx_web_hook/src/emqx_web_hook.appup.src
+++ b/apps/emqx_web_hook/src/emqx_web_hook.appup.src
@ -1,24 +1,34 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{<<"4\\.3\\.[0-2]">>,
+  [{<<"4\\.3\\.[0-2]$">>,
    [{apply,{application,stop,[emqx_web_hook]}},
     {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
-   {<<"4\\.3\\.[3-8]">>,
+   {<<"4\\.3\\.[3-7]$">>,
    [{apply,{application,stop,[emqx_web_hook]}},
     {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
+   {"4.3.8",
+    [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]},
+   {"4.3.9",
+    [ %% nothing so far
+    ]},
   {<<".*">>,[]}],
-  [{<<"4\\.3\\.[0-2]">>,
+  [{<<"4\\.3\\.[0-2]$">>,
    [{apply,{application,stop,[emqx_web_hook]}},
     {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
-   {<<"4\\.3\\.[3-8]">>,
+   {<<"4\\.3\\.[3-7]$">>,
    [{apply,{application,stop,[emqx_web_hook]}},
     {load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook,brutal_purge,soft_purge,[]},
     {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
+   {"4.3.8",
+    [{load_module,emqx_web_hook,brutal_purge,soft_purge,[]}]},
+   {"4.3.9",
+    [ %% nothing so far
+    ]},
   {<<".*">>,[]}]}.
--- a/bin/emqx
+++ b/bin/emqx
@ -44,7 +44,7 @@ if ! check_eralng_start >/dev/null 2>&1; then
        echoerr "FATAL: Unable to start Erlang."
        echoerr "Please make sure openssl-1.1.1 (libcrypto) and libncurses are installed."
        echoerr "Also ensure it's running on the correct platform,"
-        echoerr "this EMQ X release is built for $BUILT_ON"
+        echoerr "this EMQX release is built for $BUILT_ON"
        exit 1
    fi
    echoerr "WARNING: There seem to be missing dynamic libs from the OS. Using libs from ${DYNLIBS_DIR}"
--- a/bin/install_upgrade.escript
+++ b/bin/install_upgrade.escript
@ -6,6 +6,8 @@
 -define(TIMEOUT, 300000).
 -define(INFO(Fmt,Args), io:format(Fmt++"~n",Args)).

+-mode(compile).
+
 main([Command0, DistInfoStr | CommandArgs]) ->
    %% convert the distribution info arguments string to an erlang term
    {ok, Tokens, _} = erl_scan:string(DistInfoStr ++ "."),
@ -210,15 +212,24 @@ find_and_link_release_package(Version, RelName) ->
            ok = filelib:ensure_dir(filename:join([filename:dirname(ReleaseLink), "dummy"])),
            %% create the symlink pointing to the full path name of the
            %% release package we found
-            case file:make_symlink(filename:absname(Filename), ReleaseLink) of
-                ok ->
-                    ok;
-                {error, eperm} -> % windows!
-                    {ok,_} = file:copy(filename:absname(Filename), ReleaseLink)
-            end,
+            make_symlink_or_copy(filename:absname(Filename), ReleaseLink),
            {Filename, ReleaseHandlerPackageLink}
    end.

+make_symlink_or_copy(Filename, ReleaseLink) ->
+    case file:make_symlink(Filename, ReleaseLink) of
+        ok -> ok;
+        {error, eexist} ->
+            ?INFO("symlink ~p already exists, recreate it", [ReleaseLink]),
+            ok = file:delete(ReleaseLink),
+            make_symlink_or_copy(Filename, ReleaseLink);
+        {error, Reason} when Reason =:= eperm; Reason =:= enotsup ->
+            {ok, _} = file:copy(Filename, ReleaseLink);
+        {error, Reason} ->
+            ?INFO("create symlink ~p failed", [ReleaseLink]),
+            error({Reason, ReleaseLink})
+    end.
+
 unpack_zipballs(RelNameStr, Version) ->
    {ok, Cwd} = file:get_cwd(),
    GzFile = filename:absname(filename:join(["releases", RelNameStr ++ "-" ++ Version ++ ".tar.gz"])),
@ -365,7 +376,7 @@ start_distribution(TargetNode, NameTypeArg, Cookie) ->

 make_script_node(Node) ->
    [Name, Host] = string:tokens(atom_to_list(Node), "@"),
-    list_to_atom(lists:concat([Name, "_upgrader_", os:getpid(), "@", Host])).
+    list_to_atom(lists:concat(["remsh_", Name, "_upgrader_", os:getpid(), "@", Host])).

 %% get name type from arg
 get_name_type(NameTypeArg) ->
--- a/bin/node_dump
+++ b/bin/node_dump
@ -24,7 +24,7 @@ collect() {
 }

 show_help() {
-    echo "Collect information about the EMQ X node
+    echo "Collect information about the EMQX node

 USAGE:

--- a/18
+++ b/18
@ -4,6 +4,9 @@
 # arg1: profile, e.g. emqx | emqx-edge | emqx-pkg | emqx-edge-pkg
 # arg2: artifact, e.g. rel | relup | zip | pkg

+if [[ -n "$DEBUG" ]]; then
+    set -x
+fi
 set -euo pipefail

 PROFILE="$1"
@ -45,6 +48,13 @@ if [ "$(uname -s)" = 'Linux' ]; then
    esac
 fi

+if [ "${SYSTEM}" = 'windows' ]; then
+    # windows does not like the find
+    FIND="/usr/bin/find"
+else
+    FIND='find'
+fi
+
 log() {
    local msg="$1"
    # rebar3 prints ===>, so we print ===<
@ -71,12 +81,12 @@ make_relup() {
                tmp_dir="$(mktemp -d -t emqx.XXXXXXX)"
                unzip -q "$zip" "emqx/releases/*" -d "$tmp_dir"
                unzip -q "$zip" "emqx/lib/*" -d "$tmp_dir"
-                cp -r -n "$tmp_dir/emqx/releases"/* "$releases_dir"
-                cp -r -n "$tmp_dir/emqx/lib"/* "$lib_dir"
+                cp -r -n "$tmp_dir/emqx/releases"/* "$releases_dir" || true
+                cp -r -n "$tmp_dir/emqx/lib"/* "$lib_dir" || true
                rm -rf "$tmp_dir"
            fi
            releases+=( "$base_vsn" )
-        done < <(find _upgrade_base -maxdepth 1 -name "*$PROFILE-$SYSTEM*-$ARCH.zip" -type f)
+        done < <("$FIND" _upgrade_base -maxdepth 1 -name "*$PROFILE-$SYSTEM*-$ARCH.zip" -type f)
    fi
    if [ ${#releases[@]} -eq 0 ]; then
        log "No upgrade base found, relup ignored"
@ -96,7 +106,7 @@ cp_dyn_libs() {
    mkdir -p "$target_dir"
    while read -r so_file; do
        cp -L "$so_file" "$target_dir/"
-    done < <(find "$rel_dir" -type f \( -name "*.so*" -o -name "beam.smp" \) -print0 \
+    done < <("$FIND" "$rel_dir" -type f \( -name "*.so*" -o -name "beam.smp" \) -print0 \
        | xargs -0 ldd \
        | grep -E '(libcrypto)|(libtinfo)' \
        | awk '{print $3}' \
--- a/deploy/charts/emqx/Chart.yaml
+++ b/deploy/charts/emqx/Chart.yaml
@ -1,6 +1,6 @@
 apiVersion: v2
 name: emqx
-description: A Helm chart for EMQ X
+description: A Helm chart for EMQX
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
--- a/deploy/charts/emqx/README.md
+++ b/deploy/charts/emqx/README.md
@ -1,5 +1,5 @@
 # Introduction
-This chart bootstraps an [EMQ X](https://www.emqx.io/) deployment on a [Kubernetes](https://kubernetes.io/) (K8s) cluster using the [Helm](https://helm.sh/) package manager.
+This chart bootstraps an [EMQX](https://www.emqx.io/) deployment on a [Kubernetes](https://kubernetes.io/) (K8s) cluster using the [Helm](https://helm.sh/) package manager.

 # Prerequisites
 + [Kubernetes](https://kubernetes.io/) 1.6+
@ -31,21 +31,21 @@ $ helm del my-emqx
 # Configuration
 The following sections describe the configurable parameters of the chart and their default values.
 ## [K8s]((https://kubernetes.io/)) specific settings
-The following table lists the configurable K8s parameters of the [EMQ X](https://www.emqx.io/) chart and their default values.
+The following table lists the configurable K8s parameters of the [EMQX](https://www.emqx.io/) chart and their default values.
 Parameter  | Description | Default Value
 ---        |  ---        | ---
 `replicaCount` | It is recommended to have odd number of nodes in a cluster, otherwise the emqx cluster cannot be automatically healed in case of net-split. | `3`
-`image.tag` | EMQ X Image tag (defaults to `.Chart.AppVersion`) | `nil`
-`image.repository` | EMQ X Image repository | `emqx/emqx`
+`image.tag` | EMQX Image tag (defaults to `.Chart.AppVersion`) | `nil`
+`image.repository` | EMQX Image repository | `emqx/emqx`
 `image.pullPolicy`  | The image pull policy  | `IfNotPresent`
 `image.pullSecrets `  | The image pull secrets (does not add image pull secrets to deployed pods)  |``[]``
 `recreatePods` | Forces the recreation of pods during upgrades, which can be useful to always apply the most recent configuration. | `false`
-`persistence.enabled` | Enable EMQ X persistence using PVC | `false`
+`persistence.enabled` | Enable EMQX persistence using PVC | `false`
 `persistence.storageClass` | Storage class of backing PVC (uses alpha storage class annotation) | `nil`
-`persistence.existingClaim` | EMQ X data Persistent Volume existing claim name, evaluated as a template | `""`
-`persistence.accessMode` | PVC Access Mode for EMQ X volume | `ReadWriteOnce`
-`persistence.size` | PVC Storage Request for EMQ X volume | `20Mi`
-`initContainers` | Containers that run before the creation of EMQ X containers. They can contain utilities or setup scripts. |`{}`
+`persistence.existingClaim` | EMQX data Persistent Volume existing claim name, evaluated as a template | `""`
+`persistence.accessMode` | PVC Access Mode for EMQX volume | `ReadWriteOnce`
+`persistence.size` | PVC Storage Request for EMQX volume | `20Mi`
+`initContainers` | Containers that run before the creation of EMQX containers. They can contain utilities or setup scripts. |`{}`
 `resources` | CPU/Memory resource requests/limits |`{}`
 `nodeSelector` | Node labels for pod assignment |`{}`
 `tolerations` | Toleration labels for pod assignment |``[]``
@ -67,32 +67,32 @@ Parameter  | Description | Default Value
 `service.loadBalancerSourceRanges` |	Address(es) that are allowed when service is LoadBalancer |	`[]`
 `service.externalIPs` |	ExternalIPs for the service |	`[]`
 `service.annotations` |	Service annotations (evaluated as a template) |	`{}`
-`ingress.dashboard.enabled` |	Enable ingress for EMQ X Dashboard |	false
-`ingress.dashboard.ingressClassName` |	Set the ingress class for EMQ X Dashboard
-`ingress.dashboard.path` | Ingress path for EMQ X Dashboard |	`/`
-`ingress.dashboard.hosts` | Ingress hosts for EMQ X Mgmt API |	dashboard.emqx.local
-`ingress.dashboard.tls` | Ingress tls for EMQ X Mgmt API |	`[]`
-`ingress.dashboard.annotations` | Ingress annotations for EMQ X Mgmt API |	`{}`
-`ingress.mgmt.enabled` |	Enable ingress for EMQ X Mgmt API |	`false`
-`ingress.mqtt.ingressClassName` |	Set the ingress class for EMQ X Mgmt API | `nil`
-`ingress.mgmt.path` | Ingress path for EMQ X Mgmt API | `/`
-`ingress.mgmt.hosts` | Ingress hosts for EMQ X Mgmt API |	`api.emqx.local`
-`ingress.mgmt.tls` | Ingress tls for EMQ X Mgmt API |	`[]`
-`ingress.mgmt.annotations` | Ingress annotations for EMQ X Mgmt API |	`{}`
-`ingress.wss.enabled` |	Enable ingress for EMQ X Mgmt API |	`false`
-`ingress.wss.ingressClassName` |	Set the ingress class for EMQ X Mgmt API | `nil`
-`ingress.wss.path` | Ingress path for EMQ X WSS |	`/`
-`ingress.wss.hosts` | Ingress hosts for EMQ X WSS |    `wss.emqx.local`
-`ingress.wss.tls` | Ingress tls for EMQ X WSS |	`[]`
-`ingress.wss.annotations` | Ingress annotations for EMQ X WSS |	`{}`
+`ingress.dashboard.enabled` |	Enable ingress for EMQX Dashboard |	false
+`ingress.dashboard.ingressClassName` |	Set the ingress class for EMQX Dashboard
+`ingress.dashboard.path` | Ingress path for EMQX Dashboard |	`/`
+`ingress.dashboard.hosts` | Ingress hosts for EMQX Mgmt API |	dashboard.emqx.local
+`ingress.dashboard.tls` | Ingress tls for EMQX Mgmt API |	`[]`
+`ingress.dashboard.annotations` | Ingress annotations for EMQX Mgmt API |	`{}`
+`ingress.mgmt.enabled` |	Enable ingress for EMQX Mgmt API |	`false`
+`ingress.mqtt.ingressClassName` |	Set the ingress class for EMQX Mgmt API | `nil`
+`ingress.mgmt.path` | Ingress path for EMQX Mgmt API | `/`
+`ingress.mgmt.hosts` | Ingress hosts for EMQX Mgmt API |	`api.emqx.local`
+`ingress.mgmt.tls` | Ingress tls for EMQX Mgmt API |	`[]`
+`ingress.mgmt.annotations` | Ingress annotations for EMQX Mgmt API |	`{}`
+`ingress.wss.enabled` |	Enable ingress for EMQX Mgmt API |	`false`
+`ingress.wss.ingressClassName` |	Set the ingress class for EMQX Mgmt API | `nil`
+`ingress.wss.path` | Ingress path for EMQX WSS |	`/`
+`ingress.wss.hosts` | Ingress hosts for EMQX WSS |    `wss.emqx.local`
+`ingress.wss.tls` | Ingress tls for EMQX WSS |	`[]`
+`ingress.wss.annotations` | Ingress annotations for EMQX WSS |	`{}`
 `extraEnv` | Aditional container env vars | `[]`
 `extraEnvFrom` | Aditional container env from vars (eg. [config map](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/), [secrets](https://kubernetes.io/docs/concepts/configuration/secret/) | `[]`
 `extraArgs` | Additional container executable arguments | `[]`
 `extraVolumes` | Additional container volumes (eg. for mounting certs from secrets) | `[]`
 `extraVolumeMounts` | Additional container volume mounts (eg. for mounting certs from secrets) | `[]`

-## EMQ X specific settings
-The following table lists the configurable [EMQ X](https://www.emqx.io/)-specific parameters of the chart and their default values.
+## EMQX specific settings
+The following table lists the configurable [EMQX](https://www.emqx.io/)-specific parameters of the chart and their default values.
 Parameter  | Description | Default Value
 ---        |  ---        | ---
 `emqxConfig` | Map of [configuration](https://www.emqx.io/docs/en/latest/configuration/configuration.html) items expressed as [environment variables](https://www.emqx.io/docs/en/v4.3/configuration/environment-variable.html) (prefix can be omitted) or using the configuration files [namespaced dotted notation](https://www.emqx.io/docs/en/latest/configuration/configuration.html) | `nil`
@ -104,7 +104,7 @@ Parameter  | Description | Default Value
 # Examples
 This section provides some examples for the configuration of common scenarios.
 ## Enable Websockets SSL via [nginx-ingress community controller](https://kubernetes.github.io/ingress-nginx/)
-The following settings describe a working scenario for acessing [EMQ X](https://www.emqx.io/) Websockets with SSL termination at the [nginx-ingress community controller](https://kubernetes.github.io/ingress-nginx/).
+The following settings describe a working scenario for acessing [EMQX](https://www.emqx.io/) Websockets with SSL termination at the [nginx-ingress community controller](https://kubernetes.github.io/ingress-nginx/).
 ```yaml
 ingress:
  wss:
--- a/deploy/charts/emqx/values.yaml
+++ b/deploy/charts/emqx/values.yaml
@ -62,13 +62,13 @@ resources: {}
  #   cpu: 500m
  #   memory: 512Mi

-# Containers that run before the creation of EMQ X containers. They can contain utilities or setup scripts.
+# Containers that run before the creation of EMQX containers. They can contain utilities or setup scripts.
 initContainers: {}
  # - name: mysql-probe
  #   image: alpine
  #   command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 mysql 3306 && exit 0 || sleep 3; done; exit 1"]

-## EMQ X configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx)
+## EMQX configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx)
 emqxConfig:
  EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc:443"
  ## The address type is used to extract host from k8s service.
@ -119,7 +119,7 @@ emqxLoadedModules: >
  {emqx_mod_subscription, false}.
  {emqx_mod_topic_metrics, false}.

-## EMQ X Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
+## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
 ## Example:
 ##   kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic
 emqxLicenseSecretName:
@ -188,7 +188,7 @@ ingress:
  ## Ingress shared annotations
  annotations: {}

-  ## ingress for EMQ X Dashboard
+  ## ingress for EMQX Dashboard
  dashboard:
    enabled: false
    annotations: {}
@ -199,7 +199,7 @@ ingress:
    - dashboard.emqx.local
    tls: []

-  ## ingress for EMQ X Mgmt API
+  ## ingress for EMQX Mgmt API
  mgmt:
    enabled: false
    annotations: {}
@ -210,7 +210,7 @@ ingress:
    - api.emqx.local
    tls: []

-  ## ingress for EMQ X Mgmt API
+  ## ingress for EMQX Mgmt API
  wss:
    enabled: false
    # ingressClassName: nginx
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@ -23,6 +23,8 @@ COPY . /emqx
 ARG PKG_VSN
 ARG EMQX_NAME=emqx

+ENV EMQX_RELUP=false
+
 RUN cd /emqx \
    && rm -rf _build/$EMQX_NAME/lib \
    && make $EMQX_NAME
@ -38,7 +40,7 @@ LABEL org.label-schema.docker.dockerfile="Dockerfile" \
    org.label-schema.url="https://emqx.io" \
    org.label-schema.vcs-type="Git" \
    org.label-schema.vcs-url="https://github.com/emqx/emqx" \
-    maintainer="EMQ X Team <support@emqx.io>"
+    maintainer="EMQX Team <support@emqx.io>"

 ARG EMQX_NAME=emqx

@ -58,7 +60,8 @@ RUN chgrp -Rf emqx /opt/emqx && chmod -Rf g+w /opt/emqx \

 USER emqx

-VOLUME ["/opt/emqx/log", "/opt/emqx/data", "/opt/emqx/etc"]
+## NOTE: /opt/emqx/etc is removed from the VOLUME list since 4.3.13
+VOLUME ["/opt/emqx/log", "/opt/emqx/data"]

 # emqx will occupy these port:
 # - 1883 port for MQTT
--- a/deploy/docker/README.md
+++ b/deploy/docker/README.md
@ -17,11 +17,11 @@

  [the latest release](https://github.com/docker/docker-ce/releases/latest)

-# What is EMQ X
+# What is EMQX

-[EMQ X  MQTT broker](https://emqx.io/products/broker) is a fully open source, highly scalable, highly available distributed MQTT messaging broker for IoT, M2M and Mobile applications that can handle tens of millions of concurrent clients.
+[EMQX  MQTT broker](https://emqx.io/products/broker) is a fully open source, highly scalable, highly available distributed MQTT messaging broker for IoT, M2M and Mobile applications that can handle tens of millions of concurrent clients.

-Starting from 3.0 release, *EMQ X* broker fully supports MQTT V5.0 protocol specifications and backward compatible with MQTT V3.1 and V3.1.1,  as well as other communication protocols such as MQTT-SN, CoAP, LwM2M, WebSocket and STOMP. The 3.0 release of the *EMQ X* broker can scaled to 10+ million concurrent MQTT connections on one cluster.
+Starting from 3.0 release, *EMQX* broker fully supports MQTT V5.0 protocol specifications and backward compatible with MQTT V3.1 and V3.1.1,  as well as other communication protocols such as MQTT-SN, CoAP, LwM2M, WebSocket and STOMP. The 3.0 release of the *EMQX* broker can scaled to 10+ million concurrent MQTT connections on one cluster.

 # How to use this image

@ -39,7 +39,7 @@ The emqx broker runs as linux user `emqx` in the docker container.

 ### Configuration

-Use the environment variable to configure the EMQ X docker container.
+Use the environment variable to configure the EMQX docker container.

 By default, the environment variables with ``EMQX_`` prefix are mapped to key-value pairs in configuration files.

@ -72,9 +72,9 @@ EMQX_HOST

 These environment variables will ignore for configuration file.

-#### EMQ X Configuration
+#### EMQX Configuration

-> NOTE: All EMQ X Configuration in [etc/emqx.conf](https://github.com/emqx/emqx/blob/main-v4.3/etc/emqx.conf) could config by environment. The following list is just an example, not a complete configuration.
+> NOTE: All EMQX Configuration in [etc/emqx.conf](https://github.com/emqx/emqx/blob/main-v4.3/etc/emqx.conf) could config by environment. The following list is just an example, not a complete configuration.

 | Options                    | Default            | Mapped                    | Description                           |
 | ---------------------------| ------------------ | ------------------------- | ------------------------------------- |
@ -148,7 +148,7 @@ EMQX_LOADED_PLUGINS="emqx_auth_redis emqx_auth_mysql"
 EMQX_LOADED_PLUGINS="emqx_auth_redis | emqx_auth_mysql"
 ```

-#### EMQ X Plugins Configuration
+#### EMQX Plugins Configuration

 The environment variables which with ``EMQX_`` prefix are mapped to all emqx plugins' configuration file, ``.`` get replaced by ``__``.

@ -200,7 +200,7 @@ docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \

 ### Cluster

-EMQ X supports a variety of clustering methods, see our [documentation](https://docs.emqx.io/broker/latest/en/advanced/cluster.html#emqx-service-discovery) for details.
+EMQX supports a variety of clustering methods, see our [documentation](https://docs.emqx.io/broker/latest/en/advanced/cluster.html#emqx-service-discovery) for details.

 Let's create a static node list cluster from docker-compose.

@ -256,7 +256,7 @@ Let's create a static node list cluster from docker-compose.

 ### Persistence

-If you want to persist the EMQ X docker container, you need to keep the following directories:
+If you want to persist the EMQX docker container, you need to keep the following directories:

 + `/opt/emqx/data`
 + `/opt/emqx/etc`
@ -316,7 +316,7 @@ docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \

 ```

-> REMEMBER: DO NOT RUN EMQ X DOCKER PRIVILEGED OR MOUNT SYSTEM PROC IN CONTAINER TO TUNE LINUX KERNEL, IT IS UNSAFE.
+> REMEMBER: DO NOT RUN EMQX DOCKER PRIVILEGED OR MOUNT SYSTEM PROC IN CONTAINER TO TUNE LINUX KERNEL, IT IS UNSAFE.

 ### Thanks

--- a/deploy/docker/docker-entrypoint.sh
+++ b/deploy/docker/docker-entrypoint.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ## EMQ docker image start script
 # Huang Rui <vowstar@gmail.com>
-# EMQ X Team <support@emqx.io>
+# EMQX Team <support@emqx.io>

 ## Shell setting
 if [[ -n "$DEBUG" ]]; then
--- a/elvis.config
+++ b/elvis.config
@ -1,47 +0,0 @@
-%% -*-: erlang -*-
-[
- {
-   elvis,
-   [
-    {config,
-     [
-      #{dirs => ["src", "apps/**/src", "lib-ce/**/src", "lib-ee/**/src"],
-        filter => "*.erl",
-        ruleset => erl_files,
-        rules => [
-            {elvis_style, state_record_and_type, disable},
-            {elvis_style, no_common_caveats_call, #{}},
-            {elvis_style, no_debug_call, #{ debug_functions => [ {ct, pal}
-                                                               , {ct, print}
-                                                               ]}},
-            {elvis_style, operator_spaces, #{rules => [{right, "|"},
-                                                       {left, "|"},
-                                                       {right, "||"},
-                                                       {left, "||"}]}}
-           ]
-        },
-      #{dirs => ["test", "apps/**/test", "lib-ce/**/src"],
-        filter => "*.erl",
-        rules => [
-           {elvis_text_style, line_length, #{ limit => 100
-                                             , skip_comments => false }},
-           {elvis_style, dont_repeat_yourself, #{ min_complexity => 100 }}
-          ]
-        },
-      #{dirs => ["."],
-        filter => "Makefile",
-        ruleset => makefiles
-       },
-      #{dirs => ["."],
-        filter => "rebar.config",
-        ruleset => rebar_config
-       },
-      #{dirs => ["."],
-        filter => "elvis.config",
-        ruleset => elvis_config
-       }
-     ]
-    }
-   ]
- }
-].
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@ -1,4 +1,4 @@
-## EMQ X Configuration 4.3
+## EMQX Configuration 4.3

 ## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!

@ -203,10 +203,10 @@ node.data_dir = {{ platform_data_dir }}
 ## the heartbeat pings.
 ##
 ## NOTE: When managed by systemd (or other supervision tools like systemd),
-##       heart will probably only cause EMQ X to stop, but restart or not will
+##       heart will probably only cause EMQX to stop, but restart or not will
 ##       depend on systemd's restart strategy.
 ## NOTE: When running in docker, the container will die as soon as the the
-##       heart process kills EMQ X, but restart or not will depend on container
+##       heart process kills EMQX, but restart or not will depend on container
 ##       supervision strategy, such as k8s restartPolicy.
 ##
 ## Value: on
@ -1118,7 +1118,7 @@ listener.tcp.external.zone = external
 ## Example: allow 192.168.0.0/24
 listener.tcp.external.access.1 = allow all

-## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
 ## behind HAProxy or Nginx.
 ##
 ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@ -1126,7 +1126,7 @@ listener.tcp.external.access.1 = allow all
 ## Value: on | off
 ## listener.tcp.external.proxy_protocol = on

-## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+## Sets the timeout for proxy protocol. EMQX will close the TCP connection
 ## if no proxy protocol packet recevied within the timeout.
 ##
 ## Value: Duration
@ -1629,13 +1629,13 @@ listener.ws.external.access.1 = allow all
 ## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 ## listener.ws.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5

-## Specify which HTTP header for real source IP if the EMQ X cluster is
+## Specify which HTTP header for real source IP if the EMQX cluster is
 ## deployed behind NGINX or HAProxy.
 ##
 ## Default: X-Forwarded-For
 ## listener.ws.external.proxy_address_header = X-Forwarded-For

-## Specify which HTTP header for real source port if the EMQ X cluster is
+## Specify which HTTP header for real source port if the EMQX cluster is
 ## deployed behind NGINX or HAProxy.
 ##
 ## Default: X-Forwarded-Port
@ -1898,13 +1898,13 @@ listener.wss.external.access.1 = allow all
 ## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 ## listener.wss.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5

-## Specify which HTTP header for real source IP if the EMQ X cluster is
+## Specify which HTTP header for real source IP if the EMQX cluster is
 ## deployed behind NGINX or HAProxy.
 ##
 ## Default: X-Forwarded-For
 ## listener.wss.external.proxy_address_header = X-Forwarded-For

-## Specify which HTTP header for real source port if the EMQ X cluster is
+## Specify which HTTP header for real source port if the EMQX cluster is
 ## deployed behind NGINX or HAProxy.
 ##
 ## Default: X-Forwarded-Port
--- a/etc/emqx_cloud/vm.args
+++ b/etc/emqx_cloud/vm.args
@ -1,5 +1,5 @@
 ######################################################################
-## Erlang VM Args for EMQ X Broker
+## Erlang VM Args
 ######################################################################

 ## NOTE:
--- a/etc/emqx_edge/vm.args
+++ b/etc/emqx_edge/vm.args
@ -1,5 +1,5 @@
 ######################################################################
-## Erlang VM Args for EMQ X Edge
+## Erlang VM Args
 ######################################################################

 ## NOTE:
--- a/lib-ce/emqx_dashboard/README.md
+++ b/lib-ce/emqx_dashboard/README.md
@ -2,7 +2,7 @@
 emqx-dashboard
 ==============

-Dashboard for the EMQ X Broker.
+Dashboard for the EMQX Broker.

 REST API
 --------
--- a/lib-ce/emqx_dashboard/etc/emqx_dashboard.conf
+++ b/lib-ce/emqx_dashboard/etc/emqx_dashboard.conf
@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Dashboard
+## EMQX Dashboard
 ##--------------------------------------------------------------------

 ## Default user's login name.
--- a/lib-extra/README.md
+++ b/lib-extra/README.md
@ -1,4 +1,4 @@
-# EMQ X Extra plugin apps
+# EMQX Extra plugin apps

 This directory keeps a `plugins` file which defines all the approved
 external plugins from open-source community.
@ -20,7 +20,7 @@ e.g. For an Erlang plugin named `plugin_foo`:
 ```

 Note: The `-emqx_plugin(?MODULE)` attribute should be added to
-`<plugin-name>_app.erl` file to indicate that this is an EMQ X Broker plugin.
+`<plugin-name>_app.erl` file to indicate that this is an EMQX Broker plugin.

 For example:
 ```erlang
--- a/pkg-vsn.sh
+++ b/pkg-vsn.sh
@ -18,7 +18,7 @@ RELEASE="$(grep -E "define.+EMQX_RELEASE.+${EDITION}" include/emqx_release.hrl |
 git_exact_vsn() {
    local tag
    tag="$(git describe --tags --match "[e|v]*" --exact 2>/dev/null)"
-    echo "$tag" | sed 's/^[v|e]//g'
+    echo "${tag#[e|v]}"
 }

 GIT_EXACT_VSN="$(git_exact_vsn)"
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@ -1,5 +1,5 @@
 %%-*- mode: erlang -*-
-%% EMQ X R4.0 config mapping
+%% EMQX Config Mapping

 %%--------------------------------------------------------------------
 %% Cluster
--- a/scripts/elvis-check.sh
+++ b/scripts/elvis-check.sh
@ -1,84 +0,0 @@
-#!/usr/bin/env bash
-
-## This script checks style of changed files.
-## Expect argument 1 to be the git compare base.
-
-set -euo pipefail
-
-elvis_version='1.0.0-emqx-2'
-
-base="${1:-}"
-repo="${2:-emqx/emqx}"
-REPO="${GITHUB_REPOSITORY:-${repo}}"
-if [ "${base}" = "" ]; then
-    echo "Usage $0 <git-compare-base-ref>"
-    exit 1
-fi
-
-echo "elvis -v: $elvis_version"
-echo "git diff base: $base"
-
-if [ ! -f ./elvis ] || [ "$(./elvis -v | grep -oE '[1-9]+\.[0-9]+\.[0-9]+\-emqx-[0-9]+')" != "$elvis_version" ]; then
-    curl  --silent --show-error -fLO "https://github.com/emqx/elvis/releases/download/$elvis_version/elvis"
-    chmod +x ./elvis
-fi
-
-if [[ "$base" =~ [0-9a-f]{8,40} ]]; then
-    # base is a commit sha1
-    compare_base="$base"
-else
-    remote="$(git remote -v | grep -E "github\.com(:|/)$REPO((\.git)|(\s))" | grep fetch | awk '{print $1}')"
-    git fetch "$remote" "$base"
-    compare_base="$remote/$base"
-fi
-
-git_diff() {
-    git diff --name-only --diff-filter=ACMRTUXB "$compare_base"...HEAD
-}
-
-bad_file_count=0
-for file in $(git_diff); do
-    if [ ! -f "$file" ]; then
-        # file is deleted, skip
-        continue
-    fi
-    if [[ $file != *.erl ]]; then
-        # not .erl file
-        continue
-    fi
-    if ! ./elvis rock "$file" -c elvis.config; then
-        bad_file_count=$(( bad_file_count + 1))
-    fi
-done
-if [ $bad_file_count -gt 0 ]; then
-    echo "elvis: $bad_file_count errors"
-    exit 1
-fi
-
-### now check new-line at EOF for changed files
-
-nl_at_eof() {
-    local file="$1"
-    if ! [ -f "$file" ]; then
-        return
-    fi
-    case "$file" in
-        *.png|*rebar3)
-            return
-            ;;
-    esac
-    local lastbyte
-    lastbyte="$(tail -c 1 "$file" 2>&1)"
-    if [ "$lastbyte" != '' ]; then
-        echo "$file"
-        return 1
-    fi
-}
-
-for file in $(git_diff); do
-    if ! nl_at_eof "$file"; then
-        bad_file_count=$(( bad_file_count  + 1 ))
-    fi
-done
-
-exit $bad_file_count
--- a/scripts/find-apps.sh
+++ b/scripts/find-apps.sh
@ -5,9 +5,16 @@ set -euo pipefail
 # ensure dir
 cd -P -- "$(dirname -- "$0")/.."

+if [ "$(./scripts/get-distro.sh)" = 'windows' ]; then
+    # Otherwise windows may resolve to find.exe
+    FIND="/usr/bin/find"
+else
+    FIND='find'
+fi
+
 find_app() {
    local appdir="$1"
-    find "${appdir}" -mindepth 1 -maxdepth 1 -type d
+    "$FIND" "${appdir}" -mindepth 1 -maxdepth 1 -type d
 }

 # append emqx application first
@ -23,4 +30,4 @@ fi
 ## find directories in lib-extra
 find_app 'lib-extra'
 ## find symlinks in lib-extra
-find 'lib-extra' -mindepth 1 -maxdepth 1 -type l -exec test -e {} \; -print
+"$FIND" 'lib-extra' -mindepth 1 -maxdepth 1 -type l -exec test -e {} \; -print
--- a/scripts/find-props.sh
+++ b/scripts/find-props.sh
@ -13,4 +13,5 @@ if [ "$1" != "emqx" ]; then
    BASEDIR="$1"
 fi

+# shellcheck disable=SC2038
 find "${BASEDIR}/test/props" -name "prop_*.erl" 2>/dev/null | xargs -I{} basename {} .erl | xargs | tr ' ' ','
--- a/scripts/find-suites.sh
+++ b/scripts/find-suites.sh
@ -12,4 +12,5 @@ TESTDIR="test"
 if [ "$1" != "emqx" ]; then
    TESTDIR="$1/test"
 fi
+# shellcheck disable=SC2038
 find "${TESTDIR}" -name "*_SUITE.erl" 2>/dev/null | xargs | tr ' ' ','
--- a/scripts/relup-base-packages.sh
+++ b/scripts/relup-base-packages.sh
@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+## This script helps to download relup base version packages
+
+if [[ -n "$DEBUG" ]]; then
+    set -x
+fi
+set -euo pipefail
+
+PROFILE="${1}"
+if [ "$PROFILE" = "" ]; then
+    PROFILE="emqx"
+fi
+
+case $PROFILE in
+    "emqx")
+        DIR='broker'
+        EDITION='community'
+        ;;
+    "emqx-ee")
+        DIR='enterprise'
+        EDITION='enterprise'
+        ;;
+    "emqx-edge")
+        DIR='edge'
+        EDITION='edge'
+        ;;
+esac
+
+SYSTEM="${SYSTEM:-$(./scripts/get-distro.sh)}"
+
+ARCH="${ARCH:-$(uname -m)}"
+case "$ARCH" in
+    x86_64)
+        ARCH='amd64'
+        ;;
+    aarch64)
+        ARCH='arm64'
+        ;;
+    arm*)
+        ARCH=arm
+        ;;
+esac
+
+SHASUM="sha256sum"
+if [ "$SYSTEM" = "macos" ]; then
+    SHASUM="shasum -a 256"
+fi
+
+# ensure dir
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
+
+mkdir -p _upgrade_base
+pushd _upgrade_base
+
+for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do
+    filename="$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip"
+    url="https://www.emqx.com/downloads/$DIR/${tag#[e|v]}/$filename"
+    echo "downloading base package from ${url} ..."
+    if [ ! -f "$filename" ] && curl -I -m 10 -o /dev/null -s -w "%{http_code}" "${url}" | grep -q -oE "^[23]+" ; then
+        curl -L -o "${filename}" "${url}"
+        if [ "$SYSTEM" != "centos6" ]; then
+            curl -L -o "${filename}.sha256" "${url}.sha256"
+            SUMSTR=$(cat "${filename}.sha256")
+            echo "got sha265sum: ${SUMSTR}"
+            ## https://askubuntu.com/questions/1202208/checking-sha256-checksum
+            echo "${SUMSTR}  ${filename}" | $SHASUM -c || exit 1
+        fi
+    fi
+done
+
+popd
--- a/Show More
+++ b/Show More