diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
index be6a38277edafc..b90e3933c351e5 100644
--- a/examples/all-clusters-app/cc13x4_26x4/README.md
+++ b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -109,7 +109,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
index 98926214c4cb36..88099f009f2dac 100644
--- a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -76,8 +76,10 @@ AppTask AppTask::sAppTask;
 
 constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs);
 void CancelTimer(void);
+#endif
 
 uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                                                                                    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
@@ -100,9 +102,9 @@ void InitializeOTARequestor(void)
     sDownloader.SetImageProcessorDelegate(&sImageProcessor);
     sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
 }
-#endif
 
 TimerHandle_t sOTAInitTimer = 0;
+#endif
 
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
@@ -176,10 +178,12 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
 #endif
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void OTAInitTimerEventHandler(TimerHandle_t xTimer)
 {
     InitializeOTARequestor();
 }
+#endif
 
 int AppTask::StartAppTask()
 {
@@ -224,6 +228,7 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
     sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
                                  OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
@@ -240,6 +245,7 @@ int AppTask::Init()
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
     }
+#endif
 
     ret = ThreadStackMgr().InitThreadStack();
     if (ret != CHIP_NO_ERROR)
diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md
index 73718a0bf76a86..5a6f6efb6a53ae 100644
--- a/examples/lighting-app/cc13x4_26x4/README.md
+++ b/examples/lighting-app/cc13x4_26x4/README.md
@@ -108,7 +108,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp b/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp
index aa9bdbccefa3c3..6c4ffacdda2565 100644
--- a/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp
+++ b/examples/lighting-app/cc13x4_26x4/src/AppTask.cpp
@@ -126,9 +126,9 @@ void InitializeOTARequestor(void)
     sDownloader.SetImageProcessorDelegate(&sImageProcessor);
     sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
 }
-#endif
 
 TimerHandle_t sOTAInitTimer = 0;
+#endif
 
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
@@ -215,10 +215,12 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void OTAInitTimerEventHandler(TimerHandle_t xTimer)
 {
     InitializeOTARequestor();
 }
+#endif
 
 int AppTask::Init()
 {
@@ -239,6 +241,7 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
     sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
                                  OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
@@ -255,6 +258,7 @@ int AppTask::Init()
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
     }
+#endif
 
     ret = ThreadStackMgr().InitThreadStack();
     if (ret != CHIP_NO_ERROR)
@@ -371,6 +375,7 @@ void AppTask::AppTaskMain(void * pvParameter)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs)
 {
     PLAT_LOG("Start OTA Init Timer")
@@ -396,6 +401,7 @@ void CancelTimer(void)
         PLAT_LOG("sOTAInitTimer stop() failed");
     }
 }
+#endif
 
 void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
 {
diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
index 7ff622a8e14f90..c7d15dcc8533fe 100644
--- a/examples/lock-app/cc13x4_26x4/README.md
+++ b/examples/lock-app/cc13x4_26x4/README.md
@@ -109,7 +109,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
index b26bd6ae43f8c1..f210aaf1a6e1de 100644
--- a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
+++ b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
@@ -94,8 +94,10 @@ void uiLocked(void);
 void uiUnlocking(void);
 void uiUnlocked(void);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs);
 void CancelTimer(void);
+#endif
 
 uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                                                                                    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
@@ -118,10 +120,11 @@ void InitializeOTARequestor(void)
     sDownloader.SetImageProcessorDelegate(&sImageProcessor);
     sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
 }
-#endif
 
 TimerHandle_t sOTAInitTimer = 0;
 
+#endif
+
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
 // Init sequence if the device is not yet on a Thread Network. Once the timer
@@ -207,10 +210,12 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void OTAInitTimerEventHandler(TimerHandle_t xTimer)
 {
     InitializeOTARequestor();
 }
+#endif
 
 int AppTask::Init()
 {
@@ -230,6 +235,7 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
     sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
                                  OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
@@ -246,6 +252,7 @@ int AppTask::Init()
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
     }
+#endif
 
     ret = ThreadStackMgr().InitThreadStack();
     if (ret != CHIP_NO_ERROR)
@@ -418,6 +425,7 @@ void AppTask::AppTaskMain(void * pvParameter)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs)
 {
     PLAT_LOG("Start OTA Init Timer")
@@ -443,6 +451,7 @@ void CancelTimer(void)
         PLAT_LOG("sOTAInitTimer stop() failed");
     }
 }
