diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index 6e4afd32d..a3fe0f56d 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -8,7 +8,7 @@
 		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
 		<entry name="quality_reporting_enabled" overwrite="true">1</entry>
 		<entry name="quality_reporting_interval" overwrite="true">180</entry>
-		<entry name="reg_expires" overwrite="true">1314000</entry>
+		<entry name="reg_expires" overwrite="true">31536000</entry>
 		<entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
 		<entry name="reg_sendregister" overwrite="true">1</entry>
 		<entry name="refkey" overwrite="true">push_notification</entry>
@@ -17,7 +17,6 @@
 
 	<section name="sip">
 		<entry name="rls_uri" overwrite="true">sip:rls@sip.linphone.org</entry>
-		<entry name="use_rls_presence" overwrite="true">1</entry>
 	</section>
 
 	<section name="assistant">
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 3541d3fed..98a95e9f5 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -8,7 +8,7 @@
 		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
 		<entry name="quality_reporting_enabled" overwrite="true">1</entry>
 		<entry name="quality_reporting_interval" overwrite="true">180</entry>
-		<entry name="reg_expires" overwrite="true">1314000</entry>
+		<entry name="reg_expires" overwrite="true">31536000</entry>
 		<entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
 		<entry name="reg_sendregister" overwrite="true">1</entry>
 		<entry name="refkey" overwrite="true">push_notification</entry>
@@ -17,7 +17,6 @@
 
 	<section name="sip">
 		<entry name="rls_uri" overwrite="true">sip:rls@sip.linphone.org</entry>
-		<entry name="use_rls_presence" overwrite="true">1</entry>
 	</section>
 	
 	<section name="assistant">
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 7e428aeac..d0c166650 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 7e428aeacbfcf991845a8e4bf0b5e0dd28c4cae3
+Subproject commit d0c166650a4a39aaae1d5bc17b5ae64639982930
diff --git a/submodules/linphone b/submodules/linphone
index 3e91c26f8..a567e95ee 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3e91c26f8af0695fe346062d033f23a01ec946f9
+Subproject commit a567e95ee1055e8ddb652f09fc5f831085421ce4