diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/all-clusters-app/cc13x4_26x4/.gn b/examples/all-clusters-app/cc13x4_26x4/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/all-clusters-app/cc13x4_26x4/.gn
+++ b/examples/all-clusters-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/all-clusters-app/cc13x4_26x4/args.gni b/examples/all-clusters-app/cc13x4_26x4/args.gni
index a524bf977b9a23..c54b13b4208104 100644
--- a/examples/all-clusters-app/cc13x4_26x4/args.gni
+++ b/examples/all-clusters-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
index b8fa3a21a4f9d8..314ac6edd9adb4 100644
--- a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -216,14 +216,13 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
-
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/.gn b/examples/lighting-app/cc13x2x7_26x2x7/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/lighting-app/cc13x2x7_26x2x7/.gn
+++ b/examples/lighting-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/args.gni b/examples/lighting-app/cc13x2x7_26x2x7/args.gni
index a6a8662c4d14cb..9e64039395375a 100644
--- a/examples/lighting-app/cc13x2x7_26x2x7/args.gni
+++ b/examples/lighting-app/cc13x2x7_26x2x7/args.gni
@@ -33,7 +33,8 @@ chip_openthread_ftd = false
 openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
 
 # Disable CHIP Logging
-#chip_progress_logging = false
+chip_progress_logging = false
+
 #chip_detail_logging = false
 #chip_automation_logging = false
 
diff --git a/examples/lighting-app/cc13x4_26x4/.gn b/examples/lighting-app/cc13x4_26x4/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/lighting-app/cc13x4_26x4/.gn
+++ b/examples/lighting-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x2x7_26x2x7/.gn b/examples/lock-app/cc13x2x7_26x2x7/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/lock-app/cc13x2x7_26x2x7/.gn
+++ b/examples/lock-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni
index bd3e05a0055114..52ad321e6bdfeb 100644
--- a/examples/lock-app/cc13x2x7_26x2x7/args.gni
+++ b/examples/lock-app/cc13x2x7_26x2x7/args.gni
@@ -34,7 +34,8 @@ openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc
 
 # Disable CHIP Logging
 chip_progress_logging = false
-chip_detail_logging = false
+
+#chip_detail_logging = false
 chip_automation_logging = false
 
 # BLE options
diff --git a/examples/lock-app/cc13x4_26x4/.gn b/examples/lock-app/cc13x4_26x4/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/lock-app/cc13x4_26x4/.gn
+++ b/examples/lock-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/lock-app/cc13x4_26x4/args.gni b/examples/lock-app/cc13x4_26x4/args.gni
index bea77489ce4158..c34d0cfcd5b08b 100644
--- a/examples/lock-app/cc13x4_26x4/args.gni
+++ b/examples/lock-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
diff --git a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
index 02f900809aae9b..218b8aefe9f3d3 100644
--- a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
+++ b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
@@ -96,4 +96,4 @@
 #define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
 
 // Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config.h"
+#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h b/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h
index e61b5a3a5ac7a9..ca8f9a8a3347fe 100644
--- a/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h
+++ b/examples/platform/cc13x4_26x4/project_include/OpenThreadConfig.h
@@ -96,4 +96,4 @@
 #define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
 
 // Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config.h"
+#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/pump-app/cc13x2x7_26x2x7/.gn b/examples/pump-app/cc13x2x7_26x2x7/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/.gn
+++ b/examples/pump-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
index 2dfecb65a11bc0..6fe2ee9973b3d7 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -156,13 +156,14 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
index 8cda813016e45e..9bcfec5a6f8b51 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
@@ -27,6 +27,8 @@
 #include "AppConfig.h"
 #include "PumpManager.h"
 
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 #include <app/server/Dnssd.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>
diff --git a/examples/pump-app/cc13x4_26x4/.gn b/examples/pump-app/cc13x4_26x4/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/pump-app/cc13x4_26x4/.gn
+++ b/examples/pump-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-app/cc13x4_26x4/args.gni b/examples/pump-app/cc13x4_26x4/args.gni
index a0299575e8bc49..93f1bd19e1590f 100644
--- a/examples/pump-app/cc13x4_26x4/args.gni
+++ b/examples/pump-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
diff --git a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
index b5be215216a4bf..4e70c312e77f33 100644
--- a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
@@ -157,12 +157,12 @@ int AppTask::Init()
             ;
     }
 
