Merge branch 'signalwire:master' into mod_callcenter-fix-callcenter_track_single_agent

2023-04-11 10:14:37 +01:00 · 2023-04-11 10:14:37 +01:00 · ddb8018041
parent 2cf7d943aa 4d3b0a5778
commit ddb8018041
2311 changed files with 73609 additions and 402640 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -4,45 +4,67 @@ name: unit-tests

 steps:
    - name: bootstrap
-      image: signalwire/freeswitch-public-base
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
      commands:
      - cat /proc/sys/kernel/core_pattern
      - ./bootstrap.sh -j

    - name: configure
-      image: signalwire/freeswitch-public-base
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
      commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
-      - echo "applications/mod_test" >> modules.conf
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
+      - git clone https://github.com/freeswitch/sofia-sip.git
+      - cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
      - echo 'codecs/mod_openh264' >> modules.conf
      - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
      - sed -i '/event_handlers\\/mod_rayo/s/^#//g' modules.conf
      - sed -i '/formats\\/mod_opusfile/s/^#//g' modules.conf
      - sed -i '/languages\\/mod_lua/s/^#//g' modules.conf
-      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1;
-      - ./configure --enable-address-sanitizer
+      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
+      - ./configure --enable-address-sanitizer --enable-fake-dlclose

    - name: build
-      image: signalwire/freeswitch-public-base
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
      commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
+      - cd sofia-sip && make install && cd ..
      - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
      - chmod +x build.sh
      - ./build.sh

    - name: run-tests
-      image: signalwire/freeswitch-public-base
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
      commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
-      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
+      - cd sofia-sip && make install && cd ..
      - make install || true
      - cd tests/unit
+      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
      - ./run-tests.sh
      - ls -la /cores
      - mkdir logs && (mv log_run-tests_*.html logs || true) && (mv backtrace_*.txt logs || true)
@ -53,7 +75,7 @@ steps:

    - name: notify
      image: signalwire/drone-notify
-      pull: true
+      pull: always
      environment:
        SLACK_WEBHOOK_URL:
          from_secret: slack_webhook_url
@ -75,17 +97,23 @@ name: scan-build

 steps:
    - name: bootstrap
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
      commands:
      - ./bootstrap.sh -j

    - name: configure
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
      commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
      - cp build/modules.conf.most modules.conf
      #Enable/Uncomment mods
      - echo 'codecs/mod_openh264' >> modules.conf
@ -112,13 +140,19 @@ steps:
      - ./configure

    - name: scan-build
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base:bullseye
+      pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
      commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
      - mkdir -p scan-build
-      - echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
+      - echo '#!/bin/bash\nscan-build-11 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
      - chmod +x scan.sh
      - ./scan.sh
      - exitstatus=`cat ./scan-build-status.txt`
@ -126,7 +160,7 @@ steps:

    - name: notify
      image: signalwire/drone-notify
-      pull: true
+      pull: always
      environment:
        SLACK_WEBHOOK_URL:
          from_secret: slack_webhook_url
@ -135,7 +169,6 @@ steps:
      commands:
      - /root/scan-build-notify.sh

-      
 trigger:
  branch:
  - master
@ -145,6 +178,6 @@ trigger:

 ---
 kind: signature
-hmac: af77439b382612b49140cb95f04d6d695e0a188c411ae227abcba205bf96bab9
+hmac: 780e4aaee61e3683ea4a8d6fe5131f7c9e62ebad727546013f18df0fca80d705

 ...
--- a/.gitignore
+++ b/.gitignore
@ -102,6 +102,7 @@ Release/
 /build/config/ltmain.sh
 /build/config/missing
 /build/freeswitch.pc
+/build/standalone_module/freeswitch.pc
 /build/getlib.sh
 /build/getg729.sh
 /build/getsounds.sh
@ -115,15 +116,6 @@ Release/
 /libs/esl/fs_ivrd
 /libs/esl/testclient
 /libs/esl/testserver
-/libs/freetdm/detect_dtmf
-/libs/freetdm/detect_tones
-/libs/freetdm/testanalog
-/libs/freetdm/testapp
-/libs/freetdm/testcid
-/libs/freetdm/testpri
-/libs/freetdm/testr2
-/libs/freetdm/testsangomaboost
-/libs/freetdm/testtones
 /libs/fsg729-*-installer
 /libs/g729/
 /libs/libcodec2/compile
@ -165,6 +157,7 @@ Release/
 /src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
 /src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
 /src/mod/languages/mod_python/mod_python_wrap.cpp.orig
+/src/mod/languages/mod_python3/mod_python_wrap.cpp.orig
 /src/mod/say/mod_say_de/Makefile
 /src/mod/say/mod_say_es/Makefile
 /src/mod/say/mod_say_fr/Makefile
@ -273,9 +266,18 @@ src/mod/applications/mod_http_cache/test/test_aws.log
 src/mod/applications/mod_http_cache/test/test_aws.trs
 src/mod/formats/mod_sndfile/test/test_sndfile
 src/mod/formats/mod_sndfile/test/test_sndfile_conf
+src/mod/formats/mod_ssml/test/test_tts_format
 src/mod/*/*/test/*.log
 src/mod/*/*/test/*.trs
 src/mod/*/*/test/[0-9]*/*
 test-suite.log
 src/mod/applications/mod_av/test/test_BT7.mp4
 src/mod/applications/mod_av/test/test_RGB.mp4
+images/test-argb.png
+images/test-rgb.png
+images/test.png
+images/test_patched.png
+images/test_text.png
+
+src/mod/codecs/mod_amrwb/test/test_amrwb
+src/mod/endpoints/mod_sofia/test/sipp-based-tests
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@ -69,7 +69,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\conference.conf.xml = conf\vanilla\autoload_configs\conference.conf.xml
 		conf\vanilla\autoload_configs\console.conf.xml = conf\vanilla\autoload_configs\console.conf.xml
 		conf\vanilla\autoload_configs\dialplan_directory.conf.xml = conf\vanilla\autoload_configs\dialplan_directory.conf.xml
-		conf\vanilla\autoload_configs\dingaling.conf.xml = conf\vanilla\autoload_configs\dingaling.conf.xml
 		conf\vanilla\autoload_configs\enum.conf.xml = conf\vanilla\autoload_configs\enum.conf.xml
 		conf\vanilla\autoload_configs\event_multicast.conf.xml = conf\vanilla\autoload_configs\event_multicast.conf.xml
 		conf\vanilla\autoload_configs\event_socket.conf.xml = conf\vanilla\autoload_configs\event_socket.conf.xml
@ -166,8 +165,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3DAF028C-AB5B-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sound Files", "Sound Files", "{4F227C26-768F-46A3-8684-1D08A46FB374}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unimrcp", "unimrcp", "{62F27B1A-C919-4A70-8478-51F178F3B18F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.2017.vcxproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2017.vcxproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
@ -198,8 +195,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.2017.vcxproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.2017.vcxproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.2017.vcxproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_console", "src\mod\loggers\mod_console\mod_console.2017.vcxproj", "{1C453396-D912-4213-89FD-9B489162B7B5}"
@ -217,20 +212,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\appl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.2017.vcxproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.2017.vcxproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.2017.vcxproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "libs\win32\sqlite\sqlite.2017.vcxproj", "{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2017.vcxproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.2017.vcxproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.2017.vcxproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2017.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2017.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthread\pthread.2017.vcxproj", "{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}"
@ -380,29 +369,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbroadvoice", "libs\win32
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mod_bv\mod_bv.2017.vcxproj", "{D5C87B19-150D-4EF3-A671-96589BD2D14A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\unimrcp\libs\apr-toolkit\aprtoolkit.2017.vcxproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\unimrcp\libs\mpf\mpf.2017.vcxproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\unimrcp\libs\mrcp\mrcp.2017.vcxproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\unimrcp\libs\mrcp-client\mrcpclient.2017.vcxproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\unimrcp\libs\mrcp-signaling\mrcpsignaling.2017.vcxproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\unimrcp\libs\mrcpv2-transport\mrcpv2transport.2017.vcxproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\unimrcp\libs\uni-rtsp\unirtsp.2017.vcxproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\unimrcp\modules\mrcp-sofiasip\mrcpsofiasip.2017.vcxproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp\modules\mrcp-unirtsp\mrcpunirtsp.2017.vcxproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"
@ -451,8 +417,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "src\mod\endpoints
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsmopen", "src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj", "{74B120FF-6935-4DFE-A142-CDB6BEA99C90}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzrtp", "libs\libzrtp\projects\win\libzrtp.2017.vcxproj", "{C13CC324-0032-4492-9A30-310A6BD64FF5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_redis", "src\mod\applications\mod_redis\mod_redis.2017.vcxproj", "{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libs\win32\libjpeg\libjpeg.2017.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}"
@ -752,17 +716,6 @@ Global
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.Build.0 = Release|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.Build.0 = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|Win32.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.Build.0 = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.Build.0 = Debug|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.ActiveCfg = Debug|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.Build.0 = Debug|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.ActiveCfg = Release|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.Build.0 = Release|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.Build.0 = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|Win32.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.Build.0 = Release|x64
@ -840,17 +793,6 @@ Global
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.Build.0 = Release|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|Win32.ActiveCfg = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.ActiveCfg = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.Build.0 = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.Build.0 = Debug|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.ActiveCfg = Release|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.Build.0 = Release|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.ActiveCfg = Release|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.Build.0 = Release|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|Win32.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.Build.0 = Release Dll|x64
@ -884,17 +826,6 @@ Global
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.Build.0 = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|Win32.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.Build.0 = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.Build.0 = Debug|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.Build.0 = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|Win32.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.Build.0 = Release|x64
@ -906,17 +837,6 @@ Global
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.Build.0 = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.Build.0 = Release|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|Win32.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.Build.0 = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.Build.0 = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@ -1697,116 +1617,6 @@ Global
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.Build.0 = Debug|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.Build.0 = Release|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.ActiveCfg = Debug|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.Build.0 = Debug|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.ActiveCfg = Release|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.Build.0 = Release|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.ActiveCfg = Debug|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.Build.0 = Debug|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.ActiveCfg = Release|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.Build.0 = Release|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.ActiveCfg = Debug|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.Build.0 = Debug|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.ActiveCfg = Release|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.Build.0 = Release|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.ActiveCfg = Debug|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.Build.0 = Debug|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.ActiveCfg = Release|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.Build.0 = Release|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.ActiveCfg = Debug|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.Build.0 = Debug|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.ActiveCfg = Release|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.Build.0 = Release|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.Build.0 = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.ActiveCfg = Debug|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.Build.0 = Debug|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.ActiveCfg = Release|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.Build.0 = Release|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.ActiveCfg = Debug|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.Build.0 = Debug|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.ActiveCfg = Release|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.Build.0 = Release|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.ActiveCfg = Debug|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.Build.0 = Debug|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.Build.0 = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64
@ -2053,17 +1863,6 @@ Global
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.Build.0 = Release|Win32
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.Build.0 = Release|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.Build.0 = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x64.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.Build.0 = Debug|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.ActiveCfg = Debug|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.Build.0 = Debug|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.Build.0 = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.ActiveCfg = Release|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.Build.0 = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|Win32.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.Build.0 = Release|x64
@ -2739,7 +2538,6 @@ Global
 		{713E4747-1126-40B1-BD84-58F9A7745423} = {57199684-EC63-4A60-9DC6-11815AF6B413}
 		{F1B71990-EB04-4EB5-B28A-BC3EB6F7E843} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}
 		{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}
-		{62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
@ -2753,7 +2551,6 @@ Global
 		{8B754330-A434-4791-97E5-1EE67060BAC0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
@ -2761,13 +2558,10 @@ Global
 		{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
-		{1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
@ -2840,16 +2634,6 @@ Global
 		{432DB165-1EB2-4781-A9C0-71E62610B20A} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
@ -2873,7 +2657,6 @@ Global
 		{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
-		{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}
--- a/40
+++ b/40
@ -3,8 +3,8 @@ Upstream-Name: freeswitch
 Source: https://freeswitch.org/

 Files: *
-Copyright: 2005-2014 Anthony Minessale II <anthm@freeswitch.org>
- 2005-2014 Anthony Minessale II
+Copyright: 2005-2022 Anthony Minessale II <anthm@freeswitch.org>
+ 2005-2022 Anthony Minessale II
 License: MPL-1.1
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
@ -1011,12 +1011,6 @@ License: MPL-1.1 or GPL-2+
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]

-Files: libs/unimrcp/*
-Copyright: 2008-2010 Arsen Chaloyan
- 2009-2010 Tomas Valenta, Arsen Chaloyan
- 2001-2006 Steve Underwood
-License: Apache-2.0
-
 Files: */inet_pton.c
 libs/curl/lib/inet_ntop.c
 libs/curl/lib/mprintf.c
