diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib
index 95e4efe8c..9c30bd9cd 100644
--- a/Classes/Base.lproj/WizardViews.xib
+++ b/Classes/Base.lproj/WizardViews.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -30,7 +30,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="21" userLabel="welcomeView">
+        <view tag="170" contentMode="scaleToFill" id="21" userLabel="welcomeView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -62,7 +62,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="178" y="295"/>
         </view>
-        <view contentMode="scaleToFill" id="33" userLabel="choiceView">
+        <view tag="171" contentMode="scaleToFill" id="33" userLabel="choiceView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -159,7 +159,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="550" y="295"/>
         </view>
-        <view contentMode="scaleToFill" id="44" userLabel="createAccountView">
+        <view tag="172" contentMode="scaleToFill" id="44" userLabel="createAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -247,7 +247,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="927" y="295"/>
         </view>
-        <view contentMode="scaleToFill" id="52" userLabel="connectAccountView">
+        <view tag="173" contentMode="scaleToFill" id="52" userLabel="connectAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -308,7 +308,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="178" y="904"/>
         </view>
-        <view contentMode="scaleToFill" id="56" userLabel="externalAccountView">
+        <view tag="174" contentMode="scaleToFill" id="56" userLabel="externalAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -389,7 +389,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="550" y="912"/>
         </view>
-        <view contentMode="scaleToFill" id="xVK-hL-6pe" userLabel="provisionedAccountView">
+        <view tag="175" contentMode="scaleToFill" id="xVK-hL-6pe" userLabel="provisionedAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -459,7 +459,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="These parameters were retrieved from a remote provisioning profile." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RHE-hi-dfB" userLabel="remoteParamsLabel">
-                    <rect key="frame" x="34" y="414.00000272146076" width="254" height="82"/>
+                    <rect key="frame" x="34" y="414" width="254" height="82"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
@@ -469,7 +469,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="927" y="912"/>
         </view>
-        <view contentMode="scaleToFill" id="101" userLabel="validateAccountView">
+        <view tag="176" contentMode="scaleToFill" id="101" userLabel="validateAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 9dab1d411..8c8988b32 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -365,6 +365,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 
 	// Set current view
+	LOGI(@"Changig assistant view %d -> %d", currentView.tag, view.tag);
 	currentView = view;
 	[contentView insertSubview:view atIndex:0];
 	[view setFrame:[contentView bounds]];
diff --git a/Tools/imgur_upload.sh b/Tools/imgur_upload.sh
index bd36a7c4a..debd736f0 100755
--- a/Tools/imgur_upload.sh
+++ b/Tools/imgur_upload.sh
@@ -2,7 +2,7 @@
 
 # Install underscore-cli for hacking
 if ! which underscore &> /dev/null; then
-	npm install -g underscore-cli >/dev/null
+	npm install -g underscore-cli &>/dev/null
 fi
 
 cd $KIF_SCREENSHOTS
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 12d21dbb2..333c42735 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 12d21dbb2ac58dff25b0ca1c66654234b526a429
+Subproject commit 333c427353ee224882e579c3303630a73cba0176
diff --git a/submodules/linphone b/submodules/linphone
index fcc39924f..b0d2cd13b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit fcc39924ffa45037f83b2217a2f84ddabe962b30
+Subproject commit b0d2cd13b177df4437311258cc3f2ab7f69b2fb5