-#ifdef CONFIG_OPENTHREAD_MTD_SED
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#elif CONFIG_OPENTHREAD_MTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
 #endif
     if (ret != CHIP_NO_ERROR)
     {
diff --git a/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp
index 8cda813016e45e..9bcfec5a6f8b51 100644
--- a/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp
+++ b/examples/pump-app/cc13x4_26x4/main/DeviceCallbacks.cpp
@@ -27,6 +27,8 @@
 #include "AppConfig.h"
 #include "PumpManager.h"
 
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 #include <app/server/Dnssd.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
index fa5d85eaa6e42e..e7dadb13f75fad 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -145,7 +145,14 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#else
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/examples/pump-controller-app/cc13x4_26x4/.gn b/examples/pump-controller-app/cc13x4_26x4/.gn
index 3d48789e30ab3d..cf974b2eb1df22 100644
--- a/examples/pump-controller-app/cc13x4_26x4/.gn
+++ b/examples/pump-controller-app/cc13x4_26x4/.gn
@@ -25,4 +25,6 @@ default_args = {
   target_os = "freertos"
 
   import("//args.gni")
+  pw_build_PIP_REQUIREMENTS +=
+      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
 }
diff --git a/examples/pump-controller-app/cc13x4_26x4/args.gni b/examples/pump-controller-app/cc13x4_26x4/args.gni
index 39b1c91806af19..680e5eaf6d33eb 100644
--- a/examples/pump-controller-app/cc13x4_26x4/args.gni
+++ b/examples/pump-controller-app/cc13x4_26x4/args.gni
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
 import("${chip_root}/examples/platform/cc13x4_26x4/args.gni")
 
 ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
diff --git a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
index 51ef817cff14ac..3d8b0bf2033b34 100644
--- a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
@@ -145,7 +145,14 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_THREAD_FTD
     ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+#elif CONFIG_OPENTHREAD_MTD_SED
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
+#else
+    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
+#endif
+
     if (ret != CHIP_NO_ERROR)
     {
         PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
diff --git a/scripts/setup/requirements.ti.txt b/scripts/setup/requirements.ti.txt
index 14ea26e1ba9fd7..b832ec6cf68b69 100644
--- a/scripts/setup/requirements.ti.txt
+++ b/scripts/setup/requirements.ti.txt
@@ -1 +1,2 @@
 ecdsa>=0.17.0
+intelhex
diff --git a/src/platform/cc13xx_26xx/BLEManagerImpl.cpp b/src/platform/cc13xx_26xx/BLEManagerImpl.cpp
index 65c5cf0a2d9938..465a2b746aee39 100644
--- a/src/platform/cc13xx_26xx/BLEManagerImpl.cpp
+++ b/src/platform/cc13xx_26xx/BLEManagerImpl.cpp
@@ -266,9 +266,7 @@ bool BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
     void * pMsg = (void *) ICall_malloc(sizeof(void *));
     pMsg        = (void *) conId;
 
-    EnqueueEvtHdrMsg(BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT, (void *) pMsg);
-
-    return false;
+    return (EnqueueEvtHdrMsg(BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT, (void *) pMsg) == true);
 }
 
 uint16_t BLEManagerImpl::GetMTU(BLE_CONNECTION_OBJECT conId) const
diff --git a/third_party/openthread/ot-ti b/third_party/openthread/ot-ti
index 8bec26bf2a882d..a9dd46d64f7279 160000
--- a/third_party/openthread/ot-ti
+++ b/third_party/openthread/ot-ti
@@ -1 +1 @@
-Subproject commit 8bec26bf2a882d252a83ce4154a5c8e0031e56c0
+Subproject commit a9dd46d64f7279974d3fd7b077e22aaf663d1460