@ -1595,15 +1589,6 @@ Files: libs/silk/*
 Copyright: 2006-2011, Skype Limited.
 License: BSD-2-clause

-Files: libs/libdingaling/*
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- 2001-2003 Allan Saddi <allan@saddi.com>
-License: MPL-1.1
-
-Files: libs/libdingaling/src/sha1.[ch]
-Copyright: 2001-2003 Allan Saddi <allan@saddi.com>
-License: BSD-2-clause
-
 Files: libs/libcodec2/*
 Copyright: 1990-2010 David Rowe
 1990-2010 David Rowe 2009
@ -1724,27 +1709,6 @@ License: LGPL-2.1
 Files: libs/broadvoice/autogen.sh
 License: GPL-2

-Files: libs/libzrtp/*
-Copyright: 2006-2012 Philip R. Zimmermann.
- 1993-2005 Colin Plumb
- 1998-2006, Dr Brian Gladman, Worcester, UK.
- 2002, Bryce "Zooko" Wilcox-O'Hearn
- 2010 Soft Industry
-License: AGPL-3 or MPL-1.1
-
-Files: libs/libzrtp/test/cmockery/cmockery.c
-Copyright: 2008 Google Inc
-License: Apache-2.0
-
-Files: libs/libzrtp/third_party/bnlib/legal.c
- libs/libzrtp/third_party/bnlib/*
-Copyright: 1993-2005 Colin Plumb
-License: GPL-2 or GPL-3 or MPL-1.1
-
-Files: libs/libzrtp/third_party/bnlib/test/md5.c
-Copyright: 1995 Abandoned Colin Plumb
-License: public-domain
-
 Files: libs/win32/sqlite/sqlite3.[ch]
 libs/win32/sqlite/parse.c
 Copyright: 2006 Abandoned D. Richard Hipp <drh@hwaci.com>
--- a/Makefile.am
+++ b/Makefile.am
@ -15,16 +15,6 @@ AM_LIBAPR_CPPFLAGS := $(shell ./libs/apr/apr-1-config --cppflags --includes)
 AM_LIBAPR_LDFLAGS := $(shell ./libs/apr/apr-1-config --ldflags)
 AM_LIBAPR_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr/apr-1-config \--libs))
 endif
-if SYSTEM_APRUTIL
-AM_LIBAPU_CPPFLAGS := $(shell apu-1-config --includes)
-AM_LIBAPU_LDFLAGS := $(shell apu-1-config --ldflags)
-AM_LIBAPU_LIBS := $(shell apu-1-config \--libs)
-AM_LIBAPU_LINKLIBTOOL := $(shell apu-1-config \--link-libtool)
-else
-AM_LIBAPU_CPPFLAGS := $(shell ./libs/apr-util/apu-1-config --includes)
-AM_LIBAPU_LDFLAGS := $(shell ./libs/apr-util/apu-1-config --ldflags)
-AM_LIBAPU_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr-util/apu-1-config \--libs))
-endif


 AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) 
@ -141,11 +131,6 @@ CORE_LIBS=
 if ENABLE_LIBVPX
 CORE_LIBS += libs/libvpx/libvpx.a
 endif
-if SYSTEM_APRUTIL
-CORE_LIBS += $(AM_LIBAPU_LINKLIBTOOL)
-else
-CORE_LIBS +=  libs/apr-util/libaprutil-1.la
-endif
 if SYSTEM_APR
 CORE_LIBS += $(AM_LIBAPR_LINKLIBTOOL)
 else
@ -248,7 +233,7 @@ endif
 lib_LTLIBRARIES	         = libfreeswitch.la
 libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(SOFIA_SIP_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
-libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
+libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(SYSTEMD_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)

 if HAVE_PNG
@ -259,19 +244,6 @@ if HAVE_ODBC
 libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
 endif

-if ENABLE_ZRTP
-CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bgaes
-CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bnlib
-CORE_CFLAGS += -isystem $(switch_srcdir)/libs/libzrtp/include
-ZRTP_LDFLAGS = -L$(switch_srcdir)/libs/libzrtp/third_party/bnlib
-ZRTP_LDFLAGS += -L$(switch_srcdir)/libs/libzrtp
-ZRTP_LIBS = -lbn -lzrtp
-libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
-libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
-CORE_LIBS += libs/libzrtp/libzrtp.a
-LIBS += libs/libzrtp/third_party/bnlib/libbn.a
-endif
-
 library_includetestdir = $(includedir)/test
 library_includetest_HEADERS = \
 	src/include/test/switch_fct.h \
@ -300,6 +272,7 @@ library_include_HEADERS = \
 	src/include/switch_dso.h \
 	src/include/switch_loadable_module.h \
 	src/include/switch_module_interfaces.h \
+	src/include/switch_packetizer.h \
 	src/include/switch_platform.h \
 	src/include/switch_resample.h \
 	src/include/switch_regex.h \
@ -309,6 +282,7 @@ library_include_HEADERS = \
 	src/include/switch_jitterbuffer.h \
 	src/include/switch_estimators.h \
 	src/include/switch_rtcp_frame.h \
+	src/include/switch_spandsp.h \
 	src/include/switch_stun.h \
 	src/include/switch_nat.h \
 	src/include/switch_log.h \
@ -338,6 +312,7 @@ nodist_libfreeswitch_la_SOURCES = \

 libfreeswitch_la_SOURCES = \
 	src/switch_apr.c \
+	src/switch_apr_queue.c \
 	src/switch_buffer.c \
 	src/switch_caller.c \
 	src/switch_channel.c \
@ -364,6 +339,7 @@ libfreeswitch_la_SOURCES = \
 	src/switch_version.c \
 	src/switch_core_media.c \
 	src/switch_core_video.c \
+	src/switch_packetizer.c \
 	src/switch_sdp.c \
 	src/switch_scheduler.c \
 	src/switch_core_db.c \
@ -383,6 +359,7 @@ libfreeswitch_la_SOURCES = \
 	src/switch_ivr_say.c \
 	src/switch_ivr_menu.c \
 	src/switch_ivr.c \
+	src/switch_spandsp.c \
 	src/switch_stun.c \
 	src/switch_nat.c \
 	src/switch_log.c \
@ -580,9 +557,6 @@ src/include/switch_version.h: src/include/switch_version.h.in Makefile $(switch_
 libs/libedit/src/.libs/libedit.a:
 	cd libs/libedit && $(MAKE)

-libs/libzrtp/libzrtp.a:
-	cd libs/libzrtp && $(MAKE)
-
 libs/libvpx/Makefile: libs/libvpx/.update
 	cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(VISIBILITY_FLAG)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384

@ -596,17 +570,15 @@ libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr
 libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
 	@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep  "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi

-libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
-	@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep  "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi
-
-SRTP_SRC =	libs/srtp/srtp/srtp.c libs/srtp/srtp/ekt.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
+SRTP_SRC =	libs/srtp/srtp/srtp.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
 		libs/srtp/crypto/cipher/aes.c libs/srtp/crypto/cipher/aes_icm.c \
 		libs/srtp/crypto/hash/null_auth.c libs/srtp/crypto/hash/sha1.c \
 		libs/srtp/crypto/hash/hmac.c libs/srtp/crypto/hash/auth.c \
-		libs/srtp/crypto/math/datatypes.c libs/srtp/crypto/math/stat.c \
+		libs/srtp/crypto/math/datatypes.c \
 		libs/srtp/crypto/kernel/crypto_kernel.c libs/srtp/crypto/kernel/alloc.c \
 		libs/srtp/crypto/kernel/key.c libs/srtp/crypto/kernel/err.c \
-		libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c libs/srtp/crypto/replay/ut_sim.c 
+		libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c \
+		libs/srtp/crypto/cipher/cipher_test_cases.c libs/srtp/crypto/hash/auth_test_cases.c

 libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update $(SRTP_SRC)
 	touch $(switch_srcdir)/src/include/switch.h
@ -697,7 +669,7 @@ yesdepends:
 	rm .nodepends

 iksemel-dep:
-	make -C src/mod/endpoints/mod_dingaling deps
+	make -C src/mod/formats/mod_ssml deps

 core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) 
 	$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
@ -741,11 +713,11 @@ pristine:
 	git clean -fdx
 	git reset --hard

-update-clean: clean python-reconf
+update-clean: clean python-reconf python3-reconf
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean

-swigall:
+swigall: src/include/switch_swigable_cpp.h
 	@echo reswigging all
 	sh $(switch_srcdir)/build/swigall.sh

@ -758,6 +730,10 @@ python-reconf:
 	rm -f src/mod/languages/mod_python/Makefile
 	./config.status

+python3-reconf:
+	rm -f src/mod/languages/mod_python3/Makefile
+	./config.status
+
 reconf:
 	rm config.cache
 	sh ./config.status --recheck
@ -773,7 +749,7 @@ iks-reconf:
 	cd libs/iksemel && $(MAKE) clean
 	cd libs/iksemel && autoreconf -fi
 	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	$(MAKE) mod_dingaling-clean
+	$(MAKE) mod_ssml-clean

 cluecon:
 	@clear
--- a/README.md
+++ b/README.md
@ -6,9 +6,9 @@ Visit  [https://signalwire.com](https://signalwire.com/)  or https://github.com/

 ## Getting Started

-FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format.  You can checkout the development branch and build for many poplular platforms including Linux, Windows, MacOSX and BSD.  There is an issue tracker and pull request system available as part of the repo online.
+FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format.  You can checkout the development branch and build for many popular platforms including Linux, Windows, MacOSX and BSD.  There is an issue tracker and pull request system available as part of the repo online.

-See [https://freeswitch.com/#getting-started](https://freeswitch.com/#getting-started) for more detailed instructions.
+See https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/ for more detailed instructions.

 ## Additional Help

@ -24,15 +24,26 @@ The main index for documentation is available at:

  * https://freeswitch.org/confluence/

+
 ### Release notes:

  * https://freeswitch.org/confluence/display/FREESWITCH/Release+Notes

-### Installation
+### Install from packages

-Step by step tutorials to install FreeSWITCH from packages or source code are available at:
+Step by step tutorials to install FreeSWITCH from packages:

-  * [Debian 10 Buster](https://freeswitch.org/confluence/display/FREESWITCH/Debian+10+Buster) [<b>Recommended</b>]
+  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian) [<b>Recommended</b>]
+  * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
+  * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)
+
+### Build from source
+
+Example Dockerfiles to build FreeSWITCH and dependencies from source:
+  * https://github.com/signalwire/freeswitch/tree/master/docker/examples
+
+Step by step tutorials to build FreeSWITCH with provided dependency packages:
+  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian#Debian-buildfromsource) [<b>Recommended</b>]
  * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
  * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)

--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Send an e-mail to security@signalwire.com to report a vulnerability. If accepted, we'll create a security advisory and add you and your team as collaborators. Please allow our team sufficient time to resolve the vulnerability before disclosing it; we'll remain in contact about the fix and may ask for your assistance to verify it is resolved.
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -10,7 +10,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm unimrcp fs";
+SUBDIRS="apr iksemel srtp fs";

 while getopts 'jhd:v' o; do 
  case "$o" in
@ -170,13 +170,6 @@ bootstrap_apr() {
  # Remove autoconf 2.5x's cache directory
  rm -rf autom4te*.cache

-  echo "Entering directory ${LIBDIR}/apr-util"
-  cd ${LIBDIR}/apr-util
-  ./buildconf
-}
-
-bootstrap_libzrtp() {
-  (cd ${LIBDIR}/libzrtp && ./bootstrap.sh)
 }

 # Libs automake automation function
@ -263,7 +256,7 @@ bootstrap_libs_post() {
 bootstrap_libs() {
  for i in ${SUBDIRS}; do
    case "$i" in
-      apr|fs|libzrtp)
+      apr|fs)
        ${BGJOB} && wait
        bootstrap_$i
        continue
--- a/build/buildmrcpserver.sh
+++ b/build/buildmrcpserver.sh
@ -1,6 +0,0 @@
-#!/bin/sh
-base=`pwd`
-cd libs/unimrcp
-./configure --with-pocketsphinx=$base/libs/pocketsphinx-0.5.99 --with-sphinxbase=$base/libs/sphinxbase-0.4.99 --with-flite=$base/libs/flite-1.3.99 --with-apr=$base/libs/apr --with-apr-util=$base/libs/apr-util --with-sofia-sip=$base/libs/sofia-sip --prefix=/usr/local/unimrcpserver --enable-pocketsphinx-plugin --enable-flite-plugin --disable-demosynth-plugin --disable-demorecog-plugin --disable-recorder-plugin --disable-cepstral-plugin
-make
-make install
--- a/build/buildzrtp.sh
+++ b/build/buildzrtp.sh
@ -1,8 +0,0 @@
-#!/bin/sh
-tar zxf libzrtp-0.81.514.tar.gz
-cd libzrtp-0.81.514
-patch -p1 < ../patches/zrtp_bnlib_pic.diff
-cd projects/gnu/
-./configure CFLAGS="-fPIC"
-make
-make install
--- a/build/freeswitch.service
+++ b/build/freeswitch.service
@ -4,6 +4,10 @@ After=syslog.target network.target
 After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.service httpd.service

 [Service]
+# You can use Type=notify only if you compile FreeSWITCH with --enable-systemd configure option
+# In this case you have to run FreeSWITCH in foreground mode (-nf option)!
+#Type=notify
+#NotifyAccess=main
 User=freeswitch
 EnvironmentFile=-/etc/sysconfig/freeswitch
 # RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf
--- a/build/modcheck.sh
+++ b/build/modcheck.sh
@ -21,8 +21,8 @@ cd $here
 for i in $files ; do
    mod=${i%%.*}

-    infile=`grep ^.*$mod\$ ../modules.conf | grep -v ftmod_`
-    commented=`grep ^\#.*$mod\$ ../modules.conf | grep -v ftmod_`
+    infile=`grep -E "^.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`
+    commented=`grep -E "^\#.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`

    if [ -z "$infile" ] ; then
 	echo "${on}WARNING: installed module: $i was not installed by this build.  It is not present in modules.conf.${off}"
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@ -188,7 +188,7 @@ $(MODNAME).o: $(MODDIR)/$(SOURCEFILE) \
  $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \
  $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
  $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
-  $(switch_srcdir)/src/include/switch_xml.h
+  $(switch_srcdir)/src/include/switch_xml.h $(switch_srcdir)/src/include/switch_spandsp.h
 	@echo Compiling $<...
 	if test -f "$(CSOURCEFILE)" -o -f "$(MODDIR)/$(CSOURCEFILE)"; then \
 		if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
@ -211,7 +211,7 @@ $(MODNAME).lo: $(MODDIR)/$(SOURCEFILE) \
  $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \
  $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
  $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
-  $(switch_srcdir)/src/include/switch_xml.h
+  $(switch_srcdir)/src/include/switch_xml.h $(switch_srcdir)/src/include/switch_spandsp.h
 	@echo Compiling $<...
 	if test -f "$(CSOURCEFILE)" -o -f "$(MODDIR)/$(CSOURCEFILE)"; then \
 		if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
@ -261,6 +261,8 @@ $(switch_srcdir)/src/include/switch_ivr.h:

 $(switch_srcdir)/src/include/switch_rtp.h:

+$(switch_srcdir)/src/include/switch_spandsp.h:
+
 $(switch_srcdir)/src/include/switch_stun.h:

 $(switch_srcdir)/src/include/switch_log.h:
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@ -49,6 +49,7 @@ applications/mod_sms
 applications/mod_spandsp
 #applications/mod_spy
 #applications/mod_stress
+applications/mod_test
 #applications/mod_translate
 applications/mod_valet_parking
 #applications/mod_video_filter
@ -59,7 +60,6 @@ applications/mod_voicemail
 #asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx
 #asr_tts/mod_tts_commandline
-#asr_tts/mod_unimrcp
 codecs/mod_amr
 #codecs/mod_amrwb
 codecs/mod_b64
@ -86,7 +86,6 @@ dialplans/mod_dialplan_asterisk
 dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
-#endpoints/mod_dingaling
 #endpoints/mod_gsmopen
 #endpoints/mod_h323
 #endpoints/mod_khomp
@ -134,6 +133,7 @@ languages/mod_lua
 #languages/mod_managed
 #languages/mod_perl
 #languages/mod_python
+#languages/mod_python3
 #languages/mod_v8
 #languages/mod_yaml
 loggers/mod_console
@ -168,7 +168,7 @@ xml_int/mod_xml_cdr
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi

-#../../libs/freetdm/mod_freetdm
+#mod_freetdm|https://github.com/freeswitch/freetdm.git -b master

 ## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/xml_int/mod_xml_odbc
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@ -47,6 +47,7 @@ applications/mod_soundtouch
 applications/mod_spandsp
 applications/mod_spy
 applications/mod_stress
+applications/mod_test
 applications/mod_translate
 applications/mod_valet_parking
 applications/mod_video_filter
@ -57,7 +58,6 @@ applications/mod_voicemail_ivr
 asr_tts/mod_flite
 asr_tts/mod_pocketsphinx
 asr_tts/mod_tts_commandline
-asr_tts/mod_unimrcp
 codecs/mod_amr
 codecs/mod_amrwb
 codecs/mod_b64
@ -83,7 +83,6 @@ dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
 directories/mod_ldap
 #endpoints/mod_alsa
-endpoints/mod_dingaling
 #endpoints/mod_gsmopen
 #endpoints/mod_h323
 #endpoints/mod_khomp
@ -127,7 +126,7 @@ languages/mod_java
 languages/mod_lua
 languages/mod_managed
 languages/mod_perl
-languages/mod_python
+languages/mod_python3
 #languages/mod_v8
 languages/mod_yaml
 loggers/mod_console
--- a/build/next-release.txt
+++ b/build/next-release.txt
@ -1 +1 @@
-1.10.6-dev
+1.10.10-dev
--- a/build/sounds_version.txt
+++ b/build/sounds_version.txt
@ -1,5 +1,5 @@
-en-us-callie 1.0.52
-en-us-allison 1.0.1
+en-us-callie 1.0.53
+en-us-allison 1.0.2
 ru-RU-elena 1.0.51
 ru-RU-kirill 1.0.0
 ru-RU-vika 1.0.0
--- a/build/swigall.sh
+++ b/build/swigall.sh
@ -13,6 +13,11 @@ make swigclean
 make mod_python_wrap.cpp
 cd ../../../..

+cd src/mod/languages/mod_python3
+make swigclean
+make mod_python_wrap.cpp
+cd ../../../..
+
 cd src/mod/languages/mod_java
 make reswig
 cd ../../../..
--- a/clients/flex/com/adobe/air/filesystem/FileUtil.as
+++ b/clients/flex/com/adobe/air/filesystem/FileUtil.as
@ -53,7 +53,7 @@ package com.adobe.air.filesystem
 			}
 			else if(os.indexOf("Linux") > -1)
 			{
-				//todo: need to impliment Linux
+				//todo: need to implement Linux
 			}
 			
 			return v;
--- a/clients/flex/com/adobe/air/filesystem/VolumeMonitor.as
+++ b/clients/flex/com/adobe/air/filesystem/VolumeMonitor.as
@ -110,7 +110,7 @@ package com.adobe.air.filesystem
 				timer.addEventListener(TimerEvent.TIMER, onTimerEvent,false,0, true);
 			}
 			
-			//we reinitialize the hash everytime we start watching
+			//we reinitialize the hash every time we start watching
 			volumes = new Dictionary();
 			
 			var v:Array = FileUtil.getRootDirectories();
--- a/clients/flex/com/adobe/net/DynamicURLLoader.as
+++ b/clients/flex/com/adobe/net/DynamicURLLoader.as
@ -35,9 +35,9 @@ package com.adobe.net
 	import flash.net.URLLoader;

 	/**
-	* 	Class that provides a dynamic implimentation of the URLLoader class.
+	* 	Class that provides a dynamic implementation of the URLLoader class.
 	* 
-	* 	This class provides no API implimentations. However, since the class is
+	* 	This class provides no API implementations. However, since the class is
 	* 	declared as dynamic, it can be used in place of URLLoader, and allow
 	* 	you to dynamically attach properties to it (which URLLoader does not allow).
 	* 
--- a/clients/flex/com/adobe/net/MimeTypeMap.as
+++ b/clients/flex/com/adobe/net/MimeTypeMap.as
@ -169,7 +169,7 @@ package com.adobe.net
 		}

 		/**
-		 * Returns the prefered extension for the given mimetype.
+		 * Returns the preferred extension for the given mimetype.
 		 */
 		public function getExtension(mimetype:String):String
 		{
--- a/clients/flex/com/adobe/net/URI.as
+++ b/clients/flex/com/adobe/net/URI.as
@ -64,7 +64,7 @@ package com.adobe.net
 	 * URI syntax (e.g. custom query syntax or special handling of
 	 * non-hierarchical URI's), this class can be fully subclassed.  If you
 	 * intended to subclass URI, please see the source code for complete
-	 * documation on protected members and protected fuctions.</p>
+	 * documentation on protected members and protected functions.</p>
 	 * 
 	 * @langversion ActionScript 3.0
 	 * @playerversion Flash 9.0 
@ -203,7 +203,7 @@ package com.adobe.net
 		
 		
 		/**
-		 * @private Private initializiation.
+		 * @private Private initialization.
 		 */
 		protected function initialize() : void
 		{
@ -332,7 +332,7 @@ package com.adobe.net
 		 * well formed.  Sometimes characters that should have been escaped
 		 * are not, and those situations would break a regexp pattern.  This
 		 * function attempts to be smart about what it is parsing based on
-		 * location of characters relative to eachother.  This function has
+		 * location of characters relative to each other.  This function has
 		 * been proven through real-world use to parse the vast majority
 		 * of URI's correctly.
 		 *
@ -835,7 +835,7 @@ package com.adobe.net
 		 * to be properly escaped and unescaped, it must be split into its
 		 * component parts.  This accessor escapes/unescapes the entire query
 		 * part without regard for it's component parts.  This has the
-		 * possibliity of leaving the query string in an ambiguious state in
+		 * possibliity of leaving the query string in an ambiguous state in
 		 * regards to its syntax.  If the contents of the query part are
 		 * important, it is recommended that get/setQueryValue() or
 		 * get/setQueryByMap() are used instead.</p>
@ -2340,7 +2340,7 @@ package com.adobe.net
 		 * <p>This function is intended to be a helper function.
 		 * It is not all-knowning and will probably make mistakes
 		 * when attempting to parse a string of unknown origin.  If
-		 * your applicaiton is receiving input from the user, your
+		 * your application is receiving input from the user, your
 		 * application should already have a good idea what the user
 		 * should  be entering, and your application should be
 		 * pre-processing the user's input to make sure it is well formed
@ -2354,7 +2354,7 @@ package com.adobe.net
 		 * on a URI that was created from unknownToURI() may not match
 		 * the input string due to the difference in escaping.</p>
 		 *
-		 * @param unknown	a potental URI string that should be parsed
+		 * @param unknown	a potential URI string that should be parsed
 		 * and loaded into this object.
 		 * @param defaultScheme	if it is determined that the passed string
 		 * looks like a URI, but it is missing the scheme part, this
--- a/clients/flex/com/adobe/serialization/json/JSONEncoder.as
+++ b/clients/flex/com/adobe/serialization/json/JSONEncoder.as
@ -104,7 +104,7 @@ package com.adobe.serialization.json
 		}
 		
 		/**
-		 * Escapes a string accoding to the JSON specification.
+		 * Escapes a string according to the JSON specification.
 		 *
 		 * @param str The string to be escaped
 		 * @return The string with escaped special characters
--- a/clients/flex/com/adobe/serialization/json/JSONParseError.as
+++ b/clients/flex/com/adobe/serialization/json/JSONParseError.as
@ -47,7 +47,7 @@ package com.adobe.serialization.json {
 		/**
 		 * Constructs a new JSONParseError.
 		 *
-		 * @param message The error message that occured during parsing
+		 * @param message The error message that occurred during parsing
 		 * @langversion ActionScript 3.0
 		 * @playerversion Flash 9.0
 		 * @tiptext
--- a/clients/flex/com/adobe/utils/DateUtil.as
+++ b/clients/flex/com/adobe/utils/DateUtil.as
@ -74,7 +74,7 @@ package com.adobe.utils
 		*	@param Optional parameter indicating whether the search should be case
 		*	sensitive
 		* 
-		* 	@return A int that represents that month represented by the specifed
+		* 	@return A int that represents that month represented by the specified
 		*	short name.
 		*
 		* 	@langversion ActionScript 3.0
@ -114,7 +114,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A full month name.
 		* 
-		* 	@return A int that represents that month represented by the specifed
+		* 	@return A int that represents that month represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -154,7 +154,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A short day name.
 		* 
-		* 	@return A int that represents that short day represented by the specifed
+		* 	@return A int that represents that short day represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -194,7 +194,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A full day name.
 		* 
-		* 	@return A int that represents that full day represented by the specifed
+		* 	@return A int that represents that full day represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -675,7 +675,7 @@ package com.adobe.utils
 		}
 		
 		/**
-		 * Converts a date into just befor midnight.
+		 * Converts a date into just before midnight.
 		 */
 		public static function makeNight(d:Date):Date
 		{
--- a/clients/flex/com/adobe/utils/StringUtil.as
+++ b/clients/flex/com/adobe/utils/StringUtil.as
@ -79,7 +79,7 @@ package com.adobe.utils
 		*	@param input The String whose beginning and ending whitespace will
 		*	will be removed.
 		*
-		*	@returns A String with whitespace removed from the begining and end	
+		*	@returns A String with whitespace removed from the beginning and end
 		*
 		* 	@langversion ActionScript 3.0
 		*	@playerversion Flash 9.0
@ -95,7 +95,7 @@ package com.adobe.utils
 		* 
 		*	@param input The String whose beginning whitespace will will be removed.
 		*
-		*	@returns A String with whitespace removed from the begining	
+		*	@returns A String with whitespace removed from the beginning
 		*
 		* 	@langversion ActionScript 3.0
 		*	@playerversion Flash 9.0
--- a/clients/flex/jquery-1.4.2.js
+++ b/clients/flex/jquery-1.4.2.js
@ -519,7 +519,7 @@ jQuery.extend({

 	noop: function() {},

-	// Evalulates a script in a global context
+	// Evaluates a script in a global context
 	globalEval: function( data ) {
 		if ( data && rnotwhite.test(data) ) {
 			// Inspired by code by Andrea Giammarchi
@ -855,7 +855,7 @@ function now() {
 		htmlSerialize: !!div.getElementsByTagName("link").length,

 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
+		// (IE uses .cssText instead)
 		style: /red/.test( a.getAttribute("style") ),

 		// Make sure that URLs aren't manipulated
@ -1310,7 +1310,7 @@ jQuery.fn.extend({
 					classNames = value.split( rspace );

 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
+					// check each className given, space separated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
 				}
@ -1364,7 +1364,7 @@ jQuery.fn.extend({
 						var option = options[ i ];

 						if ( option.selected ) {
-							// Get the specifc value for the option
+							// Get the specific value for the option
 							value = jQuery(option).val();

 							// We don't need an array for one selects
@ -2636,7 +2636,7 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^
 	baseHasDuplicate = true;

 // Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
+// optimization where it does not always call our comparison
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
 [0, 0].sort(function(){
@ -3415,7 +3415,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};
 }

-// Utility function for retreiving the text value of an array of DOM nodes
+// Utility function for retrieving the text value of an array of DOM nodes
 function getText( elems ) {
 	var ret = "", elem;

@ -4149,7 +4149,7 @@ jQuery.fn.extend({
 			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
 				// IE copies events bound via attachEvent when
 				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
+				// clone will also remove the events from the original
 				// In order to get around this, we use innerHTML.
 				// Unfortunately, this means some modifications to
 				// attributes in IE that are actually only stored
@ -4886,7 +4886,7 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp
 jQuery.extend({

 	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
+		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
@ -4911,7 +4911,7 @@ jQuery.extend({
 	},

 	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
+		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
@ -4948,7 +4948,7 @@ jQuery.extend({
 		// Create the request object; Microsoft failed to properly
 		// implement the XMLHttpRequest in IE7 (can't request local files),
 		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
+		// This function can be overridden by calling jQuery.ajaxSetup
 		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
 			function() {
 				return new window.XMLHttpRequest();
--- a/clients/flex/jquery.tmpl.js
+++ b/clients/flex/jquery.tmpl.js
@ -362,7 +362,7 @@
 	function updateWrapped( options, wrapped ) {
 		// Build the wrapped content.
 		options._wrap = build( options, true,
-			// Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
+			// Support imperative scenario in which options.wrapped can be set to a selector or an HTML string.
 			jQuery.isArray( wrapped ) ? wrapped : [htmlExpr.test( wrapped ) ? wrapped : jQuery( wrapped ).html()]
 		).join("");
 	}
--- a/cmake_modules/FindAPRUtil.cmake
+++ b/cmake_modules/FindAPRUtil.cmake
@ -1,49 +0,0 @@
-# Locate APR-Util include paths and libraries
-
-# This module defines
-# APRUTIL_INCLUDES, where to find apr.h, etc.
-# APRUTIL_LIBS, the libraries to link against to use APR.
-# APRUTIL_FOUND, set to yes if found
-
-find_program(APRUTIL_CONFIG_EXECUTABLE
-    apu-1-config
-    /usr/local/apr-util/1.2.12/bin
-    /usr/local/bin
-    /usr/bin
-    C:/Progra~1/apr/bin
-    )
-
-mark_as_advanced(APRUTIL_CONFIG_EXECUTABLE)
-
-macro(_apu_invoke _varname _regexp)
-    execute_process(
-        COMMAND ${APRUTIL_CONFIG_EXECUTABLE} ${ARGN}
-        OUTPUT_VARIABLE _apr_output
-        RESULT_VARIABLE _apr_failed
-    )
-
-    if(_apr_failed)
-        message(FATAL_ERROR "apu-1-config ${ARGN} failed")
-    else(_apr_failed)
-        string(REGEX REPLACE "[\r\n]"  "" _apr_output "${_apr_output}")
-        string(REGEX REPLACE " +$"     "" _apr_output "${_apr_output}")
-
-        if(NOT ${_regexp} STREQUAL "")
-            string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}")
-        endif(NOT ${_regexp} STREQUAL "")
-
-        separate_arguments(_apr_output)
-
-        set(${_varname} "${_apr_output}")
-    endif(_apr_failed)
-endmacro(_apu_invoke)
-
-_apu_invoke(APRUTIL_INCLUDES "(^| )-I"  --includes)
-_apu_invoke(APRUTIL_LIBS     ""         --link-ld)
-
-if(APRUTIL_LIBS AND APRUTIL_INCLUDES)
-    set(APRUTIL_FOUND "YES")
-    set(APRUTIL_DEFINITIONS "")
-    message (STATUS "apr-util found: YES ${APRUTIL_LIBS}")
-endif(APRUTIL_LIBS AND APRUTIL_INCLUDES)
-
--- a/conf/FreeMono.ttf
+++ b/conf/FreeMono.ttf
--- a/conf/curl/autoload_configs/conference.conf.xml
+++ b/conf/curl/autoload_configs/conference.conf.xml
@ -53,7 +53,7 @@
      <!-- 'say:' will be considered text to say with TTS -->
      <!-- Set a default path here so you can use relative paths in the other sound params-->
      <param name="sound-prefix" value="$${sound_prefix}"/>
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/curl/autoload_configs/dingaling.conf.xml
+++ b/conf/curl/autoload_configs/dingaling.conf.xml
@ -1,9 +0,0 @@
-<configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
-  <settings>
-    <param name="debug" value="0"/>
-    <param name="codec-prefs" value="PCMU"/>
-  </settings>
-
-  <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/>
-
-</configuration>
--- a/conf/curl/autoload_configs/timezones.conf.xml
+++ b/conf/curl/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/curl/autoload_configs/xml_cdr.conf.xml
+++ b/conf/curl/autoload_configs/xml_cdr.conf.xml
@ -6,7 +6,7 @@
    <!-- optional: credentials to send to web server -->
    <!--    <param name="cred" value="user:pass"/> -->

-    <!-- the total number of retries (not counting the first 'try') to post to webserver incase of failure -->
+    <!-- the total number of retries (not counting the first 'try') to post to webserver in case of failure -->
    <!-- <param name="retries" value="2"/> -->

    <!-- delay between retries in seconds, default is 5 seconds -->
--- a/conf/insideout/autoload_configs/conference.conf.xml
+++ b/conf/insideout/autoload_configs/conference.conf.xml
@ -53,7 +53,7 @@
      <!-- 'say:' will be considered text to say with TTS -->
      <!-- Set a default path here so you can use relative paths in the other sound params-->
      <param name="sound-prefix" value="$${sound_prefix}"/>
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@ -81,6 +81,7 @@
    <load module="mod_v8"/>
    <!-- <load module="mod_perl"/> -->
    <!-- <load module="mod_python"/> -->
+    <!-- <load module="mod_python3"/> -->
    <!-- <load module="mod_java"/> -->
    <load module="mod_lua"/>

--- a/conf/insideout/autoload_configs/timezones.conf.xml
+++ b/conf/insideout/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/insideout/autoload_configs/xml_cdr.conf.xml
+++ b/conf/insideout/autoload_configs/xml_cdr.conf.xml
@ -6,7 +6,7 @@
    <!-- optional: credentials to send to web server -->
    <!--    <param name="cred" value="user:pass"/> -->

-    <!-- the total number of retries (not counting the first 'try') to post to webserver incase of failure -->
+    <!-- the total number of retries (not counting the first 'try') to post to webserver in case of failure -->
    <!-- <param name="retries" value="2"/> -->

    <!-- delay between retries in seconds, default is 5 seconds -->
--- a/conf/insideout/dialplan/default.xml
+++ b/conf/insideout/dialplan/default.xml
@ -2,7 +2,7 @@
    NOTICE:
    
    This context is usually accessed via authenticated callers on the sip profile on port 5060 
-    or transfered callers from the public context which arrived via the sip profile on port 5080.
+    or transferred callers from the public context which arrived via the sip profile on port 5080.
    
    Authenticated users will use the user_context variable on the user to determine what context
    they can access.  You can also add a user in the directory with the cidr= attribute acl.conf.xml
@ -330,7 +330,7 @@
    </extension>

    <!-- Create a conference on the fly and pull someone in at the same time. --> 
-    <extension name="dyanmic conference">
+    <extension name="dynamic conference">
      <condition field="destination_number" expression="^5001$">
 	<action application="conference" data="bridge:mydynaconf:sofia/${use_profile}/1234@conference.freeswitch.org"/>
      </condition>
--- a/conf/insideout/sip_profiles/external.xml
+++ b/conf/insideout/sip_profiles/external.xml
@ -48,7 +48,6 @@
    <param name="auth-calls" value="false"/>
    <param name="rtp-timeout-sec" value="1800"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/insideout/sip_profiles/internal-ipv6.xml
+++ b/conf/insideout/sip_profiles/internal-ipv6.xml
@ -70,9 +70,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/insideout/sip_profiles/internal.xml
+++ b/conf/insideout/sip_profiles/internal.xml
@ -106,9 +106,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/minimal/autoload_configs/timezones.conf.xml
+++ b/conf/minimal/autoload_configs/timezones.conf.xml
@ -196,7 +196,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/rayo/autoload_configs/conference.conf.xml
+++ b/conf/rayo/autoload_configs/conference.conf.xml
@ -64,7 +64,7 @@
      <!-- Override the default path here, after which you use relative paths in the other sound params -->
      <!-- Note: The default path is the conference's first caller's sound_prefix -->
      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/rayo/autoload_configs/rayo.conf.xml
+++ b/conf/rayo/autoload_configs/rayo.conf.xml
@ -277,36 +277,6 @@
 				</input>
 			]]>
 		</alias>
-		<alias name="input_voice_yesno_unimrcp" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="unimrcp">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-		<alias name="input_voice_yesno_unimrcp_timeout" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="unimrcp" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>

 		<alias name="input_voice_yesno_pocketsphinx" target="call">
 			<![CDATA[
--- a/conf/rayo/autoload_configs/spandsp.conf.xml
+++ b/conf/rayo/autoload_configs/spandsp.conf.xml
@ -10,7 +10,7 @@

    2) copy conf/config.FS0 to /var/spool/hylafax/etc (or wherver the appropriate dir is on your system)

-    Subsequent modem configs would incrment the 0 to 1 and so on.
+    Subsequent modem configs would increment the 0 to 1 and so on.

 -->
      <param name="total-modems" value="0"/>
--- a/conf/rayo/autoload_configs/switch.conf.xml
+++ b/conf/rayo/autoload_configs/switch.conf.xml
@ -145,8 +145,6 @@
    <!-- <param name="rtp-start-port" value="16384"/> -->
    <!-- <param name="rtp-end-port" value="32768"/> -->

-    <param name="rtp-enable-zrtp" value="true"/>
-
    <!--
 	 Native PostgreSQL support was removed from the FreeSWITCH Core!
 	 =================================
--- a/conf/rayo/autoload_configs/timezones.conf.xml
+++ b/conf/rayo/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/rayo/sip_profiles/external.xml
+++ b/conf/rayo/sip_profiles/external.xml
@ -57,7 +57,6 @@
    <param name="nonce-ttl" value="60"/>
    <param name="auth-calls" value="$${external_auth_calls}"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/rayo/vars.xml
+++ b/conf/rayo/vars.xml
@ -14,13 +14,6 @@
  <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
  <X-PRE-PROCESS cmd="set" data="use_profile=external"/>

-  <!--
-      Enable ZRTP globally you can override this on a per channel basis
-      
-      http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
-  -->
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
-
  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU,PCMA"/>
  <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA"/>

--- a/conf/sbc/autoload_configs/timezones.conf.xml
+++ b/conf/sbc/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/sbc/sbc_profiles/external.xml
+++ b/conf/sbc/sbc_profiles/external.xml
@ -49,7 +49,6 @@
    <param name="auth-calls" value="false"/>
    <param name="rtp-timeout-sec" value="1800"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/sbc/sbc_profiles/internal-ipv6.xml
+++ b/conf/sbc/sbc_profiles/internal-ipv6.xml
@ -69,9 +69,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/sbc/sbc_profiles/internal.xml
+++ b/conf/sbc/sbc_profiles/internal.xml
@ -110,9 +110,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/testing/autoload_configs/amrwb.conf.xml
+++ b/conf/testing/autoload_configs/amrwb.conf.xml
@ -0,0 +1,24 @@
+<configuration name="amrwb.conf">
+	<settings>
+	<!--  AMRWB modes (supported bitrates):
+		mode 8 AMR-WB_23.85 23.85 Kbit/s
+		mode 7 AMR-WB_23.05 23.05 Kbit/s
+		mode 7 AMR-WB_19.85 19.85 Kbit/s
+		mode 6 AMR-WB_18.25 18.25 Kbit/s
+		mode 5 AMR-WB_15.85 15.85 Kbit/s
+		mode 4 AMR-WB_14.25 14.25 Kbit/s
+		mode 3 AMR-WB_12.65 12.65 Kbit/s
+		mode 2 AMR-WB_8.85 8.85 Kbit/s
+		mode 1 AMR-WB_6.60 6.60 Kbit/s
+	-->
+	<param name="default-bitrate" value="8"/>
+	 <!-- Enable VoLTE specific FMTP -->
+	<param name="volte" value="1"/>
+	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
+	<param name="adjust-bitrate" value="0"/>
+	<!-- force OA when originating -->
+	<param name="force-oa" value="0"/>
+	<!-- don't mirror mode-set in SDP answer, but use our own (default-bitrate). -->
+	<param name="mode-set-overwrite" value="0"/>
+  </settings>
+</configuration>
--- a/conf/testing/autoload_configs/opus.conf.xml
+++ b/conf/testing/autoload_configs/opus.conf.xml
@ -7,5 +7,6 @@
    <param name="use-jb-lookahead" value="true"/>
 	<param name="keep-fec-enabled" value="true"/>
 	<param name="adjust-bitrate" value="true"/>
+    <param name="mono" value="0"/>
  </settings>
 </configuration>
--- a/conf/testing/autoload_configs/switch.conf.xml
+++ b/conf/testing/autoload_configs/switch.conf.xml
@ -150,8 +150,6 @@
    <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
    <!-- <param name="rtp-port-usage-robustness" value="true"/> -->

-    <param name="rtp-enable-zrtp" value="true"/>
-
    <!--
 	 Native PostgreSQL support was removed from the FreeSWITCH Core!
 	 =================================
--- a/conf/testing/autoload_configs/timezones.conf.xml
+++ b/conf/testing/autoload_configs/timezones.conf.xml
@ -196,7 +196,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/testing/sip_profiles/external-ipv6.xml
+++ b/conf/testing/sip_profiles/external-ipv6.xml
@ -51,7 +51,6 @@
    <param name="nonce-ttl" value="60"/>
    <param name="auth-calls" value="false"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@ -57,7 +57,6 @@
    <param name="nonce-ttl" value="60"/>
    <param name="auth-calls" value="false"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/testing/sip_profiles/internal-ipv6.xml
+++ b/conf/testing/sip_profiles/internal-ipv6.xml
@ -71,9 +71,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/testing/sip_profiles/internal.xml
+++ b/conf/testing/sip_profiles/internal.xml
@ -216,6 +216,14 @@
    <!-- TLS ciphers default: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH  -->
    <param name="tls-ciphers" value="$${sip_tls_ciphers}"/>

+    <!--
+        Connect timeout for outgoing requests using TLS (in milliseconds).
+        Set the timeout and SIP engine will try again sending an outgoing request
+        and when possible - using an alternative address (DNS failover).
+        Default - 0 (disabled)
+    -->
+    <!-- <param name="tls-orq-connect-timeout" value="3000" /> -->
+
    <!-- turn on auto-flush during bridge (skip timer sleep when the socket already has data)
         (reduces delay on latent connections default true, must be disabled explicitly)-->
    <!--<param name="rtp-autoflush-during-bridge" value="false"/>-->
@ -238,9 +246,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/testing/vars.xml
+++ b/conf/testing/vars.xml
@ -7,7 +7,6 @@
  <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
  <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
  <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
  <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
  <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
--- a/conf/vanilla/autoload_configs/amr.conf.xml
+++ b/conf/vanilla/autoload_configs/amr.conf.xml
@ -15,5 +15,7 @@
 	  <param name="volte" value="0"/>
 	  <!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
 	  <param name="adjust-bitrate" value="0"/> 
+	  <!-- force OA when originating -->
+	  <param name="force-oa" value="0"/> 
 	</settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/amrwb.conf.xml
+++ b/conf/vanilla/autoload_configs/amrwb.conf.xml
@ -1,7 +1,24 @@
 <configuration name="amrwb.conf">
 	<settings>
+	<!--  AMRWB modes (supported bitrates):
+		mode 8 AMR-WB_23.85 23.85 Kbit/s
+		mode 7 AMR-WB_23.05 23.05 Kbit/s
+		mode 7 AMR-WB_19.85 19.85 Kbit/s
+		mode 6 AMR-WB_18.25 18.25 Kbit/s
+		mode 5 AMR-WB_15.85 15.85 Kbit/s
+		mode 4 AMR-WB_14.25 14.25 Kbit/s
+		mode 3 AMR-WB_12.65 12.65 Kbit/s
+		mode 2 AMR-WB_8.85 8.85 Kbit/s
+		mode 1 AMR-WB_6.60 6.60 Kbit/s
+	-->
 	<param name="default-bitrate" value="8"/>
+	 <!-- Enable VoLTE specific FMTP -->
 	<param name="volte" value="1"/>
+	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
 	<param name="adjust-bitrate" value="0"/>
+	<!-- force OA when originating -->
+	<param name="force-oa" value="0"/>
+	<!-- don't mirror mode-set in SDP answer, but use our own (default-bitrate). -->
+	<param name="mode-set-overwrite" value="0"/>
  </settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/dingaling.conf.xml
+++ b/conf/vanilla/autoload_configs/dingaling.conf.xml
@ -1,9 +0,0 @@
-<configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
-  <settings>
-    <param name="debug" value="0"/>
-    <param name="codec-prefs" value="H264,PCMU"/>
-  </settings>
-
-  <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/>
-
-</configuration>
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@ -122,6 +122,7 @@
    <!-- <load module="mod_v8"/> -->
    <!-- <load module="mod_perl"/> -->
    <!-- <load module="mod_python"/> -->
+    <!-- <load module="mod_python3"/> -->
    <!-- <load module="mod_java"/> -->
    <load module="mod_lua"/>

--- a/conf/vanilla/autoload_configs/opus.conf.xml
+++ b/conf/vanilla/autoload_configs/opus.conf.xml
@ -29,5 +29,7 @@
        <!--<param name="sprop-maxcapturerate" value="0"/>-->
 	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
 	<!--<param name="adjust-bitrate" value="1"/>-->
+	<!-- will enforce mono even if the remote party wants stereo. must be used in conjunction with param "max-audio-channels" set to 1 in switch.conf.xml. -->
+		<param name="mono" value="0"/>
    </settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/signalwire.conf.xml
+++ b/conf/vanilla/autoload_configs/signalwire.conf.xml
@ -0,0 +1,14 @@
+<configuration name="signalwire.conf" description="SignalWire">
+  <settings>
+    <!-- on/off/file-path -->
+    <!--<param name="kslog" value="on"/>-->
+    <!--<param name="blade-bootstrap" value="blade://switchblade:2100"/>-->
+    <!--<param name="adoption-service" value="https://adopt.signalwire.com/adoption"/>-->
+    <!--<param name="stun-server" value="stun.freeswitch.org"/>-->
+    <!--<param name="caller-id-in-from" value="true"/>-->
+    <!--<authentication></authentication>-->
+    
+    <!-- override dialplan context for calls on connector -->
+    <!--<param name="override-context" value="signalwire"/-->
+  </settings>
+</configuration>
--- a/conf/vanilla/autoload_configs/spandsp.conf.xml
+++ b/conf/vanilla/autoload_configs/spandsp.conf.xml
@ -28,6 +28,7 @@
    <fax-settings>
 	<param name="use-ecm"		value="true"/>
 	<param name="verbose"		value="false"/>
+	<!--param name="verbose-log-level"	value="INFO"/-->
 	<param name="disable-v17"	value="false"/>
 	<param name="ident"		value="SpanDSP Fax Ident"/>
 	<param name="header"		value="SpanDSP Fax Header"/>
--- a/conf/vanilla/autoload_configs/switch.conf.xml
+++ b/conf/vanilla/autoload_configs/switch.conf.xml
@ -153,8 +153,6 @@
    <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
    <!-- <param name="rtp-port-usage-robustness" value="true"/> -->

-    <param name="rtp-enable-zrtp" value="false"/>
-
    <!--
 	 Store encryption keys for secure media in channel variables and call CDRs. Default: false.
 	 WARNING: If true, anyone with CDR access can decrypt secure media!
@ -184,6 +182,9 @@
    <!-- <param name="core-db-dsn" value="postgresql://freeswitch:@127.0.0.1/freeswitch?options=-c%20client_min_messages%3DNOTICE" /> -->
    <!-- <param name="core-db-dsn" value="mariadb://Server=localhost;Database=freeswitch;Uid=freeswitch;Pwd=pass;" /> -->
    <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->
+
+    <!-- <param name="odbc-skip-autocommit-flip" value="true" /> -->
+
    <!-- 
 	 Allow to specify the sqlite db at a different location (In this example, move it to ramdrive for
 	 better performance on most linux distro (note, you loose the data if you reboot))
--- a/conf/vanilla/autoload_configs/timezones.conf.xml
+++ b/conf/vanilla/autoload_configs/timezones.conf.xml
@ -197,7 +197,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLT3" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/vanilla/autoload_configs/unimrcp.conf.xml
+++ b/conf/vanilla/autoload_configs/unimrcp.conf.xml
@ -1,23 +0,0 @@
-<configuration name="unimrcp.conf" description="UniMRCP Client">
-  <settings>
-    <!-- UniMRCP profile to use for TTS -->
-    <param name="default-tts-profile" value="voxeo-prophecy8.0-mrcp1"/>
-    <!-- UniMRCP profile to use for ASR -->
-    <param name="default-asr-profile" value="voxeo-prophecy8.0-mrcp1"/>
-    <!-- UniMRCP logging level to appear in freeswitch.log.  Options are:
-         EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG -->
-    <param name="log-level" value="DEBUG"/>
-    <!-- Enable events for profile creation, open, and close -->
-    <param name="enable-profile-events" value="false"/>
-
-    <param name="max-connection-count" value="100"/>
-    <param name="offer-new-connection" value="1"/>
-    <param name="request-timeout" value="3000"/>
-  </settings>
-
-  <profiles>
-    <X-PRE-PROCESS cmd="include" data="../mrcp_profiles/*.xml"/>
-  </profiles>
-
-</configuration>
-
--- a/conf/vanilla/autoload_configs/verto.conf.xml
+++ b/conf/vanilla/autoload_configs/verto.conf.xml
@ -2,6 +2,7 @@

  <settings>
    <param name="debug" value="0"/>
+    <!-- <param name="kslog" value="true"/> -->
    <!-- seconds to wait before hanging up a disconnected channel -->
    <!-- <param name="detach-timeout-sec" value="120"/> -->
    <!-- enable broadcasting all FreeSWITCH events in Verto -->
--- a/conf/vanilla/dialplan/default.xml
+++ b/conf/vanilla/dialplan/default.xml
@ -443,10 +443,6 @@
 	     This will take the SAS from the b-leg and send it to the display on the a-leg phone.
 	     Known working with Polycom and Snom maybe others.
 	-->
-	<!--
-	<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )}  \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
-	<action application="export" data="nolocal:zrtp_secure_media=true"/>
-	-->
 	<action application="bridge" data="sofia/${use_profile}/$1@conference.freeswitch.org"/>
      </condition>
    </extension>
@ -768,13 +764,6 @@
      </condition>
    </extension>

-    <!-- install zrtp_agent.lua into scripts (ZRTP == 9787) -->
-    <extension name="zrtp_enrollement">
-      <condition field="destination_number" expression="^9787$">
-	<action application="lua" data="zrtp_agent.lua"/>
-      </condition>
-    </extension>
-
    <!--
 	You will no longer hear the bong tone.  The wav file is playing stating the call is secure.
 	The file will not play unless you have both TLS and SRTP active.
@ -786,10 +775,8 @@
 	<action application="answer"/>
 	<action application="execute_extension" data="is_secure XML features"/>
 	<action application="playback" data="$${hold_music}"/>
-	<anti-action application="set" data="zrtp_secure_media=true"/>
 	<anti-action application="answer"/>
 	<anti-action application="playback" data="silence_stream://2000"/>
-	<anti-action application="execute_extension" data="is_zrtp_secure XML features"/>
 	<anti-action application="playback" data="$${hold_music}"/>
      </condition>
    </extension>
--- a/conf/vanilla/dialplan/features.xml
+++ b/conf/vanilla/dialplan/features.xml
@ -45,14 +45,6 @@
      </condition>
    </extension>
 
-    <extension name="is_zrtp_secure" continue="true">
-      <condition field="${zrtp_secure_media_confirmed}" expression="^true$">
-	<action application="sleep" data="1000"/>
-	<action application="playback" data="misc/call_secured.wav"/>
-	<anti-action application="eval" data="not_secure"/>
-      </condition>
-    </extension>
-
    <extension name="is_secure" continue="true">
      <!-- Only Truly consider it secure if its TLS and SRTP --> 
      <condition field="${sip_via_protocol}" expression="tls"/>
--- a/conf/vanilla/jingle_profiles/client.xml
+++ b/conf/vanilla/jingle_profiles/client.xml
@ -1,36 +0,0 @@
-<include>
-  <!-- Client Profile (Original mode) -->
-  <!-- to use this profile take the x- away from the open and close tags so its <profile> and </profile> -->
-  <x-profile type="client">
-    <param name="name" value="$${xmpp_client_profile}"/>
-    <param name="login" value="myjid@myserver.com/talk"/>
-    <param name="password" value="mypass"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="message" value="Jingle all the way"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <!-- <param name="ext-rtp-ip" value="auto-nat"/> -->
-    <param name="auto-login" value="true"/>
-    <!-- SASL "plain" or "md5" -->
-    <param name="sasl" value="plain"/>
-    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
-    <!--<param name="server" value="alternate.server.com"/>-->
-    <!-- Enable TLS or not -->
-    <param name="tls" value="true"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- default extension (if one cannot be determined) -->
-    <param name="exten" value="888"/>
-    <!-- VAD choose one -->
-    <!-- <param name="vad" value="in"/> -->
-    <!-- <param name="vad" value="out"/> -->
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--<param name="candidate-acl" value="wan.auto"/>-->
-    <param name="local-network-acl" value="localnet.auto"/>
-
-    <!-- google voice does not work on this yet ....ikr... -->
-    <!--<param name="use-jingle" value="true"/>-->
-
-  </x-profile>
-</include>
--- a/conf/vanilla/jingle_profiles/server.xml
+++ b/conf/vanilla/jingle_profiles/server.xml
@ -1,21 +0,0 @@
-<include>
-  <!-- Component (Server to Server Login) -->
-  <!-- to use this profile take the x- away from the open and close tags so its <profile> and </profile> -->
-  <x-profile type="component">
-    <param name="name" value="$${xmpp_server_profile}"/>
-    <param name="password" value="secret"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <param name="server" value="jabber.server.org:5347"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
-    <param name="exten" value="_auto_"/>
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
-    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
-    <!--<param name="candidate-acl" value="wan.auto"/>-->
-  </x-profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml
+++ b/conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml
@ -1,32 +0,0 @@
-<include>
-  <!-- Loquendo MRCP Server 7 MRCPv2 -->
-  <profile name="loquendo7-mrcp2" version="2">
-    <!--param name="client-ext-ip" value="auto"-->
-    <param name="client-ip" value="auto"/>
-    <param name="client-port" value="5090"/>
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="5060"/>
-    <!--param name="force-destination" value="1"/-->
-    <param name="sip-transport" value="udp"/>
-    <!--param name="ua-name" value="FreeSWITCH"/-->
-    <!--param name="sdp-origin" value="FreeSWITCH"/-->
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-    <param name="jsgf-mime-type" value="application/jsgf"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
+++ b/conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
@ -1,39 +0,0 @@
-<include>
-  <!-- Nuance MRCP 1.0.0 Server -->
-  <profile name="nuance-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="synthesizer"/>
-    <param name="speechrecog" value="recognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-         0 - disable rtcp bye
-         1 - send rtcp bye at the end of session
-         2 - send rtcp bye also at the end of each talkspurt (input)
-    -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml
+++ b/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml
@ -1,39 +0,0 @@
-<include>
-  <!-- Nuance Speech Server 5.0 MRCPv1 -->
-  <profile name="nuance5-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="4900"/>
-    <param name="resource-location" value="media"/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-             0 - disable rtcp bye
-             1 - send rtcp bye at the end of session
-             2 - send rtcp bye also at the end of each talkspurt (input)
-      -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml
+++ b/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml
@ -1,43 +0,0 @@
-<include>
-  <!-- Nuance Speech Server 5.0 MRCPv2 -->
-  <profile name="nuance5-mrcp2" version="2">
-    <!--param name="client-ext-ip" value="auto"-->
-    <param name="client-ip" value="auto"/>
-    <param name="client-port" value="5090"/>
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="5060"/>
-    <!--param name="force-destination" value="1"/-->
-    <param name="sip-transport" value="udp"/>
-    <!--param name="ua-name" value="FreeSWITCH"/-->
-    <!--param name="sdp-origin" value="FreeSWITCH"/-->
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-             0 - disable rtcp bye
-             1 - send rtcp bye at the end of session
-             2 - send rtcp bye also at the end of each talkspurt (input)
-    -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml
+++ b/conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml
@ -1,27 +0,0 @@
-<include>
-  <!-- UniMRCP Server MRCPv1 -->
-  <profile name="unimrcpserver-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="1554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/vestec-mrcp-v1.xml
+++ b/conf/vanilla/mrcp_profiles/vestec-mrcp-v1.xml
@ -1,26 +0,0 @@
-<include>
-  <!-- Vestec VASRE MRCP Server -->
-  <profile name="vestec-mrcp-v1" version="1">
-    <param name="server-ip" value="127.0.0.1"/>
-    <param name="server-port" value="1554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="14000"/>
-    <param name="rtp-port-max" value="15000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
+++ b/conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
@ -1,27 +0,0 @@
-<include>
-  <!-- Voxeo Prophecy 8.0 MRCPv1 -->
-  <profile name="voxeo-prophecy8.0-mrcp1" version="1">
-    <param name="server-ip" value="99.185.85.31"/>
-    <param name="server-port" value="554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="synthesizer"/>
-    <param name="speechrecog" value="recognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>
--- a/conf/vanilla/sip_profiles/external-ipv6.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6.xml
@ -57,7 +57,6 @@
    <param name="nonce-ttl" value="60"/>
    <param name="auth-calls" value="false"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/vanilla/sip_profiles/external.xml
+++ b/conf/vanilla/sip_profiles/external.xml
@ -57,7 +57,6 @@
    <param name="nonce-ttl" value="60"/>
    <param name="auth-calls" value="false"/>
    <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
    <!--
        DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
    -->
--- a/conf/vanilla/sip_profiles/internal-ipv6.xml
+++ b/conf/vanilla/sip_profiles/internal-ipv6.xml
@ -36,6 +36,8 @@
    <!-- <param name="bitpacking" value="aal2"/> -->
    <!--max number of open dialogs in proceeding -->
    <!--<param name="max-proceeding" value="1000"/>-->
+    <!--max number of receiving requests per second (Default: 1000, 0 - unlimited) -->
+    <!--<param name="max-recv-requests-per-second" value="0"/>-->
    <!--session timers for all call to expire after the specified seconds -->
    <!--<param name="session-timeout" value="1800"/>-->
    <!--<param name="multiple-registrations" value="true"/>-->
@ -71,9 +73,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@ -172,6 +172,8 @@
    <!-- <param name="bitpacking" value="aal2"/> -->
    <!--max number of open dialogs in proceeding -->
    <!--<param name="max-proceeding" value="1000"/>-->
+    <!--max number of receiving requests per second (Default: 1000, 0 - unlimited) -->
+    <!--<param name="max-recv-requests-per-second" value="0"/> -->
    <!--session timers for all call to expire after the specified seconds -->
    <!--<param name="session-timeout" value="1800"/>-->
    <!-- Can be 'true' or 'contact' -->
@ -216,6 +218,14 @@
    <!-- TLS ciphers default: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH  -->
    <param name="tls-ciphers" value="$${sip_tls_ciphers}"/>

+    <!--
+        Connect timeout for outgoing requests using TLS (in milliseconds).
+        Set the timeout and SIP engine will try again sending an outgoing request
+        and when possible - using an alternative address (DNS failover).
+        Default - 0 (disabled)
+    -->
+    <!-- <param name="tls-orq-connect-timeout" value="3000" /> -->
+
    <!-- turn on auto-flush during bridge (skip timer sleep when the socket already has data)
         (reduces delay on latent connections default true, must be disabled explicitly)-->
    <!--<param name="rtp-autoflush-during-bridge" value="false"/>-->
@ -229,6 +239,9 @@
    <!-- Or, if you have PGSQL support, you can use that -->
    <!--<param name="odbc-dsn" value="pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" />-->

+    <!-- By default each profile will give the database 1000 ms to spin-up on load -->
+    <!--<param name="db-spin-up-wait-ms" value="1000" />-->
+
    <!--Uncomment to set all inbound calls to no media mode-->
    <!--<param name="inbound-bypass-media" value="true"/>-->

@ -238,9 +251,6 @@
    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
    <param name="inbound-late-negotiation" value="true"/>

-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
    <!-- this lets anything register -->
    <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
    <!-- <param name="accept-blind-reg" value="true"/> -->
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@ -41,7 +41,6 @@
      storage_dir
      cache_dir
      core_uuid
-      zrtp_enabled
      nat_public_addr
      nat_private_addr
      nat_type
@ -64,12 +63,6 @@
  <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
  <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
  <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
-  <!--
-      Enable ZRTP globally you can override this on a per channel basis
-
-      http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
-  -->
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
  <!--
      NOTICE: When using SRTP it's critical that you do not offer or accept
      variable bit rate codecs, doing so would leak information and possibly
@ -144,13 +137,13 @@
      By default without specifying any crypto suites FreeSWITCH will offer
      crypto suites from strongest to weakest accepting the strongest each
      endpoint has in common.  If you wish to force specific crypto suites you
-      can do so by appending the suites in a comma separated list in the order
+      can do so by appending the suites in a colon separated list in the order
      that you wish to offer them in.

      Examples:

-          rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
-          rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
+          rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80:AES_CM_256_HMAC_SHA1_32
+          rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80:AES_CM_256_HMAC_SHA1_32
          rtp_secure_media=optional:AES_CM_256_HMAC_SHA1_80
          rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80

--- a/configure.ac
+++ b/configure.ac
@ -3,10 +3,10 @@

 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.10.6-dev], bugs@freeswitch.org)
+AC_INIT([freeswitch], [1.10.10-dev], bugs@freeswitch.org)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [10])
-AC_SUBST(SWITCH_VERSION_MICRO, [6-dev])
+AC_SUBST(SWITCH_VERSION_MICRO, [10-dev])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])

@ -248,7 +248,7 @@ m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
 m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
 m4_defun([_LT_AC_LANG_RC_CONFIG], [:])
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])

 #Check for compiler vendor
 AX_COMPILER_VENDOR
@ -598,16 +598,9 @@ AC_ARG_ENABLE(srtp,
 AM_CONDITIONAL([ENABLE_SRTP],[test "${enable_srtp}" = "yes"])

 have_openal=no
-AC_CHECK_LIB(openal, alMidiGainSOFT, [have_openal="yes"])
+AC_CHECK_LIB(openal, alcLoopbackOpenDeviceSOFT, [have_openal="yes"])
 AM_CONDITIONAL([HAVE_OPENAL],[test "${have_openal}" = "yes"])

-AC_ARG_ENABLE(zrtp,
-	[AS_HELP_STRING([--enable-zrtp], [Compile with zrtp Support])],,[enable_zrtp="no"])
-if test "x$enable_zrtp" = "xyes" ; then
-   LIBS="-lpthread $LIBS"
-   APR_ADDTO(SWITCH_AM_CFLAGS, -DENABLE_ZRTP)
-fi
-
 PA_LIBS=

 PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
@ -622,8 +615,6 @@ fi

 AC_SUBST(PA_LIBS)

-AM_CONDITIONAL([ENABLE_ZRTP],[test "x$enable_zrtp" != "xno"])
-
 AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])

 AC_ARG_ENABLE(core-odbc-support,
@ -665,12 +656,13 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
 case $host in
     *-darwin*)
 	path_push_unique PKG_CONFIG_PATH /usr/local/opt/libpq/lib/pkgconfig
+	path_push_unique PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig
     ;;
 esac

 if test "$PKG_CONFIG" = "no" \
 	|| test x"$enable_core_pgsql_pkgconfig" = x"no" \
-	|| ! pkg-config libpq; then
+	|| ! pkg-config --modversion libpq > /dev/null; then
 	if test "$PG_CONFIG" != "no"; then
 		AC_MSG_CHECKING([for PostgreSQL libraries via pg_config])
 		POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
@ -682,7 +674,6 @@ if test "$PKG_CONFIG" = "no" \
 		POSTGRESQL_PATCH_VERSION=`$PG_CONFIG --version | awk '{ print $NF }' | awk -F. '{ print $3 }'`
 	fi
 else
-
 	AC_MSG_CHECKING([for PostgreSQL libraries via pkg_config])
 	POSTGRESQL_CFLAGS="`$PKG_CONFIG --cflags libpq`"
 	POSTGRESQL_LIBDIR="`$PKG_CONFIG libpq --libs-only-L`"
@ -725,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
    AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
 ])

-PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.12.12],[
+PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.14],[
  AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
    AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
 ])
@ -838,10 +829,12 @@ PKG_CHECK_MODULES([AMRWB], [opencore-amrwb >= 0.1.0 vo-amrwbenc >= 0.1.0],[
 		AM_CONDITIONAL([HAVE_AMRWB],[true])],[
 		AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMRWB],[false])])

+PKG_CHECK_MODULES([STIRSHAKEN], [stirshaken],[
+		AM_CONDITIONAL([HAVE_STIRSHAKEN],[true])],[
+		AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_STIRSHAKEN],[false])])
+
 AC_CHECK_LIB(apr-1, apr_pool_mutex_set, use_system_apr=yes, use_system_apr=no)
 AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
-AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
-AM_CONDITIONAL([SYSTEM_APRUTIL],[test "${use_system_aprutil}" = "yes"])

 save_LIBS="$LIBS"
 LIBS=
@ -879,7 +872,7 @@ AC_SUBST(LIBTOOL_LIB_EXTEN)
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h sys/prctl.h sys/select.h netdb.h execinfo.h sys/time.h])
+AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h sys/prctl.h sys/select.h netdb.h sys/time.h])

 # Solaris 11 privilege management
 AS_CASE([$host],
@ -1086,8 +1079,8 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
 fi

 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
-# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_dingaling mod_opal mod_h323 mod_khomp 
-#                    mod_unimrcp mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
+# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_opal mod_h323 mod_khomp 
+#                    mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
 #
 #saved_CFLAGS="$CFLAGS"
 #AC_CACHE_CHECK([whether compiler supports -Wunused-but-set-variable], [ac_cv_gcc_unused_but_set_variable], [
@ -1404,7 +1397,9 @@ PKG_CHECK_MODULES([VLC], [libvlc >= 2.1.0],[

 PKG_CHECK_MODULES([OPENCV], [opencv >= 2.4.5],[
  AM_CONDITIONAL([HAVE_OPENCV],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])
+  PKG_CHECK_MODULES([OPENCV], [opencv4 >= 2.4.5],[
+    AM_CONDITIONAL([HAVE_OPENCV],[true])],[
+    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])])

 PKG_CHECK_MODULES([OPUSFILE_DECODE], [opusfile >= 0.5],[
   AM_CONDITIONAL([HAVE_OPUSFILE_DECODE],[true])],[
@ -1523,13 +1518,27 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
  ])
 ])

