Merge branch 'master' into develop

mockitoAgent.gradle

@@ -0,0 +1,13 @@
+configurations {
+    mockitoAgent
+}
+
+dependencies {
+    mockitoAgent(libs.mockito.core) {
+        transitive = false
+    }
+}
+
+tasks.withType(Test).configureEach {
+    jvmArgs "-javaagent:${configurations.mockitoAgent.singleFile}"
+}