diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java
index 07c051c074..5b2798c316 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java
@@ -104,4 +104,8 @@ public class EventConsumer {
     return (cPtr == 0) ? null : new Event(cPtr, true);
   }
 
+  public void cleanup() {
+    freeswitchJNI.EventConsumer_cleanup(swigCPtr, this);
+  }
+
 }
diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
index cc2f7f7cf7..e823332ef3 100644
--- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
+++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java
@@ -86,6 +86,7 @@ class freeswitchJNI {
   public final static native void delete_EventConsumer(long jarg1);
   public final static native int EventConsumer_bind(long jarg1, EventConsumer jarg1_, String jarg2, String jarg3);
   public final static native long EventConsumer_pop(long jarg1, EventConsumer jarg1_, int jarg2, int jarg3);
+  public final static native void EventConsumer_cleanup(long jarg1, EventConsumer jarg1_);
   public final static native void delete_CoreSession(long jarg1);
   public final static native void CoreSession_session_set(long jarg1, CoreSession jarg1_, long jarg2);
   public final static native long CoreSession_session_get(long jarg1, CoreSession jarg1_);
diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp
index 83ddb6db02..d3acab550d 100644
--- a/src/mod/languages/mod_java/switch_swig_wrap.cpp
+++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp
@@ -1687,6 +1687,17 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1p
 }
 
 
+SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1cleanup(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(EventConsumer **)&jarg1; 
+  (arg1)->cleanup();
+}
+
+
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1CoreSession(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   CoreSession *arg1 = (CoreSession *) 0 ;
   
diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index 98c50f081d..ae3211903a 100644
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -3845,6 +3845,30 @@ fail:
 }
 
 