-PKG_CHECK_MODULES([KS], [libks >= 1.1.0],[
+PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
  AM_CONDITIONAL([HAVE_KS],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])])
+    if module_enabled mod_verto; then
+      AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
+    else
+      if module_enabled mod_signalwire; then
+        AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
+      else
+        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+      fi
+    fi
+])

 PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
  AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])])
+    if module_enabled mod_signalwire; then
+      AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
+    else
+      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
+    fi
+])

 PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
  AM_CONDITIONAL([HAVE_AMQP],[true])],[
@ -1572,6 +1581,17 @@ AS_IF([test "x$enable_core_libedit_support" != "xno"],[
      AC_MSG_ERROR([You need to either install libedit-dev (>= 2.11) or configure with --disable-core-libedit-support])
      ])])])

+AC_ARG_ENABLE(systemd,
+  [AS_HELP_STRING([--enable-systemd], [Compile with systemd notify support])])
+
+AS_IF([test "x$enable_systemd" = "xyes"],[
+  PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 219], [
+    AC_DEFINE([HAVE_SYSTEMD], [1], [Define to 1 if systemd is available])])
+])
+
+AC_SUBST(SYSTEMD_LIBS)
+
+
 dnl ---------------------------------------------------------------------------
 dnl - OpenLDAP SDK
 dnl ---------------------------------------------------------------------------
