diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 1ea87ca30..a61a9af80 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1428,19 +1428,19 @@ static BOOL libStarted = FALSE;
 	[Log enableLogs:[self lpConfigIntForKey:@"debugenable_preference"]];
 	connectivity = none;
 
-	ms_init(); // Need to initialize mediastreamer2 before loading the plugins
-	// Load plugins if available in the linphone SDK - otherwise these calls will do nothing
-	libmsilbc_init(ms_factory_get_fallback());
-	libmssilk_init(ms_factory_get_fallback());
-	libmsamr_init(ms_factory_get_fallback());
-	libmsx264_init(ms_factory_get_fallback());
-	libmsopenh264_init(ms_factory_get_fallback());
-	libmsbcg729_init(ms_factory_get_fallback());
-	libmswebrtc_init(ms_factory_get_fallback());
-
 	theLinphoneCore = linphone_core_new_with_config(&linphonec_vtable, _configDb, (__bridge void *)(self));
 	LOGI(@"Create linphonecore %p", theLinphoneCore);
 
+	// Load plugins if available in the linphone SDK - otherwise these calls will do nothing
+	MSFactory *f = linphone_core_get_ms_factory(theLinphoneCore);
+	libmsilbc_init(f);
+	libmssilk_init(f);
+	libmsamr_init(f);
+	libmsx264_init(f);
+	libmsopenh264_init(f);
+	libmsbcg729_init(f);
+	libmswebrtc_init(f);
+
 	// Set audio assets
 	NSString *ring =
 		([LinphoneManager
@@ -1507,7 +1507,6 @@ static BOOL libStarted = FALSE;
 		linphone_core_destroy(theLinphoneCore);
 		LOGI(@"Destroy linphonecore %p", theLinphoneCore);
 		theLinphoneCore = nil;
-		ms_exit(); // Uninitialize mediastreamer2
 
 		// Post event
 		NSDictionary *dict =
diff --git a/submodules/belle-sip b/submodules/belle-sip
index f76447b43..39a660c07 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit f76447b43e3bbd31dfe6fdbe280e99e2aea73382
+Subproject commit 39a660c07feaaaae0eca8e1d8c18d52adb8e7cf3
diff --git a/submodules/linphone b/submodules/linphone
index b0ea18f83..1db3b9a29 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b0ea18f83cd642243c5a2e1690d5cf95bfe55000
+Subproject commit 1db3b9a2978d64dc886c6c7db7b5ed21ee39bbe7