diff --git a/configure.in b/configure.in
index b96111c88..fec1ed279 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.2.99.4],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.2.99.5],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 
 dnl Source packaging numbers
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 86b527e94..62fa0b1f0 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -548,8 +548,10 @@ void linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 		}else{
 			if (!cone_audio) {
 				ms_warning("NAT is symmetric for audio port");
+				/*
 				ac->addr[0]='\0';
 				ac->port=0;
+				*/
 			}
 		}
 		if (sock2>=0){
@@ -558,8 +560,10 @@ void linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 			}else{
 				if (!cone_video) {
 					ms_warning("NAT is symmetric for video port.");
+					/*
 					vc->addr[0]='\0';
 					vc->port=0;
+					*/
 				}
 			}
 		}
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index afbc4f85f..d1ade9af2 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -361,10 +361,15 @@ MSList *sal_get_pending_auths(Sal *sal){
 static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval){
 	osip_via_t *via=NULL;
 	osip_generic_param_t *param=NULL;
-	const char *rport;
-	
+	const char *rport=NULL;
+
+	*rportval=5060;
+	*received=NULL;
 	osip_message_get_via(msg,0,&via);
 	if (!via) return -1;
+	if (via->port && via->port[0]!='\0')
+		*rportval=atoi(via->port);
+	
 	osip_via_param_get_byname(via,"rport",&param);
 	if (param) {
 		rport=param->gvalue;
@@ -375,7 +380,8 @@ static int extract_received_rport(osip_message_t *msg, const char **received, in
 	param=NULL;
 	osip_via_param_get_byname(via,"received",&param);
 	if (param) *received=param->gvalue;
-	else return -1;
+
+	if (rport==NULL && *received==NULL) return -1;
 	return 0;
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index 166db20a4..b437bd3bc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 166db20a49a308e161d7b5c74fdc5aff000db9a2
+Subproject commit b437bd3bcac6ce8f09218168ae75cc11e9a9255e