diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 95ab59bae..171cbded5 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -524,7 +524,8 @@ exit_dbmigration:
 			// we want to enable quality reporting for the proxies that are on linphone.org
 			if (addr && strstr(addr, "sip.linphone.org") != 0) {
 				LOGI(@"Migrating proxy config to send quality report");
-				linphone_proxy_config_set_quality_reporting_collector(proxy, "sip:voip-metrics@sip.linphone.org");
+				linphone_proxy_config_set_quality_reporting_collector(
+					proxy, "sip:voip-metrics@sip.linphone.org;transport=tls");
 				linphone_proxy_config_set_quality_reporting_interval(proxy, 180);
 				linphone_proxy_config_enable_quality_reporting(proxy, TRUE);
 			}
@@ -1323,8 +1324,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL,
 										[zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 	linphone_core_set_chat_database_path(theLinphoneCore,
 										 [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-	linphone_core_set_call_logs_database_path(theLinphoneCore,
-											  [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
+
 	[self migrationLinphoneSettings];
 
 	[self setupNetworkReachabilityCallback];
diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index 3dcabba57..0f85ee58b 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -9,7 +9,7 @@
 		<entry name="publish" overwrite="true">0</entry>
 		<entry name="dial_escape_plus" overwrite="true">0</entry>
 		<entry name="avpf" overwrite="true">1</entry>
-		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org</entry>
+		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
 		<entry name="quality_reporting_enabled" overwrite="true">1</entry>
 		<entry name="quality_reporting_interval" overwrite="true">180</entry>
 		<entry name="realm" overwrite="true">sip.linphone.org</entry>
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 3dcabba57..0f85ee58b 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -9,7 +9,7 @@
 		<entry name="publish" overwrite="true">0</entry>
 		<entry name="dial_escape_plus" overwrite="true">0</entry>
 		<entry name="avpf" overwrite="true">1</entry>
-		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org</entry>
+		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
 		<entry name="quality_reporting_enabled" overwrite="true">1</entry>
 		<entry name="quality_reporting_interval" overwrite="true">180</entry>
 		<entry name="realm" overwrite="true">sip.linphone.org</entry>
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index a3a93f1ee..eed4a9dd3 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 98c00b7a7..7f4aa07b8 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/prepare.py b/prepare.py
index e58d34bd3..0b1e1ea9a 100755
--- a/prepare.py
+++ b/prepare.py
@@ -271,29 +271,21 @@ def install_git_hook():
 
 def generate_makefile(platforms, generator):
     packages = os.listdir('WORK/ios-' + platforms[0] + '/Build')
+    packages.remove('dummy_libraries')
     packages.sort()
     arch_targets = ""
     for arch in platforms:
         arch_targets += """
 {arch}: {arch}-build
 
-{arch}-build:
-\t@for package in $(packages); do \\
-\t\t$(MAKE) {arch}-build-$$package; \\
-\tdone
+{arch}-build: $(addprefix {arch}-build-, $(packages))
+\t@echo "Done"
 
-{arch}-clean:
-\t@for package in $(packages); do \\
-\t\t$(MAKE) {arch}-clean-$$package; \\
-\tdone
+{arch}-clean: $(addprefix {arch}-clean-, $(packages))
+\t@echo "Done"
 
-{arch}-veryclean:
-\t@for package in $(packages); do \\
-\t\t$(MAKE) {arch}-veryclean-$$package; \\
-\tdone
-
-{arch}-build-dummy_libraries:
-\t{generator} WORK/ios-{arch}/cmake EP_dummy_libraries
+{arch}-veryclean: $(addprefix {arch}-veryclean-, $(packages))
+\t@echo "Done"
 
 {arch}-build-%: package-in-list-%
 \trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-update; \\
@@ -354,7 +346,8 @@ LINPHONE_IPHONE_VERSION=$(shell git describe --always)
 
 .PHONY: all
 .SILENT: sdk
-
+#turn off parallelism because it is not yet handled properly
+.NOTPARALLEL:
 all: build
 
 package-in-list-%:
@@ -377,6 +370,7 @@ clean: $(addprefix clean-,$(packages))
 veryclean: $(addprefix veryclean-,$(packages))
 
 sdk:
+\tfor arch in $$archs; do {generator} WORK/ios-$arch/cmake EP_dummy_libraries; done && \\
 \tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
 \trm -rf liblinphone-sdk/apple-darwin && \\
 \tmkdir -p liblinphone-sdk/apple-darwin && \\
diff --git a/submodules/linphone b/submodules/linphone
index c4cb4d276..4e3ea86c9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c4cb4d2767b126bf45cb404a83ac1b29b99a8726
+Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851