Merge remote-tracking branch 'origin/dev_v5.0.2' into release_v5.0.2

pom.xml

@@ -18,6 +18,8 @@
         <maven-surefire-version>2.22.2</maven-surefire-version>
         <maven-flatten-version>1.2.7</maven-flatten-version>
         <maven-deploy-version>2.8.2</maven-deploy-version>
+        <maven-assembly-version>3.6.0</maven-assembly-version>
+
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>