@ -1698,7 +1718,7 @@ if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
 fi

 #
-# Python checks for mod_python
+# Python checks for mod_python (scroll down to see python3 checks for mod_python3)
 #
 AC_ARG_WITH(
 	[python],
@ -1818,6 +1838,143 @@ else
 	AC_MSG_WARN([python support disabled, building mod_python will fail!])
 fi

+#
+# Python3 checks for mod_python3
+#
+AC_ARG_WITH(
+	[python3],
+	[AS_HELP_STRING([--with-python3], [Use system provided version of python3 (default: try)])],
+	[with_python3="$withval"],
+	[with_python3="try"]
+)
+
+if test "$with_python3" != "no"
+then
+	save_CFLAGS="$CFLAGS"
+	save_LIBS="$LIBS"
+
+	if test "$with_python3" != "yes" -a "$with_python3" != "try" ; then
+		AC_MSG_CHECKING([for python3])
+		if test ! -x "$with_python3" ; then
+			AC_MSG_ERROR([Specified python3 does not exist or is not executable: $with_python3])
+		fi
+		AC_MSG_RESULT([$with_python3])
+		AC_SUBST([PYTHON3], ["$with_python3"])
+	else
+		AC_PATH_PROG([PYTHON3], ["python3"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
+	fi
+
+	if test "$PYTHON3" != "no" ; then
+		AC_MSG_CHECKING([python3 version])
+		PYTHON3_VER="`$PYTHON3 -V 2>&1 | cut -d' ' -f2`"
+
+		if test -z "$PYTHON3_VER" ; then
+			AC_MSG_ERROR([Unable to detect python3 version])
+		fi
+		AC_MSG_RESULT([$PYTHON3_VER])
+
+		AC_MSG_CHECKING([for python3 distutils])
+		python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
+		if test -z "$python3_result" ; then
+			python3_has_distutils="yes"
+		else
+			python3_has_distutils="no"
+		fi
+		AC_MSG_RESULT([$python3_has_distutils])
+
+		if test "$python3_has_distutils" != "no" ; then
+			AC_MSG_CHECKING([location of python3 site-packages])
+
+			PYTHON3_SITE_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
+
+			if test -z "$PYTHON3_SITE_DIR" ; then
+				AC_MSG_ERROR([Unable to detect python3 site-packages path])
+			elif test ! -d "$PYTHON3_SITE_DIR" ; then
+				AC_MSG_ERROR([Path $PYTHON3_SITE_DIR returned by python3 does not exist!])
+			fi
+			AC_MSG_RESULT([$PYTHON3_SITE_DIR])
+			AC_SUBST([PYTHON3_SITE_DIR], [$PYTHON3_SITE_DIR])
+
+			#
+			# python3 distutils found, get settings from python3 directly
+			#
+			PYTHON3_CFLAGS="`$PYTHON3 -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
+			PYTHON3_LDFLAGS="`$PYTHON3 -c 'from distutils import sysconfig; ldver = sysconfig.get_config_var(\"LDVERSION\"); libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\" + [[ldver,sysconfig.get_config_var(\"VERSION\")]][[ldver==None]]); print(\" \".join(libs));'`"
+			PYTHON3_LIB="`$PYTHON3 -c 'from distutils import sysconfig; ldver = sysconfig.get_config_var(\"LDVERSION\"); print(\"python\" + [[ldver,sysconfig.get_config_var(\"VERSION\")]][[ldver==None]]);'`"
+			PYTHON3_LIBDIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
+
+			# handle python3 being installed into /usr/local
+			AC_MSG_CHECKING([python3 libdir])
+			if test -z "`echo $PYTHON3_LIBDIR | grep "/usr/lib"`" ; then
+				PYTHON3_LDFLAGS="-L$PYTHON3_LIBDIR $PYTHON3_LDFLAGS"
+				LIBS="-L$PYTHON3_LIBDIR $LIBS"
+			fi
+			AC_MSG_RESULT([$PYTHON3_LIBDIR])
+
+			# check libpython3
+			AC_CHECK_LIB([$PYTHON3_LIB], [main], [has_libpython3="yes"], [has_libpython3="no"])
+
+			if test "$has_libpython3" = "no" ; then
+				AS_IF([test "$with_python3" = "try"],
+				 	[AC_MSG_WARN([$PYTHON3_LIB is unusable])],
+					[AC_MSG_ERROR([$PYTHON3_LIB is unusable])]
+				)
+			fi
+
+			# check whether system libpython3 is usable and has threads support
+			CFLAGS="$PYTHON3_CFLAGS"
+			LIBS="$PYTHON3_LDFLAGS"
+			AC_CHECK_FUNC([PyThread_init_thread], [python3_has_threads="yes"], [python3_has_threads="no"])
+
+			if test "$python3_has_threads" = "no"; then
+				AS_IF([test "$with_python3" = "try"],
+					[AC_MSG_WARN([Your python3 lacks threads support, can not build mod_python3])],
+					[AC_MSG_ERROR([Your python3 lacks threads support, can not build mod_python3])]
+				)
+			else
+				AC_MSG_NOTICE([Your python3 seems OK, do not forget to enable mod_python3 in modules.conf])
+				AC_SUBST([PYTHON3_CFLAGS],  [$PYTHON3_CFLAGS])
+				AC_SUBST([PYTHON3_LDFLAGS], [$PYTHON3_LDFLAGS])
+			fi
+		else
+			AS_IF([test "$with_python3" = "try"],
+				[AC_MSG_WARN([Could not find or use python3 distutils module: $python3_result])],
+				[AC_MSG_ERROR([Could not find or use python3 distutils module: $python3_result])]
+			)
+		fi
+
+		LIBS="$save_LIBS"
+		CFLAGS="$save_CFLAGS"
+
+		unset python3_has_threads
+		unset python3_has_distutils
+		unset python3_result
+	else
+		AS_IF([test "$with_python3" = "try"],
+			[AC_MSG_WARN([Could not find python3, mod_python3 will not build, use --with-python3 to specify the location])],
+			[AC_MSG_ERROR([Could not find python3, use --with-python3 to specify the location])]
+		)
+	fi
+else
+	AC_MSG_WARN([python3 support disabled, building mod_python3 will fail!])
+fi
+
+# pcap lib for unit-testing
+AC_MSG_CHECKING(libpcap)
+AC_CHECK_PROG(HAVE_PCAP_CONFIG,pcap-config,[true],[false])
+if test x"$HAVE_PCAP_CONFIG" = x"true"; then
+   AC_MSG_RESULT(yes)
+   PCAP_CONFIG=pcap-config
+   PCAP_LIBS="`$PCAP_CONFIG --libs`"
+   PCAP_CFLAGS="`$PCAP_CONFIG --cflags`"
+   AM_CONDITIONAL([HAVE_PCAP], [true])
+else
+   AC_MSG_RESULT(no)
+   AM_CONDITIONAL([HAVE_PCAP], [false])
+fi
+AC_SUBST([PCAP_CFLAGS])
+AC_SUBST([PCAP_LIBS])
+
 #
 # SNMP checks for mod_snmp
 #
@ -1848,6 +2005,55 @@ if test "${enable_address_sanitizer}" = "yes"; then
  APR_ADDTO(LDFLAGS, -fsanitize=address)
 fi

+#  Enable HEAP profiler (requires libgoogle-perftools-dev package)
+AC_ARG_ENABLE(heap_profiler,
+  [AC_HELP_STRING([--enable-heap-profiler],[build with google heap profiler])],
+  [enable_heap_profiler="$enable_heap_profiler"],
+  [enable_heap_profiler="no"])
+
+#  Enable CPU profiler (requires libgoogle-perftools-dev package)
+AC_ARG_ENABLE(cpu_profiler,
+  [AC_HELP_STRING([--enable-cpu-profiler],[build with google cpu profiler])],
+  [enable_cpu_profiler="$enable_cpu_profiler"],
+  [enable_cpu_profiler="no"])
+
+PKG_CHECK_MODULES([TCMALLOC], [libtcmalloc], [have_tcmalloc=yes], [have_tcmalloc=no])
+
+if test "${enable_heap_profiler}" = "yes" || test "${enable_cpu_profiler}" = "yes"; then
+  if test "x$have_tcmalloc" != "xyes" ; then
+    AC_MSG_ERROR([You must install libgoogle-perftools-dev in order to use heap or cpu profiler])
+  fi
+fi
+
+# WARNING: When both enabled you can NOT link them statically and MUST use the special library
+if test "${enable_heap_profiler}" = "yes" && test "${enable_cpu_profiler}" = "yes"; then
+  APR_ADDTO(CFLAGS, -ltcmalloc_and_profiler)
+  APR_ADDTO(CXXFLAGS, -ltcmalloc_and_profiler)
+  APR_ADDTO(LDFLAGS, -ltcmalloc_and_profiler)
+else
+  if test "${enable_heap_profiler}" = "yes"; then
+    APR_ADDTO(CFLAGS, -ltcmalloc)
+    APR_ADDTO(CXXFLAGS, -ltcmalloc)
+    APR_ADDTO(LDFLAGS, -ltcmalloc)
+  fi
+
+  if test "${enable_cpu_profiler}" = "yes"; then
+    APR_ADDTO(CFLAGS, -lprofiler)
+    APR_ADDTO(CXXFLAGS, -lprofiler)
+    APR_ADDTO(LDFLAGS, -lprofiler)
+  fi
+fi
+
+#  Enable fake dlclose
+AC_ARG_ENABLE(fake_dlclose,
+  [AC_HELP_STRING([--enable-fake-dlclose],[Do not unload dynamic libraries])],
+  [enable_fake_dlclose="$enable_fake_dlclose"],
+  [enable_fake_dlclose="no"])
+
+if test "${enable_fake_dlclose}" = "yes"; then
+  APR_ADDTO(SWITCH_AM_CFLAGS, -DHAVE_FAKE_DLCLOSE)
+fi
+
 AC_ARG_ENABLE(,
  [AC_HELP_STRING([--enable-pool-sanitizer],[build with sanitizer friendly pool behavior])],
  [enable_pool_sanitizer="$enable_pool_sanitizer"],
@ -1929,7 +2135,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/asr_tts/mod_flite/Makefile
 		src/mod/asr_tts/mod_pocketsphinx/Makefile
 		src/mod/asr_tts/mod_tts_commandline/Makefile
-		src/mod/asr_tts/mod_unimrcp/Makefile
 		src/mod/codecs/mod_amr/Makefile
 		src/mod/codecs/mod_amrwb/Makefile
 		src/mod/codecs/mod_b64/Makefile
@ -1958,7 +2163,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/dialplans/mod_dialplan_xml/Makefile
 		src/mod/directories/mod_ldap/Makefile
 		src/mod/endpoints/mod_alsa/Makefile
-		src/mod/endpoints/mod_dingaling/Makefile
 		src/mod/endpoints/mod_gsmopen/Makefile
 		src/mod/endpoints/mod_h323/Makefile
 		src/mod/endpoints/mod_khomp/Makefile
@ -2008,6 +2212,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/languages/mod_managed/Makefile
 		src/mod/languages/mod_perl/Makefile
 		src/mod/languages/mod_python/Makefile
+		src/mod/languages/mod_python3/Makefile
 		src/mod/languages/mod_v8/Makefile
 		src/mod/languages/mod_yaml/Makefile
 		src/mod/languages/mod_basic/Makefile
@ -2074,7 +2279,7 @@ AM_CONDITIONAL(HAVE_G729, [ test -d ${switch_srcdir}/libs/libg729 ])
 LIBTOOL='$(SHELL) $(switch_builddir)/libtool'
 TOUCH_TARGET='if test -f "$@";then touch "$@";fi;'
 CONF_MODULES='$$(grep -v "\#" $(switch_builddir)/modules.conf | sed "s/|.*//" | sed -e "s|^.*/||" | sort | uniq )'
-CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed "s/|.*//" | sed -e "s|^.*/||" | sort | uniq )'
+CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed "s/|.*//" | sed "s/\#/\#\//"| sed -e "s|^.*/||" | sort | uniq )'
 OUR_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-all ; done )"; echo $$mods )'
 OUR_CLEAN_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
 OUR_INSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'
@ -2115,16 +2320,7 @@ AC_CONFIG_SUBDIRS([libs/srtp])
 if test "$use_system_apr" != "yes"; then
   AC_CONFIG_SUBDIRS([libs/apr])
 fi
-if test "$use_system_aprutil" != "yes"; then
-   AC_CONFIG_SUBDIRS([libs/apr-util])
-fi
 AC_CONFIG_SUBDIRS([libs/iksemel])
-AC_CONFIG_SUBDIRS([libs/libdingaling])
-AC_CONFIG_SUBDIRS([libs/freetdm])
-AC_CONFIG_SUBDIRS([libs/unimrcp])
-if test "x${enable_zrtp}" = "xyes"; then
-   AC_CONFIG_SUBDIRS([libs/libzrtp])
-fi

 case $host in
   *-openbsd*|*-netbsd*)
