diff --git a/.gitignore b/.gitignore
index 1b94dd9f7..f1ed51c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,6 @@ tests/tests.output
 WORK
 .d
 google-services.json
-gradle.properties
 .*clang*
 linphone.iml
 src/linphone-wrapper
diff --git a/liblinphone_tester/gradle.properties b/liblinphone_tester/gradle.properties
new file mode 100644
index 000000000..a4996c82d
--- /dev/null
+++ b/liblinphone_tester/gradle.properties
@@ -0,0 +1,7 @@
+// Signing APK Release
+RELEASE_STORE_FILE=""
+RELEASE_STORE_PASSWORD=
+RELEASE_KEY_ALIAS=
+RELEASE_KEY_PASSWORD=
+#source:https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
+org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/liblinphone_tester/src/org/linphone/tester/TestUnit.java b/liblinphone_tester/src/org/linphone/tester/TestUnit.java
index 980c093dc..da92a72e4 100644
--- a/liblinphone_tester/src/org/linphone/tester/TestUnit.java
+++ b/liblinphone_tester/src/org/linphone/tester/TestUnit.java
@@ -26,7 +26,8 @@ public class TestUnit extends AndroidTestCase {
 	public TestUnit(String name) {
 		String[] tab = name.split("/");
 		mSuite = tab[0];
-		mTest = tab[1];
+		if (tab.length == 2)
+			mTest = tab[1];
 		setName(name);
 	}
 
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index bc7a47598..06cd2b314 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit bc7a47598455d62a73a80f5df70f972b31be5fb8
+Subproject commit 06cd2b31438ac632520ebce25796cf6e2ab5a759
diff --git a/submodules/linphone b/submodules/linphone
index a6db4780b..d0b5c85d1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a6db4780bc42c5de0f88bace988fe69bd55e694b
+Subproject commit d0b5c85d13bc8e855d5a2437088230d2511e04ab