+#endif
 
 void AppTask::ActionInitiated(LockManager::Action_t aAction)
 {
diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
index 1e7e0c33b2136a..5cd2e3c367be79 100644
--- a/examples/pump-app/cc13x4_26x4/README.md
+++ b/examples/pump-app/cc13x4_26x4/README.md
@@ -108,7 +108,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
index 9ec109313d3ad1..9c409b09256d8b 100644
--- a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
@@ -96,8 +96,10 @@ AppTask AppTask::sAppTask;
 
 static DeviceCallbacks sDeviceCallbacks;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs);
 void CancelTimer(void);
+#endif
 
 uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                                                                                    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
@@ -120,9 +122,9 @@ void InitializeOTARequestor(void)
     sDownloader.SetImageProcessorDelegate(&sImageProcessor);
     sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
 }
-#endif
 
 TimerHandle_t sOTAInitTimer = 0;
+#endif
 
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
@@ -171,10 +173,12 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void OTAInitTimerEventHandler(TimerHandle_t xTimer)
 {
     InitializeOTARequestor();
 }
+#endif
 
 int AppTask::StartAppTask()
 {
@@ -217,6 +221,7 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
     sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
                                  OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
@@ -233,6 +238,7 @@ int AppTask::Init()
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
     }
+#endif
 
     ret = ThreadStackMgr().InitThreadStack();
     if (ret != CHIP_NO_ERROR)
@@ -353,6 +359,7 @@ void AppTask::PostEvent(const AppEvent * aEvent)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs)
 {
     PLAT_LOG("Start OTA Init Timer")
@@ -378,6 +385,7 @@ void CancelTimer(void)
         PLAT_LOG("sOTAInitTimer stop() failed");
     }
 }
+#endif
 
 void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
 {
diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
index bd357fb25f2961..9b5eb0e693426d 100644
--- a/examples/pump-controller-app/cc13x4_26x4/README.md
+++ b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -110,7 +110,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
index a8d1e1d88f5cd3..d437da1c06d304 100644
--- a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
@@ -83,8 +83,10 @@ static Button_Handle sAppRightHandle;
 
 AppTask AppTask::sAppTask;
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs);
 void CancelTimer(void);
+#endif
 
 uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                                                                                    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
@@ -107,10 +109,11 @@ void InitializeOTARequestor(void)
     sDownloader.SetImageProcessorDelegate(&sImageProcessor);
     sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
 }
-#endif
 
 TimerHandle_t sOTAInitTimer = 0;
 
+#endif
+
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
 // Init sequence if the device is not yet on a Thread Network. Once the timer
@@ -199,10 +202,12 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void OTAInitTimerEventHandler(TimerHandle_t xTimer)
 {
     InitializeOTARequestor();
 }
+#endif
 
 int AppTask::Init()
 {
@@ -222,6 +227,7 @@ int AppTask::Init()
             ;
     }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
     sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
                                  OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
@@ -238,6 +244,7 @@ int AppTask::Init()
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
     }
+#endif
 
     ret = ThreadStackMgr().InitThreadStack();
     if (ret != CHIP_NO_ERROR)
@@ -352,6 +359,7 @@ void AppTask::PostEvent(const AppEvent * aEvent)
     }
 }
 
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs)
 {
     PLAT_LOG("Start OTA Init Timer")
@@ -377,6 +385,7 @@ void CancelTimer(void)
         PLAT_LOG("sOTAInitTimer stop() failed");
     }
 }
+#endif
 
 void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
 {
diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
index 3f1923f3db33af..2d5e53d5ec1b18 100644
--- a/examples/shell/cc13x4_26x4/README.md
+++ b/examples/shell/cc13x4_26x4/README.md
@@ -63,7 +63,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
     ```
 
 ## Programming
diff --git a/src/lwip/cc13xx_26xx/lwipopts.h b/src/lwip/cc13xx_26xx/lwipopts.h
index d89c33afb5ed84..26a1bb6641cb00 100644
--- a/src/lwip/cc13xx_26xx/lwipopts.h
+++ b/src/lwip/cc13xx_26xx/lwipopts.h
@@ -89,7 +89,7 @@
 #define MEMP_SEPARATE_POOLS (1)
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
-#define PBUF_POOL_SIZE (12)
+#define PBUF_POOL_SIZE (18)
 #define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
index 3df24854297f49..76a59df16bc370 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
@@ -484,6 +484,9 @@ template("ti_simplelink_executable") {
     } else {
       # The executable is the final target.
       data_deps = [ ":${simplelink_target_name}.out" ]
+      if (ti_simplelink_device_family == "cc13x4_26x4" && custom_factory_data) {
+        data_deps += [ ":${simplelink_target_name}-and-factory-data.hex" ]
+      }
     }
 
     if (defined(invoker.data_deps)) {