+static int _wrap_EventConsumer_cleanup(lua_State* L) {
+  int SWIG_arg = -1;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  
+  SWIG_check_num_args("cleanup",1,1)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("cleanup",1,"EventConsumer *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_EventConsumer,0))){
+    SWIG_fail_ptr("EventConsumer_cleanup",1,SWIGTYPE_p_EventConsumer);
+  }
+  
+  (arg1)->cleanup();
+  SWIG_arg=0;
+  
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static void swig_delete_EventConsumer(void *obj) {
 EventConsumer *arg1 = (EventConsumer *) obj;
 delete arg1;
@@ -3852,6 +3876,7 @@ delete arg1;
 static swig_lua_method swig_EventConsumer_methods[] = {
     {"bind", _wrap_EventConsumer_bind}, 
     {"pop", _wrap_EventConsumer_pop}, 
+    {"cleanup", _wrap_EventConsumer_cleanup}, 
     {0,0}
 };
 static swig_lua_attribute swig_EventConsumer_attributes[] = {
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index 64f38107f7..b3754cc6b3 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -3808,6 +3808,71 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_t(void * jarg1) {
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->length = arg2;
+  
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_length_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  result = (unsigned int) ((arg1)->length);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_set(void * jarg1, unsigned int jarg2) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int arg2 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  if (arg1) (arg1)->profile = arg2;
+  
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_switch_rtp_hdr_ext_t_profile_get(void * jarg1) {
+  unsigned int jresult ;
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  unsigned int result;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  result = (unsigned int) ((arg1)->profile);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_hdr_ext_t() {
+  void * jresult ;
+  switch_rtp_hdr_ext_t *result = 0 ;
+  
+  result = (switch_rtp_hdr_ext_t *)new switch_rtp_hdr_ext_t();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_hdr_ext_t(void * jarg1) {
+  switch_rtp_hdr_ext_t *arg1 = (switch_rtp_hdr_ext_t *) 0 ;
+  
+  arg1 = (switch_rtp_hdr_ext_t *)jarg1; 
+  delete arg1;
+  
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_hdr_t_version_set(void * jarg1, unsigned int jarg2) {
   switch_rtcp_hdr_t *arg1 = (switch_rtcp_hdr_t *) 0 ;
   unsigned int arg2 ;
@@ -4741,6 +4806,17 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_ivr_dmachine_match(void * jarg1
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_MAX_ARG_RECURSION_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 25;
+  
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_input_callback_set(void * jarg1, void * jarg2) {
   switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
   switch_input_callback_function_t arg2 = (switch_input_callback_function_t) 0 ;
@@ -4879,6 +4955,29 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_input_args_t_dmachine_get(void * jar
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_input_args_t_loops_set(void * jarg1, int jarg2) {
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  int arg2 ;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  arg2 = (int)jarg2; 
+  if (arg1) (arg1)->loops = arg2;
+  
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_input_args_t_loops_get(void * jarg1) {
+  int jresult ;
+  switch_input_args_t *arg1 = (switch_input_args_t *) 0 ;
+  int result;
+  
+  arg1 = (switch_input_args_t *)jarg1; 
+  result = (int) ((arg1)->loops);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_input_args_t() {
   void * jresult ;
   switch_input_args_t *result = 0 ;
@@ -8464,6 +8563,20 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_dmachine_set_target(void * jarg1,
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_terminators(void * jarg1, char * jarg2) {
+  int jresult ;
+  switch_ivr_dmachine_t *arg1 = (switch_ivr_dmachine_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_ivr_dmachine_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (switch_status_t)switch_ivr_dmachine_set_terminators(arg1,(char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_set_codec_slin(void * jarg1, void * jarg2) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -13707,25 +13820,65 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_console_execute(char * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_toupper(int jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_toupper(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_toupper(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_tolower(unsigned long jarg1) {
+  unsigned long jresult ;
+  uint32_t arg1 ;
+  uint32_t result;
+  
+  arg1 = (uint32_t)jarg1; 
+  result = (uint32_t)switch_tolower(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_toupper_max(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_toupper_max(arg1);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_tolower_max(char * jarg1) {
+  char *arg1 = (char *) 0 ;
+  
+  arg1 = (char *)jarg1; 
+  switch_tolower_max(arg1);
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_toupper(int jarg1) {
   int jresult ;
   int arg1 ;
   int result;
   
   arg1 = (int)jarg1; 
-  result = (int)switch_toupper(arg1);
+  result = (int)old_switch_toupper(arg1);
   jresult = result; 
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_tolower(int jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_old_switch_tolower(int jarg1) {
   int jresult ;
   int arg1 ;
   int result;
   
   arg1 = (int)jarg1; 
-  result = (int)switch_tolower(arg1);
+  result = (int)old_switch_tolower(arg1);
   jresult = result; 
   return jresult;
 }
@@ -31123,13 +31276,17 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_stop_inband_dtmf_generate_session(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_session_echo(void * jarg1, void * jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_session_echo(void * jarg1, void * jarg2) {
+  int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
   switch_input_args_t *arg2 = (switch_input_args_t *) 0 ;
+  switch_status_t result;
   
   arg1 = (switch_core_session_t *)jarg1; 
   arg2 = (switch_input_args_t *)jarg2; 
-  switch_ivr_session_echo(arg1,arg2);
+  result = (switch_status_t)switch_ivr_session_echo(arg1,arg2);
+  jresult = result; 
+  return jresult;
 }
 
 
@@ -32739,6 +32896,17 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTCP_MAX_BUF_LEN_get() {
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_WORDS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int) 4094;
+  
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() {
   int jresult ;
   int result;
@@ -38250,6 +38418,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_EventConsumer_pop(void * jarg1, int jarg2,
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_EventConsumer_cleanup(void * jarg1) {
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  
+  arg1 = (EventConsumer *)jarg1; 
+  (arg1)->cleanup();
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_CoreSession(void * jarg1) {
   CoreSession *arg1 = (CoreSession *) 0 ;
   
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index 7364cce845..cced7b24ba 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -723,6 +723,10 @@ public class EventConsumer : IDisposable {
     return ret;
   }
 
+  public void cleanup() {
+    freeswitchPINVOKE.EventConsumer_cleanup(swigCPtr);
+  }
+
 }
 
 }
@@ -1541,6 +1545,11 @@ public class freeswitch {
     freeswitchPINVOKE.switch_ivr_dmachine_set_target(SWIGTYPE_p_switch_ivr_dmachine.getCPtr(dmachine), (int)target);
   }
 
+  public static switch_status_t switch_ivr_dmachine_set_terminators(SWIGTYPE_p_switch_ivr_dmachine dmachine, string terminators) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_dmachine_set_terminators(SWIGTYPE_p_switch_ivr_dmachine.getCPtr(dmachine), terminators);
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_set_codec_slin(SWIGTYPE_p_switch_core_session session, switch_slin_data data) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_set_codec_slin(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_slin_data.getCPtr(data));
     return ret;
@@ -3141,13 +3150,31 @@ public class freeswitch {
     return ret;
   }
 
-  public static int switch_toupper(int c) {
-    int ret = freeswitchPINVOKE.switch_toupper(c);
+  public static uint switch_toupper(uint eax) {
+    uint ret = freeswitchPINVOKE.switch_toupper(eax);
     return ret;
   }
 
-  public static int switch_tolower(int c) {
-    int ret = freeswitchPINVOKE.switch_tolower(c);
+  public static uint switch_tolower(uint eax) {
+    uint ret = freeswitchPINVOKE.switch_tolower(eax);
+    return ret;
+  }
+
+  public static void switch_toupper_max(string s) {
+    freeswitchPINVOKE.switch_toupper_max(s);
+  }
+
+  public static void switch_tolower_max(string s) {
+    freeswitchPINVOKE.switch_tolower_max(s);
+  }
+
+  public static int old_switch_toupper(int c) {
+    int ret = freeswitchPINVOKE.old_switch_toupper(c);
+    return ret;
+  }
+
+  public static int old_switch_tolower(int c) {
+    int ret = freeswitchPINVOKE.old_switch_tolower(c);
     return ret;
   }
 
@@ -4924,8 +4951,9 @@ public class freeswitch {
     return ret;
   }
 
-  public static void switch_ivr_session_echo(SWIGTYPE_p_switch_core_session session, switch_input_args_t args) {
-    freeswitchPINVOKE.switch_ivr_session_echo(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_input_args_t.getCPtr(args));
+  public static switch_status_t switch_ivr_session_echo(SWIGTYPE_p_switch_core_session session, switch_input_args_t args) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_session_echo(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_input_args_t.getCPtr(args));
+    return ret;
   }
 
   public static switch_status_t switch_ivr_stop_tone_detect_session(SWIGTYPE_p_switch_core_session session) {
@@ -6431,6 +6459,7 @@ public class freeswitch {
   public static readonly int SWITCH_MAX_MANAGEMENT_BUFFER_LEN = freeswitchPINVOKE.SWITCH_MAX_MANAGEMENT_BUFFER_LEN_get();
   public static readonly int SWITCH_RTP_CNG_PAYLOAD = freeswitchPINVOKE.SWITCH_RTP_CNG_PAYLOAD_get();
   public static readonly int DMACHINE_MAX_DIGIT_LEN = freeswitchPINVOKE.DMACHINE_MAX_DIGIT_LEN_get();
+  public static readonly int MAX_ARG_RECURSION = freeswitchPINVOKE.MAX_ARG_RECURSION_get();
   public static readonly int SWITCH_API_VERSION = freeswitchPINVOKE.SWITCH_API_VERSION_get();
   public static readonly int SWITCH_CORE_DB_OK = freeswitchPINVOKE.SWITCH_CORE_DB_OK_get();
   public static readonly int SWITCH_CORE_DB_ERROR = freeswitchPINVOKE.SWITCH_CORE_DB_ERROR_get();
@@ -6471,6 +6500,7 @@ public class freeswitch {
   public static readonly int SWITCH_RESAMPLE_QUALITY = freeswitchPINVOKE.SWITCH_RESAMPLE_QUALITY_get();
   public static readonly int SWITCH_RTP_MAX_BUF_LEN = freeswitchPINVOKE.SWITCH_RTP_MAX_BUF_LEN_get();
   public static readonly int SWITCH_RTCP_MAX_BUF_LEN = freeswitchPINVOKE.SWITCH_RTCP_MAX_BUF_LEN_get();
+  public static readonly int SWITCH_RTP_MAX_BUF_LEN_WORDS = freeswitchPINVOKE.SWITCH_RTP_MAX_BUF_LEN_WORDS_get();
   public static readonly int SWITCH_RTP_MAX_CRYPTO_LEN = freeswitchPINVOKE.SWITCH_RTP_MAX_CRYPTO_LEN_get();
   public static readonly int SWITCH_RTP_KEY_LEN = freeswitchPINVOKE.SWITCH_RTP_KEY_LEN_get();
   public static readonly string SWITCH_RTP_CRYPTO_KEY_32 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_32_get();
@@ -7570,6 +7600,24 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_rtp_hdr_t")]
   public static extern void delete_switch_rtp_hdr_t(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_hdr_ext_t_length_set")]
+  public static extern void switch_rtp_hdr_ext_t_length_set(HandleRef jarg1, uint jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_hdr_ext_t_length_get")]
+  public static extern uint switch_rtp_hdr_ext_t_length_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_hdr_ext_t_profile_set")]
+  public static extern void switch_rtp_hdr_ext_t_profile_set(HandleRef jarg1, uint jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_hdr_ext_t_profile_get")]
+  public static extern uint switch_rtp_hdr_ext_t_profile_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_new_switch_rtp_hdr_ext_t")]
+  public static extern IntPtr new_switch_rtp_hdr_ext_t();
+
+  [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_rtp_hdr_ext_t")]
+  public static extern void delete_switch_rtp_hdr_ext_t(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtcp_hdr_t_version_set")]
   public static extern void switch_rtcp_hdr_t_version_set(HandleRef jarg1, uint jarg2);
 
@@ -7807,6 +7855,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_ivr_dmachine_match")]
   public static extern void delete_switch_ivr_dmachine_match(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_MAX_ARG_RECURSION_get")]
+  public static extern int MAX_ARG_RECURSION_get();
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_input_args_t_input_callback_set")]
   public static extern void switch_input_args_t_input_callback_set(HandleRef jarg1, HandleRef jarg2);
 
@@ -7843,6 +7894,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_input_args_t_dmachine_get")]
   public static extern IntPtr switch_input_args_t_dmachine_get(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_input_args_t_loops_set")]
+  public static extern void switch_input_args_t_loops_set(HandleRef jarg1, int jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_input_args_t_loops_get")]
+  public static extern int switch_input_args_t_loops_get(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_new_switch_input_args_t")]
   public static extern IntPtr new_switch_input_args_t();
 
@@ -8695,6 +8752,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_dmachine_set_target")]
   public static extern void switch_ivr_dmachine_set_target(HandleRef jarg1, int jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_dmachine_set_terminators")]
+  public static extern int switch_ivr_dmachine_set_terminators(HandleRef jarg1, string jarg2);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_set_codec_slin")]
   public static extern int switch_core_session_set_codec_slin(HandleRef jarg1, HandleRef jarg2);
 
@@ -9890,10 +9950,22 @@ class freeswitchPINVOKE {
   public static extern int switch_console_execute(string jarg1, int jarg2, HandleRef jarg3);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_toupper")]
-  public static extern int switch_toupper(int jarg1);
+  public static extern uint switch_toupper(uint jarg1);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_tolower")]
-  public static extern int switch_tolower(int jarg1);
+  public static extern uint switch_tolower(uint jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_toupper_max")]
+  public static extern void switch_toupper_max(string jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_tolower_max")]
+  public static extern void switch_tolower_max(string jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_old_switch_toupper")]
+  public static extern int old_switch_toupper(int jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_old_switch_tolower")]
+  public static extern int old_switch_tolower(int jarg1);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_isalnum")]
   public static extern int switch_isalnum(int jarg1);
@@ -14003,7 +14075,7 @@ class freeswitchPINVOKE {
   public static extern int switch_ivr_stop_inband_dtmf_generate_session(HandleRef jarg1);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_session_echo")]
-  public static extern void switch_ivr_session_echo(HandleRef jarg1, HandleRef jarg2);
+  public static extern int switch_ivr_session_echo(HandleRef jarg1, HandleRef jarg2);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_stop_tone_detect_session")]
   public static extern int switch_ivr_stop_tone_detect_session(HandleRef jarg1);
@@ -14296,6 +14368,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTCP_MAX_BUF_LEN_get")]
   public static extern int SWITCH_RTCP_MAX_BUF_LEN_get();
 
+  [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_BUF_LEN_WORDS_get")]
+  public static extern int SWITCH_RTP_MAX_BUF_LEN_WORDS_get();
+
   [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get")]
   public static extern int SWITCH_RTP_MAX_CRYPTO_LEN_get();
 
@@ -15598,6 +15673,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_EventConsumer_pop")]
   public static extern IntPtr EventConsumer_pop(HandleRef jarg1, int jarg2, int jarg3);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_EventConsumer_cleanup")]
+  public static extern void EventConsumer_cleanup(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_delete_CoreSession")]
   public static extern void delete_CoreSession(HandleRef jarg1);
 
@@ -28935,6 +29013,16 @@ public class switch_input_args_t : IDisposable {
     } 
   }
 
+  public int loops {
+    set {
+      freeswitchPINVOKE.switch_input_args_t_loops_set(swigCPtr, value);
+    } 
+    get {
+      int ret = freeswitchPINVOKE.switch_input_args_t_loops_get(swigCPtr);
+      return ret;
+    } 
+  }
+
   public switch_input_args_t() : this(freeswitchPINVOKE.new_switch_input_args_t(), true) {
   }
 
@@ -31581,7 +31669,8 @@ public enum switch_rtp_bug_flag_t {
   RTP_BUG_IGNORE_DTMF_DURATION = (1 << 6),
   RTP_BUG_ACCEPT_ANY_PACKETS = (1 << 7),
   RTP_BUG_GEN_ONE_GEN_ALL = (1 << 8),
-  RTP_BUG_CHANGE_SSRC_ON_MARKER = (1 << 9)
+  RTP_BUG_CHANGE_SSRC_ON_MARKER = (1 << 9),
+  RTP_BUG_FLUSH_JB_ON_DTMF = (1 << 10)
 }
 
 }
@@ -31796,6 +31885,73 @@ namespace FreeSWITCH.Native {
 using System;
 using System.Runtime.InteropServices;
 
+public class switch_rtp_hdr_ext_t : IDisposable {
+  private HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal switch_rtp_hdr_ext_t(IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(switch_rtp_hdr_ext_t obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~switch_rtp_hdr_ext_t() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchPINVOKE.delete_switch_rtp_hdr_ext_t(swigCPtr);
+      }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
+      GC.SuppressFinalize(this);
+    }
+  }
+
+  public uint length {
+    set {
+      freeswitchPINVOKE.switch_rtp_hdr_ext_t_length_set(swigCPtr, value);
+    } 
+    get {
+      uint ret = freeswitchPINVOKE.switch_rtp_hdr_ext_t_length_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public uint profile {
+    set {
+      freeswitchPINVOKE.switch_rtp_hdr_ext_t_profile_set(swigCPtr, value);
+    } 
+    get {
+      uint ret = freeswitchPINVOKE.switch_rtp_hdr_ext_t_profile_get(swigCPtr);
+      return ret;
+    } 
+  }
+
+  public switch_rtp_hdr_ext_t() : this(freeswitchPINVOKE.new_switch_rtp_hdr_ext_t(), true) {
+  }
+
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class switch_rtp_hdr_t : IDisposable {
   private HandleRef swigCPtr;
   protected bool swigCMemOwn;
diff --git a/src/mod/languages/mod_perl/freeswitch.pm b/src/mod/languages/mod_perl/freeswitch.pm
index 17fdc67677..db70730429 100644
--- a/src/mod/languages/mod_perl/freeswitch.pm
+++ b/src/mod/languages/mod_perl/freeswitch.pm
@@ -359,6 +359,7 @@ sub DESTROY {
 
 *bind = *freeswitchc::EventConsumer_bind;
 *pop = *freeswitchc::EventConsumer_pop;
+*cleanup = *freeswitchc::EventConsumer_cleanup;
 sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index e2ffffeea9..a5517280a7 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -4877,6 +4877,33 @@ XS(_wrap_EventConsumer_pop) {
 }
 
 
+XS(_wrap_EventConsumer_cleanup) {
+  {
+    EventConsumer *arg1 = (EventConsumer *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: EventConsumer_cleanup(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_EventConsumer, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_cleanup" "', argument " "1"" of type '" "EventConsumer *""'"); 
+    }
+    arg1 = reinterpret_cast< EventConsumer * >(argp1);
+    (arg1)->cleanup();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_delete_CoreSession) {
   {
     CoreSession *arg1 = (CoreSession *) 0 ;
@@ -9728,6 +9755,7 @@ static swig_command_info swig_commands[] = {
 {"freeswitchc::delete_EventConsumer", _wrap_delete_EventConsumer},
 {"freeswitchc::EventConsumer_bind", _wrap_EventConsumer_bind},
 {"freeswitchc::EventConsumer_pop", _wrap_EventConsumer_pop},
+{"freeswitchc::EventConsumer_cleanup", _wrap_EventConsumer_cleanup},
 {"freeswitchc::delete_CoreSession", _wrap_delete_CoreSession},
 {"freeswitchc::CoreSession_session_set", _wrap_CoreSession_session_set},
 {"freeswitchc::CoreSession_session_get", _wrap_CoreSession_session_get},
diff --git a/src/mod/languages/mod_python/freeswitch.py b/src/mod/languages/mod_python/freeswitch.py
index 51e3e652f6..ab154fd814 100644
--- a/src/mod/languages/mod_python/freeswitch.py
+++ b/src/mod/languages/mod_python/freeswitch.py
@@ -227,6 +227,7 @@ class EventConsumer(_object):
     __del__ = lambda self : None;
     def bind(*args): return _freeswitch.EventConsumer_bind(*args)
     def pop(*args): return _freeswitch.EventConsumer_pop(*args)
+    def cleanup(*args): return _freeswitch.EventConsumer_cleanup(*args)
 EventConsumer_swigregister = _freeswitch.EventConsumer_swigregister
 EventConsumer_swigregister(EventConsumer)
 
diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp
index b12d4c7614..d5e9950328 100644
--- a/src/mod/languages/mod_python/mod_python_wrap.cpp
+++ b/src/mod/languages/mod_python/mod_python_wrap.cpp
@@ -5581,6 +5581,27 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_EventConsumer_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  EventConsumer *arg1 = (EventConsumer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:EventConsumer_cleanup",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_EventConsumer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_cleanup" "', argument " "1"" of type '" "EventConsumer *""'"); 
+  }
+  arg1 = reinterpret_cast< EventConsumer * >(argp1);
+  (arg1)->cleanup();
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *EventConsumer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -9256,6 +9277,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_EventConsumer", _wrap_delete_EventConsumer, METH_VARARGS, NULL},
 	 { (char *)"EventConsumer_bind", _wrap_EventConsumer_bind, METH_VARARGS, NULL},
 	 { (char *)"EventConsumer_pop", _wrap_EventConsumer_pop, METH_VARARGS, NULL},
+	 { (char *)"EventConsumer_cleanup", _wrap_EventConsumer_cleanup, METH_VARARGS, NULL},
 	 { (char *)"EventConsumer_swigregister", EventConsumer_swigregister, METH_VARARGS, NULL},
 	 { (char *)"delete_CoreSession", _wrap_delete_CoreSession, METH_VARARGS, NULL},
 	 { (char *)"CoreSession_session_set", _wrap_CoreSession_session_set, METH_VARARGS, NULL},