Merge remote-tracking branch 'remotes/upstream/dev' into dev

pom.xml

@@ -887,6 +887,8 @@
                         <exclude>**/docs/**</exclude>
                         <exclude>**/*.babelrc</exclude>
                         <exclude>**/*.eslintrc</exclude>
+                        <exclude>**/.mvn/jvm.config</exclude>
+                        <exclude>**/.mvn/wrapper/maven-wrapper.properties</exclude>
                     </excludes>
                     <consoleOutput>true</consoleOutput>
                 </configuration>