--- a/debian/README.source
+++ b/debian/README.source
@ -63,7 +63,7 @@ The format of debian/modules.conf is:
 Building the Debian packaging
 -----------------------------

-If you want actualy Debian binary or source packages to upload to your
+If you want actually Debian binary or source packages to upload to your
 own repository, you'll need to build them as described here.  We have
 some fancy automatic tools to accomplish this.  The tools allow you to
 start from a very bare Debian image and generate working packages.
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@ -29,7 +29,7 @@ conf_dir="../conf"
 lang_dir="../conf/vanilla/lang"
 fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
 mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
-supported_debian_distros="wheezy jessie stretch buster sid"
+supported_debian_distros="wheezy jessie stretch buster bullseye sid"
 supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
@ -299,7 +299,7 @@ print_source_control () {
  esac
  local debhelper_dep="debhelper (>= 8.0.0)"
  if [ ${use_sysvinit} = "false" ]; then
-      debhelper_dep=${debhelper_dep}", dh-systemd"
+      debhelper_dep=${debhelper_dep}", dh-systemd | debhelper (>= 8.0.0)"
  fi
  cat <<EOF
 Source: freeswitch
@ -325,14 +325,14 @@ Build-Depends:
 # configure options
 libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev,
 libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
- python-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
+ python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
 # documentation
 doxygen,
 # for APR (not essential for build)
 uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev,
 # used by many modules
 libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
- bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.12.12),
+ bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.14),
 libspandsp3-dev,
 # used to format the private freeswitch apt-repo key properly
 gnupg,
