diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m
index 5580f12be..2fce9cd7a 100644
--- a/Classes/LinphoneUI/UISpeakerButton.m
+++ b/Classes/LinphoneUI/UISpeakerButton.m
@@ -27,7 +27,6 @@
 @implementation UISpeakerButton
 
 #pragma mark - Static Functions
-
 static void audioRouteChangeListenerCallback(void *inUserData,					  // 1
 											 AudioSessionPropertyID inPropertyID, // 2
 											 UInt32 inPropertyValueSize,		  // 3
diff --git a/Classes/LinphoneUI/UIToggleButton.m b/Classes/LinphoneUI/UIToggleButton.m
index 2d34b7298..cd05bbc7f 100644
--- a/Classes/LinphoneUI/UIToggleButton.m
+++ b/Classes/LinphoneUI/UIToggleButton.m
@@ -23,32 +23,9 @@
 
 #pragma mark - Lifecycle Functions
 
-- (void)initUIToggleButton {
+INIT_WITH_COMMON_CF {
 	[self update];
 	[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
-}
-
-- (id)init {
-	self = [super init];
-	if (self) {
-		[self initUIToggleButton];
-	}
-	return self;
-}
-
-- (id)initWithFrame:(CGRect)frame {
-	self = [super initWithFrame:frame];
-	if (self) {
-		[self initUIToggleButton];
-	}
-	return self;
-}
-
-- (id)initWithCoder:(NSCoder *)decoder {
-	self = [super initWithCoder:decoder];
-	if (self) {
-		[self initUIToggleButton];
-	}
 	return self;
 }
 
diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m
index 9c143589a..6406f4039 100644
--- a/TestsUI/ChatTester.m
+++ b/TestsUI/ChatTester.m
@@ -104,7 +104,7 @@
 	[self startChatWith:[self me]];
 	[self uploadImageWithQuality:@"Minimum"];
 	// wait for the upload to terminate...
-	for (int i = 0; i < 45; i++) {
+	for (int i = 0; i < 90; i++) {
 		[tester waitForTimeInterval:1.f];
 		if (LinphoneManager.instance.fileTransferDelegates.count == 0)
 			break;
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index eb374e2ce..34d6bed74 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -551,6 +551,9 @@
 		63E27A4E1C50EAC300D332AE /* libebml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A4D1C50EAC300D332AE /* libebml2.a */; };
 		63E27A501C50EAE800D332AE /* libcorec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A4F1C50EAE800D332AE /* libcorec.a */; };
 		63E27A521C50EDB000D332AE /* hold.mkv in Resources */ = {isa = PBXBuildFile; fileRef = 63E27A511C50EB2700D332AE /* hold.mkv */; };
+		63E27A591C51392A00D332AE /* libcorec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A4F1C50EAE800D332AE /* libcorec.a */; };
+		63E27A5A1C51392A00D332AE /* libebml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A4D1C50EAC300D332AE /* libebml2.a */; };
+		63E27A5B1C51392A00D332AE /* libmatroska2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A471C50EA7A00D332AE /* libmatroska2.a */; };
 		63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; };
 		63EEE3FF1BBA9AC00087D3AF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A9B7E18C0D9C900C4D7FE /* libcunit.a */; };
 		63EEE4001BBA9AC00087D3AF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C0F193623F200974404 /* liblinphonetester.a */; };
@@ -1671,6 +1674,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				63E27A591C51392A00D332AE /* libcorec.a in Frameworks */,
+				63E27A5A1C51392A00D332AE /* libebml2.a in Frameworks */,
+				63E27A5B1C51392A00D332AE /* libmatroska2.a in Frameworks */,
 				15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */,
 				F0A54B0C1AD56F4600C22733 /* libc++.dylib in Frameworks */,
 				F0A54B0D1AD56F4600C22733 /* libstdc++.dylib in Frameworks */,
@@ -1945,8 +1951,8 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				63E279DC1C4F8CEE00D332AE /* Default-568h@2x.png */,
 				080E96DDFE201D6D7F000001 /* Classes */,
+				63E279DC1C4F8CEE00D332AE /* Default-568h@2x.png */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				F0938158188E629800A55DFA /* iTunesArtwork */,
 				63058A0C1B4E821E00EFAE36 /* LiblinphoneTester */,
diff --git a/submodules/linphone b/submodules/linphone
index 33be9d619..ca03bb197 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 33be9d61934d8864e65079d4bab957187ccb69c4
+Subproject commit ca03bb19722cff4266cebd4339c6aeb120a3f017