diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 4d1108077..102f38c9e 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -393,7 +393,7 @@ static bool_t is_reporting_enabled(const LinphoneCall * call) {
 	return (call->dest_proxy != NULL && linphone_proxy_config_quality_reporting_enabled(call->dest_proxy));
 }
 
-static void qos_analyser_on_action_suggested(void *user_data, const char * input, const char * output){
+static void qos_analyzer_on_action_suggested(void *user_data, const char * input, const char * output){
 	reporting_content_metrics_t *metrics = (reporting_content_metrics_t*) user_data;
 	char * newstr = NULL;
 	newstr = ms_strdup_printf("%s%s;", metrics->qos_analyzer.input?metrics->qos_analyzer.input:"", input);
@@ -485,7 +485,7 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) {
 void linphone_reporting_on_rtcp_received(LinphoneCall *call, int stats_type) {
 	reporting_session_report_t * report = call->log->reports[stats_type];
 	reporting_content_metrics_t * metrics = NULL;
-	MSQosAnalyser *analyser=NULL;
+	MSQosAnalyzer *analyzer=NULL;
 	LinphoneCallStats stats = call->stats[stats_type];
 	mblk_t *block = NULL;
 
@@ -505,11 +505,11 @@ void linphone_reporting_on_rtcp_received(LinphoneCall *call, int stats_type) {
 			block = stats.sent_rtcp;
 		}
 	}
-	if (call->audiostream->ms.rc){
-		analyser=ms_bitrate_controller_get_qos_analyser(call->audiostream->ms.rc);
-		if (analyser){
-			ms_qos_analyser_set_on_action_suggested(analyser,
-				qos_analyser_on_action_suggested,
+	if (call->audiostream->ms.use_rc&&call->audiostream->ms.rc){
+		analyzer=ms_bitrate_controller_get_qos_analyzer(call->audiostream->ms.rc);
+		if (analyzer){
+			ms_qos_analyzer_set_on_action_suggested(analyzer,
+				qos_analyzer_on_action_suggested,
 				&report->local_metrics);
 		}
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index 3dbbb2367..c3529c41b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3dbbb23674085d116c4b43063f3cf082b08565ae
+Subproject commit c3529c41b46ae5e099566462b3fb7f055441ddfb
diff --git a/oRTP b/oRTP
index ec4c194c6..c889f49b6 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit ec4c194c62a9657f075d07dc2495f98914ee0b8b
+Subproject commit c889f49b6c6367b2c3ccb44fa74a70e73dd1b575