@ -371,7 +371,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch

 Package: libfreeswitch1
 Architecture: amd64 armhf
-Depends: \${shlibs:Depends}, \${misc:Depends}
+Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.14)
 Recommends:
 Suggests: libfreeswitch1-dbg
 Conflicts: freeswitch-all (<= 1.6.7)
@ -653,11 +653,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-flite (= \${binary:Version}),
 freeswitch-mod-pocketsphinx (= \${binary:Version}),
 freeswitch-mod-tts-commandline (= \${binary:Version}),
- freeswitch-mod-unimrcp (= \${binary:Version}),
 freeswitch-mod-dialplan-asterisk (= \${binary:Version}),
 freeswitch-mod-dialplan-directory (= \${binary:Version}),
 freeswitch-mod-dialplan-xml (= \${binary:Version}),
- freeswitch-mod-dingaling (= \${binary:Version}),
 freeswitch-mod-loopback (= \${binary:Version}),
 freeswitch-mod-portaudio (= \${binary:Version}),
 freeswitch-mod-rtc (= \${binary:Version}),
@ -683,7 +681,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-java (= \${binary:Version}),
 freeswitch-mod-lua (= \${binary:Version}),
 freeswitch-mod-perl (= \${binary:Version}),
- freeswitch-mod-python (= \${binary:Version}),
+ freeswitch-mod-python3 (= \${binary:Version}),
 freeswitch-mod-yaml (= \${binary:Version}),
 freeswitch-mod-console (= \${binary:Version}),
 freeswitch-mod-logfile (= \${binary:Version}),
