Merge branch 'develop' into dependabot/maven/org.apache.maven.plugins-maven-surefire-plugin-3.5.5

Author: dbmalkovsky

pom.xml

@@ -227,7 +227,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.4.0</version>
 				<executions>
 					<execution>
 						<id>copy-resources</id>