diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 66fea75f7..921f348f9 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index eed4a9dd3..b5abfbd2e 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index ad0a1f4a3..4b27020b3 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 94f329f08..a103c4c9f 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 7f4aa07b8..901ca5386 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings
index 7326dae19..ddbae2a99 100644
Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index 035caa73b..7c6aeaeed 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
index edbc17b01..4c936fb0d 100644
Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index b570484c6..0ad29dc36 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -24,3 +24,4 @@
 "Release core" = "Release core";
 "Clear cache" = "Clear cache";
 "Battery alert" = "Battery alert";
+"Auto answer call immediately" = "Auto answer call immediately";
diff --git a/TestsUI/CallTester.m b/TestsUI/CallTester.m
index b51398e24..bc2085602 100644
--- a/TestsUI/CallTester.m
+++ b/TestsUI/CallTester.m
@@ -53,9 +53,10 @@
 }
 
 - (void)testDialInvalidSIPURI {
-	[self callURI:@"123 😀"];
-	[tester waitForViewWithAccessibilityLabel:
-				@"Some invalid characters where found in the given SIP address. Please correct it."];
+	NSString *user = @"123 😀";
+	[self callURI:user];
+	[tester waitForViewWithAccessibilityLabel:[NSString
+												  stringWithFormat:@"Cannot call %@.\nReason was: Call failed", user]];
 	[tester tapViewWithAccessibilityLabel:@"Cancel" traits:UIAccessibilityTraitButton];
 }
 
diff --git a/prepare.py b/prepare.py
index ac46643c2..b7d1196ee 100755
--- a/prepare.py
+++ b/prepare.py
@@ -388,7 +388,9 @@ sdk:
 \t\t{multiarch} \\
 \t\techo "[{archs}] Mixing `basename $$archive` in $$destpath"; \\
 \t\tlipo -create $$all_paths -output $$destpath; \\
-\tdone
+\tdone; \\
+\techo 'NOTE: the following libraries were STUBBED:'; \\
+\tcat WORK/ios-{first_arch}/Build/dummy_libraries/dummy_libraries.txt
 
 build: $(addsuffix -build, $(archs))
 \t$(MAKE) sdk
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 1ced63785..611b6c3b1 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 1ced637855bb052f2475847c867f648338b84376
+Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index e5ddd8925..39bc0ebce 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit e5ddd892561b0c5df25b7036bd9229fe6a6ea81a
+Subproject commit 39bc0ebcebe3485b5cfcacbbe22092eeb97997a0
diff --git a/submodules/linphone b/submodules/linphone
index 725b86656..dae216855 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 725b8665663f753b28d3c6892949a8c4157abf66
+Subproject commit dae216855ca67430cc25135f4eef52f1e5edc1c2