@ -892,11 +890,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-flite-dbg (= \${binary:Version}),
 freeswitch-mod-pocketsphinx-dbg (= \${binary:Version}),
 freeswitch-mod-tts-commandline-dbg (= \${binary:Version}),
- freeswitch-mod-unimrcp-dbg (= \${binary:Version}),
 freeswitch-mod-dialplan-asterisk-dbg (= \${binary:Version}),
 freeswitch-mod-dialplan-directory-dbg (= \${binary:Version}),
 freeswitch-mod-dialplan-xml-dbg (= \${binary:Version}),
- freeswitch-mod-dingaling-dbg (= \${binary:Version}),
 freeswitch-mod-loopback-dbg (= \${binary:Version}),
 freeswitch-mod-portaudio-dbg (= \${binary:Version}),
 freeswitch-mod-rtc-dbg (= \${binary:Version}),
@ -922,7 +918,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-java-dbg (= \${binary:Version}),
 freeswitch-mod-lua-dbg (= \${binary:Version}),
 freeswitch-mod-perl-dbg (= \${binary:Version}),
- freeswitch-mod-python-dbg (= \${binary:Version}),
+ freeswitch-mod-python3-dbg (= \${binary:Version}),
 freeswitch-mod-yaml-dbg (= \${binary:Version}),
 freeswitch-mod-console-dbg (= \${binary:Version}),
 freeswitch-mod-logfile-dbg (= \${binary:Version}),
