diff --git a/conf/lang/en/dir/sounds.xml b/conf/lang/en/dir/sounds.xml
index 2bdc1492ec..15ecec304a 100644
--- a/conf/lang/en/dir/sounds.xml
+++ b/conf/lang/en/dir/sounds.xml
@@ -16,7 +16,7 @@
 			<match>
 				<action function="play-file" data="directory/dir-to_search_by.wav"/>
 				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
+				<action function="play-file" data="voicemail/vm-press.wav"/>
 				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
 			</match>
 		</input>
@@ -24,7 +24,7 @@
 			<match>
 				<action function="play-file" data="directory/dir-to_search_by.wav"/>
 				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
+				<action function="play-file" data="voicemail/vm-press.wav"/>
 				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
 			</match>
 		</input>
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 7bcb69cd9e..e2b08255ac 100644
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -1264,20 +1264,18 @@ static __inline__ ftdm_status_t wanpipe_channel_process_event(ftdm_channel_t *fc
 	switch(tdm_api->wp_tdm_cmd.event.wp_tdm_api_event_type) {
 	case WP_API_EVENT_LINK_STATUS:
 		{
-#if 0
 			switch(tdm_api->wp_tdm_cmd.event.wp_tdm_api_event_link_status) {
 			case WP_TDMAPI_EVENT_LINK_STATUS_CONNECTED:
-				*event_id = FTDM_OOB_ALARM_CLEAR;
+				/* *event_id = FTDM_OOB_ALARM_CLEAR; */
+				ftdm_log_chan_msg(fchan, FTDM_LOG_DEBUG, "Ignoring wanpipe link connected event\n");
 				break;
 			default:
-				*event_id = FTDM_OOB_ALARM_TRAP;
+				/* *event_id = FTDM_OOB_ALARM_TRAP; */
+				ftdm_log_chan_msg(fchan, FTDM_LOG_DEBUG, "Ignoring wanpipe link disconnected event\n");
 				break;
 			};
-#else
 			/* The WP_API_EVENT_ALARM event should be used to clear alarms */
-			ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "Ignoring wanpipe link status event\n", ftdm_oob_event2str(*event_id));
 			*event_id = FTDM_OOB_NOOP;
-#endif
 		}
 		break;
 
diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 142dff888a..8d67df3edc 100644
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -82,8 +82,12 @@ typedef enum {
 	FTDM_CAUSE_UNALLOCATED = 1,
 	FTDM_CAUSE_NO_ROUTE_TRANSIT_NET = 2,
 	FTDM_CAUSE_NO_ROUTE_DESTINATION = 3,
+	FTDM_CAUSE_SEND_SPECIAL_INFO_TONE = 4,
+ 	FTDM_CAUSE_MISDIALED_TRUNK_PREFIX = 5,
 	FTDM_CAUSE_CHANNEL_UNACCEPTABLE = 6,
 	FTDM_CAUSE_CALL_AWARDED_DELIVERED = 7,
+	FTDM_CAUSE_PREEMPTION = 8,
+	FTDM_CAUSE_PREEMPTION_CIRCUIT_RESERVED = 9,
 	FTDM_CAUSE_NORMAL_CLEARING = 16,
 	FTDM_CAUSE_USER_BUSY = 17,
 	FTDM_CAUSE_NO_USER_RESPONSE = 18,
@@ -100,23 +104,38 @@ typedef enum {
 	FTDM_CAUSE_NORMAL_UNSPECIFIED = 31,
 	FTDM_CAUSE_NORMAL_CIRCUIT_CONGESTION = 34,
 	FTDM_CAUSE_NETWORK_OUT_OF_ORDER = 38,
+	FTDM_CAUSE_PERMANENT_FRAME_MODE_CONNECTION_OOS = 39,
+	FTDM_CAUSE_PERMANENT_FRAME_MODE_OPERATIONAL = 40,
 	FTDM_CAUSE_NORMAL_TEMPORARY_FAILURE = 41,
 	FTDM_CAUSE_SWITCH_CONGESTION = 42,
 	FTDM_CAUSE_ACCESS_INFO_DISCARDED = 43,
 	FTDM_CAUSE_REQUESTED_CHAN_UNAVAIL = 44,
 	FTDM_CAUSE_PRE_EMPTED = 45,
+	FTDM_CAUSE_PRECEDENCE_CALL_BLOCKED = 46,
+	FTDM_CAUSE_RESOURCE_UNAVAILABLE_UNSPECIFIED = 47,
+	FTDM_CAUSE_QOS_NOT_AVAILABLE = 49,
 	FTDM_CAUSE_FACILITY_NOT_SUBSCRIBED = 50,
-	FTDM_CAUSE_OUTGOING_CALL_BARRED = 52,
-	FTDM_CAUSE_INCOMING_CALL_BARRED = 54,
+	FTDM_CAUSE_OUTGOING_CALL_BARRED = 53,
+	FTDM_CAUSE_INCOMING_CALL_BARRED = 55,
 	FTDM_CAUSE_BEARERCAPABILITY_NOTAUTH = 57,
 	FTDM_CAUSE_BEARERCAPABILITY_NOTAVAIL = 58,
+	FTDM_CAUSE_INCONSISTENCY_IN_INFO = 62,
 	FTDM_CAUSE_SERVICE_UNAVAILABLE = 63,
 	FTDM_CAUSE_BEARERCAPABILITY_NOTIMPL = 65,
 	FTDM_CAUSE_CHAN_NOT_IMPLEMENTED = 66,
 	FTDM_CAUSE_FACILITY_NOT_IMPLEMENTED = 69,
+	FTDM_CAUSE_ONLY_DIGITAL_INFO_BC_AVAIL = 70,
 	FTDM_CAUSE_SERVICE_NOT_IMPLEMENTED = 79,
 	FTDM_CAUSE_INVALID_CALL_REFERENCE = 81,
+	FTDM_CAUSE_IDENTIFIED_CHAN_NOT_EXIST = 82,
+	FTDM_CAUSE_SUSPENDED_CALL_EXISTS_BUT_CALL_ID_DOES_NOT = 83,
+	FTDM_CAUSE_CALL_ID_IN_USE = 84,
+	FTDM_CAUSE_NO_CALL_SUSPENDED = 85,
+	FTDM_CAUSE_CALL_WITH_CALL_ID_CLEARED = 86,
+	FTDM_CAUSE_USER_NOT_CUG = 87,
 	FTDM_CAUSE_INCOMPATIBLE_DESTINATION = 88,
+	FTDM_CAUSE_NON_EXISTENT_CUG = 90,
+	FTDM_CAUSE_INVALID_TRANSIT_NETWORK_SELECTION = 91,
 	FTDM_CAUSE_INVALID_MSG_UNSPECIFIED = 95,
 	FTDM_CAUSE_MANDATORY_IE_MISSING = 96,
 	FTDM_CAUSE_MESSAGE_TYPE_NONEXIST = 97,
@@ -126,6 +145,7 @@ typedef enum {
 	FTDM_CAUSE_WRONG_CALL_STATE = 101,
 	FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE = 102,
 	FTDM_CAUSE_MANDATORY_IE_LENGTH_ERROR = 103,
+	FTDM_CAUSE_MSG_WITH_UNRECOGNIZED_PARAM_DISCARDED = 110,
 	FTDM_CAUSE_PROTOCOL_ERROR = 111,
 	FTDM_CAUSE_INTERWORKING = 127,
 	FTDM_CAUSE_SUCCESS = 142,
@@ -171,7 +191,7 @@ FTDM_STR2ENUM_P(ftdm_str2ftdm_chan_type, ftdm_chan_type2str, ftdm_chan_type_t)
 #define FTDM_IS_VOICE_CHANNEL(fchan) ((fchan)->type != FTDM_CHAN_TYPE_DQ921 && (fchan)->type != FTDM_CHAN_TYPE_DQ931)
 
 /*! \brief Test if a channel is a D-channel */
-#define FTDM_IS_DCHAN(ftdm_chan) ((fchan)->type == FTDM_CHAN_TYPE_DQ921 || (fchan)->type == FTDM_CHAN_TYPE_DQ931)
+#define FTDM_IS_DCHAN(fchan) ((fchan)->type == FTDM_CHAN_TYPE_DQ921 || (fchan)->type == FTDM_CHAN_TYPE_DQ931)
 
 /*! \brief Test if a channel is digital channel */
 #define FTDM_IS_DIGITAL_CHANNEL(fchan) ((fchan)->span->trunk_type == FTDM_TRUNK_E1 || \
diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index f644ff772b..631cbdb14b 100644
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -1139,7 +1139,13 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
 					switch_url_encode(my_contact_str, path_encoded + 20, path_encoded_len - 20);
 					reg_desc = "Registered(AUTO-NAT-2.0)";
 					exptime = 30;
-					switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded);
+
+					/* place fs_path (the encoded path) inside the <...> of the contact string, if possible */
+					if (contact_str[strlen(contact_str) - 1] == '>') {
+						switch_snprintf(contact_str + strlen(contact_str) - 1, sizeof(contact_str) - strlen(contact_str) + 1, "%s>", path_encoded);
+					} else {
+						switch_snprintf(contact_str + strlen(contact_str), sizeof(contact_str) - strlen(contact_str), "%s", path_encoded);
+					}
 					free(path_encoded);
 				} else {
 					if (*received_data && sofia_test_pflag(profile, PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) {
diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index a439ab8203..78d97ce259 100644
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -340,7 +340,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
 				switch_yield(globals.delay * 1000000);
 			}
 
-			destUrl = switch_mprintf("%s?uuid=%s", globals.urls[globals.url_index], switch_core_session_get_uuid(session));
+			destUrl = switch_mprintf("%s?uuid=%s%s", globals.urls[globals.url_index], a_prefix, switch_core_session_get_uuid(session));
 			curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl);
 
 			if (!strncasecmp(destUrl, "https", 5)) {