diff --git a/nogpl-thirdparties/Settings.bundle/Root.plist b/nogpl-thirdparties/Settings.bundle/Root.plist
index 5bc0378b6..a6ef360c7 100644
--- a/nogpl-thirdparties/Settings.bundle/Root.plist
+++ b/nogpl-thirdparties/Settings.bundle/Root.plist
@@ -114,6 +114,52 @@
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
+		<dict>
+			<key>Title</key>
+			<string>Tunnel</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>Key</key>
+			<string>tunnel_address_preference</string>
+			<key>Title</key>
+			<string>Address</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+		</dict>
+		<dict>
+			<key>Key</key>
+			<string>tunnel_port_preference</string>
+			<key>Title</key>
+			<string>port</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>off</string>
+			<key>Titles</key>
+			<array>
+				<string>off</string>
+				<string>on</string>
+				<string>wwan</string>
+				<string>auto</string>
+			</array>
+			<key>Key</key>
+			<string>tunnel_enabled_preference</string>
+			<key>Title</key>
+			<string>Enable</string>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Values</key>
+			<array>
+				<string>off</string>
+				<string>on</string>
+				<string>wwan</string>
+				<string>auto</string>
+			</array>
+		</dict>
 		<dict>
 			<key>Title</key>
 			<string>Advanced</string>
diff --git a/submodules/linphone b/submodules/linphone
index 1615847ff..58edf8b15 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1615847fff9cabdd1a3b26dd4e711db1e852fbdc
+Subproject commit 58edf8b150c3be8c55c21cc0db82f4779d8d3360
diff --git a/submodules/tunnel b/submodules/tunnel
index 99a8d56cb..8891cdc06 160000
--- a/submodules/tunnel
+++ b/submodules/tunnel
@@ -1 +1 @@
-Subproject commit 99a8d56cb3423a5c4c9f7924fcf1811d2e57ce20
+Subproject commit 8891cdc06a4900121919387102aaa967747ed41b