--- a/debian/control-modules
+++ b/debian/control-modules
@ -291,10 +291,6 @@ Module: asr_tts/mod_tts_commandline
 Description: mod_tts_commandline
 Adds mod_tts_commandline.

-Module: asr_tts/mod_unimrcp
-Description: mod_unimrcp
- Adds mod_unimrcp.
-
 ## mod/codecs

 Module: codecs/mod_amr
@ -431,10 +427,6 @@ Description: mod_alsa
 Adds mod_alsa.
 Build-Depends: libasound2-dev

-Module: endpoints/mod_dingaling
-Description: mod_dingaling
- Adds mod_dingaling.
-
 Module: endpoints/mod_gsmopen
 Description: mod_gsmopen
 Adds mod_gsmopen.
@ -492,6 +484,7 @@ Description: Adds mod_verto.
 Adds mod_verto.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev

 ## mod/event_handlers

@ -665,11 +658,17 @@ Description: mod_perl
 Adds mod_perl.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev

 Module: languages/mod_python
 Description: mod_python
 Adds mod_python.
-Build-Depends: python-dev 
+Build-Depends: python-dev | python-dev-is-python2
+
+Module: languages/mod_python3
+Description: mod_python3
+ Adds mod_python3.
+Build-Depends: python3-dev

 Module: languages/mod_v8
 Description: mod_v8
--- a/debian/copyright
+++ b/debian/copyright
@ -1011,12 +1011,6 @@ License: MPL-1.1 or GPL-2+
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]

-Files: libs/unimrcp/*
-Copyright: 2008-2010 Arsen Chaloyan
- 2009-2010 Tomas Valenta, Arsen Chaloyan
- 2001-2006 Steve Underwood
-License: Apache-2.0
-
 Files: */inet_pton.c
 libs/curl/lib/inet_ntop.c
 libs/curl/lib/mprintf.c
@ -1595,15 +1589,6 @@ Files: libs/silk/*
 Copyright: 2006-2011, Skype Limited.
 License: BSD-2-clause

-Files: libs/libdingaling/*
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- 2001-2003 Allan Saddi <allan@saddi.com>
-License: MPL-1.1
-
-Files: libs/libdingaling/src/sha1.[ch]
-Copyright: 2001-2003 Allan Saddi <allan@saddi.com>
-License: BSD-2-clause
-
 Files: libs/libcodec2/*
 Copyright: 1990-2010 David Rowe
 1990-2010 David Rowe 2009
@ -1724,27 +1709,6 @@ License: LGPL-2.1
 Files: libs/broadvoice/autogen.sh
 License: GPL-2

-Files: libs/libzrtp/*
-Copyright: 2006-2012 Philip R. Zimmermann.
- 1993-2005 Colin Plumb
- 1998-2006, Dr Brian Gladman, Worcester, UK.
- 2002, Bryce "Zooko" Wilcox-O'Hearn
- 2010 Soft Industry
-License: AGPL-3 or MPL-1.1
-
-Files: libs/libzrtp/test/cmockery/cmockery.c
-Copyright: 2008 Google Inc
-License: Apache-2.0
-
-Files: libs/libzrtp/third_party/bnlib/legal.c
- libs/libzrtp/third_party/bnlib/*
-Copyright: 1993-2005 Colin Plumb
-License: GPL-2 or GPL-3 or MPL-1.1
-
-Files: libs/libzrtp/third_party/bnlib/test/md5.c
-Copyright: 1995 Abandoned Colin Plumb
-License: public-domain
-
 Files: libs/win32/sqlite/sqlite3.[ch]
 libs/win32/sqlite/parse.c
 Copyright: 2006 Abandoned D. Richard Hipp <drh@hwaci.com>
--- a/debian/freeswitch-mod-python.install.tmpl
+++ b/debian/freeswitch-mod-python.install.tmpl
@ -1 +1 @@
-/usr/lib/python*/*-packages/freeswitch.py
+/usr/lib/python2*/*-packages/freeswitch.py
--- a/debian/freeswitch-mod-python3.install.tmpl
+++ b/debian/freeswitch-mod-python3.install.tmpl
@ -0,0 +1 @@
+/usr/lib/python3*/*-packages/freeswitch.py
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@ -23,11 +23,6 @@ Rules:
  -
   Glob: libs/srtp/update.sh
   Copyright: Ingate Systems AB
-  -
-   Glob: libs/libzrtp/third_party/bnlib/test/md5.c
-   Matches: This\scode\sis\sin\sthe\spublic\sdomain;\sdo\swith\sit\swhat\syou\swish.
-   Copyright: 1995 Abandoned Colin Plumb
-   License: public-domain
  -
   Glob: src/g711.c
   Matches: Copyright\s\(C\)\s2006\sSteve\sUnderwood
@ -56,28 +51,6 @@ Rules:
   Glob: src/include/switch_cpp.h
   Matches: Author[:]\sYossi\sNeiman\s<freeswitch@cartissolutions.com>,\s\(C\)\s2007////\sCopyright[:]
   Copyright: 2007 Yossi Neiman <freeswitch@cartissolutions.com>
-  -
-   Glob: libs/libzrtp/*
-   Matches: For\slicensing\sand\sother\slegal\sdetails,\ssee\sthe\sfile\szrtp_legal.c.
-   License: AGPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/third_party/bnlib/*
-   Matches: For\slicensing\sand\sother\slegal\sdetails,\ssee\sthe\sfile\slegal.c.
-   License: GPL-2 or GPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/src/zrtp_legal.c
-   Matches: As\sa\sspecial\sexception,\syou\smay\scombine\sthis\slibrary\swith\sthe\scode
-   Matches: License\sVersion\s1.1\s\(MPLv1.1\).
-   License: AGPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/third_party/bnlib/legal.c
-   Matches: As\sa\sspecial\sexception,\syou\smay\scombine\sthis\slibrary\swith\sthe\scode
-   Matches: License\sVersion\s1.1\s\(MPLv1.1\).
-   License: GPL-2 or GPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/projects/symbian/DelayRuner.h
-   Matches: Copyright\s+:\sCopyright\s\(c\)\s2010\sSoft\sIndustry
-   Copyright: 2010 Soft Industry
  -
   Glob: libs/win32/sqlite/*.[ch]
   Matches: The\sauthor\sdisclaims\scopyright\sto\sthis\ssource\scode.
--- a/debian/rules
+++ b/debian/rules
@ -73,8 +73,8 @@ override_dh_auto_clean:
 	./configure -C --enable-portable-binary --disable-dependency-tracking \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --localstatedir=/var --sysconfdir=/etc \
-		--with-gnu-ld --with-python --with-erlang --with-openssl \
-		--enable-core-odbc-support --enable-zrtp
+		--with-gnu-ld --with-python --with-python3 --with-erlang --with-openssl \
+		--enable-core-odbc-support
 	touch $@

 override_dh_auto_configure: .stamp-configure
@ -85,6 +85,7 @@ override_dh_auto_configure: .stamp-configure
 	make iksemel-dep
 	make -j$(NJOBS)
 	make -C libs/esl pymod
+	make -C libs/esl py3mod
 	make -C libs/esl perlmod
 	touch $@

@ -99,6 +100,7 @@ override_dh_strip:
 override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install -- -C libs/esl pymod-install
+	dh_auto_install -- -C libs/esl py3mod-install
 	dh_auto_install -- -C libs/esl perlmod-install
 	rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING

--- a/Show More
+++ b/Show More