diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 148426d99ccd6b..a5a059ec7b9cbb 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1da7dd09665706..0616a9bb7f7acd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,6 +16,8 @@ name: Builds
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -136,7 +138,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -279,7 +281,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -340,7 +342,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -449,7 +451,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index c2c4a777bde7d3..f69ed74e523421 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -16,6 +16,8 @@ name: Build Chef CI examples on all platforms
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -33,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             options: --user root
 
         steps:
@@ -54,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:41
+            image: ghcr.io/project-chip/chip-build-esp32:47
             options: --user root
 
         steps:
@@ -75,7 +77,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:41
+            image: ghcr.io/project-chip/chip-build-nrf-platform:47
             options: --user root
 
         steps:
@@ -96,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:41
+            image: ghcr.io/project-chip/chip-build-telink:47
             options: --user root
 
         steps:
@@ -108,7 +110,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 65dc1812431bf946dfc110682298acf83d63e27a"
             - name: CI Examples Telink
               shell: bash
               run: |
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 919085ac77ee0f..e61bdd8778d209 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -16,6 +16,8 @@ name: Cirque
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: ghcr.io/project-chip/chip-build-cirque:41
+        #             image: ghcr.io/project-chip/chip-build-cirque:47
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 78e06521d973f2..a916250572bb6e 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -16,6 +16,8 @@ name: Darwin Tests
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index af8740f74eddb7..3076f046e3f38f 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -16,6 +16,8 @@ name: Darwin
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -73,9 +75,6 @@ jobs:
                 options: # We don't need a full matrix
                     - flavor: asan
                       arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
-                    - flavor: asan-global-storage
-                      arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
-                      defines: MTR_PER_CONTROLLER_STORAGE_ENABLED=0
                     - flavor: tsan
                       arguments: -enableThreadSanitizer YES
         steps:
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index cc93947c2c0937..90a1ee02c6ffd7 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -81,7 +81,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:41
+            image: ghcr.io/project-chip/chip-build-doxygen:47
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 1d4d478d0c00b6..ff405b963c1827 100644
--- a/.github/workflows/examples-ameba.yaml
+++ b/.github/workflows/examples-ameba.yaml
@@ -16,6 +16,8 @@ name: Build example - Ameba
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -36,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:42
+            image: ghcr.io/project-chip/chip-build-ameba:47
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 52c63eda8fbbd0..55f14bc003a278 100644
--- a/.github/workflows/examples-asr.yaml
+++ b/.github/workflows/examples-asr.yaml
@@ -16,6 +16,8 @@ name: Build example - ASR
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:41
+            image: ghcr.io/project-chip/chip-build-asr:47
             options: --user root
 
         steps:
@@ -60,4 +62,4 @@ jobs:
                         --target asr-asr582x-dishwasher \
                         --target asr-asr582x-refrigerator \
                         build \
-                     "
\ No newline at end of file
+                     "
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 8d12696dcd8f89..7599fb1738c884 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -16,6 +16,8 @@ name: Build example - BouffaloLab
 
 on:
   push:
+    branches-ignore:
+      - 'dependabot/**'
   pull_request:
   merge_group:
   workflow_dispatch:
@@ -35,7 +37,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:41
+      image: ghcr.io/project-chip/chip-build-bouffalolab:47
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13xx_26xx.yaml
similarity index 92%
rename from .github/workflows/examples-cc13x2x7_26x2x7.yaml
rename to .github/workflows/examples-cc13xx_26xx.yaml
index d36fb18c7c0509..ce8c5a94910c1c 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13xx_26xx.yaml
@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Build example - TI CC26X2X7
+name: Build example - TI CC13XX_26XX
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -26,17 +28,17 @@ env:
     CHIP_NO_LOG_TIMESTAMPS: true
     
 jobs:
-    cc26x2x7:
-        name: cc26x2x7
+    cc13xx_26xx:
+        name: cc13xx_26xx
 
         env:
-            BUILD_TYPE: gn_cc26x2x7
+            BUILD_TYPE: gn_cc13xx_26xx
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:46
+            image: ghcr.io/project-chip/chip-build-ti:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -97,11 +99,6 @@ jobs:
                     cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
                     out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
                     /tmp/bloat_reports/
-            - name: Uploading Size Reports
-              uses: ./.github/actions/upload-size-reports
-              if: ${{ !env.ACT }}
-              with:
-                platform-name: cc13x2x7_26x2x7
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index a56e5cff8d70c4..112f79c429e526 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -16,6 +16,8 @@ name: Build example - TI CC32XX
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:46
+            image: ghcr.io/project-chip/chip-build-ti:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index c4af320b990074..019807f32164c0 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -16,6 +16,8 @@ name: Build example - EFR32
 
 on:
   push:
+    branches-ignore:
+      - 'dependabot/**'
   pull_request:
   merge_group:
 
@@ -38,7 +40,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:41
+      image: ghcr.io/project-chip/chip-build-efr32:47
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index d262bd789c687b..be0cecc263f740 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -16,6 +16,8 @@ name: Build example - ESP32
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:41
+            image: ghcr.io/project-chip/chip-build-esp32:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -124,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:41
+            image: ghcr.io/project-chip/chip-build-esp32:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index 0f94ce1a2da631..c06f6181b4aac1 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -16,6 +16,8 @@ name: Build example - Infineon
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -35,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:41
+            image: ghcr.io/project-chip/chip-build-infineon:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -144,4 +146,4 @@ jobs:
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
               with:
-                platform-name: Infineon
\ No newline at end of file
+                platform-name: Infineon
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
index 562279a0d35375..bc9d3025a8369f 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -16,6 +16,8 @@ name: Build example - Linux ARM
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:41
+            image: ghcr.io/project-chip/chip-build-crosscompile:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index 843e76b9b14c41..cd52f099b39bc5 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -16,6 +16,8 @@ name: Build example - i.MX Linux
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:41
+            image: ghcr.io/project-chip/chip-build-imx:47
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index ea60e6adbcb022..28f0ad19dbbe45 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -16,6 +16,8 @@ name: Build example - Linux Standalone
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-tv-casting-app.yaml b/.github/workflows/examples-linux-tv-casting-app.yaml
index daba40795f8d87..e7ecb5bdddecc7 100644
--- a/.github/workflows/examples-linux-tv-casting-app.yaml
+++ b/.github/workflows/examples-linux-tv-casting-app.yaml
@@ -16,6 +16,8 @@ name: Test TV Casting Example
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index 4b5748b4d0abe7..6c20b6374ec183 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -16,6 +16,8 @@ name: Build example - Mbed OS
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-mbed-os:41
+            image: ghcr.io/project-chip/chip-build-mbed-os:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index a16ea66c148aca..9135074a39da79 100644
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -16,6 +16,8 @@ name: Build example - MW320
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index eb62c69299fc85..ad0993852ac613 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -16,6 +16,8 @@ name: Build example - nRF Connect SDK
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:41
+            image: ghcr.io/project-chip/chip-build-nrf-platform:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
index 9a8a7b8968bdc1..f6ca62c7011f4c 100644
--- a/.github/workflows/examples-nxp.yaml
+++ b/.github/workflows/examples-nxp.yaml
@@ -16,6 +16,8 @@ name: Build example - NXP
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:38
+            image: ghcr.io/project-chip/chip-build-k32w:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index b6f69791d2270a..9ddaea33b6291b 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -16,6 +16,8 @@ name: Build example - Open IoT SDK
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -38,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-openiotsdk:41
+            image: ghcr.io/project-chip/chip-build-openiotsdk:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index b0af5ab2141ef0..5d61bccda1fdac 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -16,6 +16,8 @@ name: Build example - QPG
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -86,4 +88,4 @@ jobs:
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
               with:
-                platform-name: QPG
\ No newline at end of file
+                platform-name: QPG
diff --git a/.github/workflows/examples-rw61x.yaml b/.github/workflows/examples-rw61x.yaml
index 42df03382b9249..250968a5e1f6c2 100644
--- a/.github/workflows/examples-rw61x.yaml
+++ b/.github/workflows/examples-rw61x.yaml
@@ -16,6 +16,8 @@ name: Build example - RW61X
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-rw61x:37
+            image: ghcr.io/project-chip/chip-build-rw61x:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index 9a30af500112ce..58ccf9760fbe75 100644
--- a/.github/workflows/examples-stm32.yaml
+++ b/.github/workflows/examples-stm32.yaml
@@ -16,6 +16,8 @@ name: Build example - stm32
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -38,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index 285ba96aceda07..c2dc5a1b43a1c4 100644
--- a/.github/workflows/examples-telink.yaml
+++ b/.github/workflows/examples-telink.yaml
@@ -16,6 +16,8 @@ name: Build example - Telink
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -36,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:41
+            image: ghcr.io/project-chip/chip-build-telink:47
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -55,7 +57,7 @@ jobs:
                 gh-context: ${{ toJson(github) }}
 
             # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 65dc1812431bf946dfc110682298acf83d63e27a"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |
@@ -175,13 +177,13 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B95 retention) Pump App
+            - name: Build example Telink (B95) Pump App
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9258a_retention-pump' build"
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9258a-pump' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9258a_retention pump-app \
-                    out/telink-tlsr9258a_retention-pump/zephyr/zephyr.elf \
+                    telink tlsr9258a pump-app \
+                    out/telink-tlsr9258a-pump/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index 65c15e5ea4114d..2b8cf469fdaa87 100644
--- a/.github/workflows/examples-tizen.yaml
+++ b/.github/workflows/examples-tizen.yaml
@@ -16,6 +16,8 @@ name: Build example - Tizen
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -34,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen:41
+            image: ghcr.io/project-chip/chip-build-tizen:47
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 81a277d906d786..e5c72de20a0b13 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -16,6 +16,8 @@ name: Full builds - Android
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     workflow_dispatch:
 
 concurrency:
@@ -36,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:41
+            image: ghcr.io/project-chip/chip-build-android:47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index f354ce369c27fd..18a2f182e7f3a6 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 97617480d8f292..ab3f49942329ce 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,9 @@
 name: "Validate Gradle Wrapper"
-on: [push, pull_request]
+on:
+    push:
+        branches-ignore:
+            - 'dependabot/**'
+    pull_request:
 
 jobs:
   validation:
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index 4356924024c9fe..32d5de468a296d 100644
--- a/.github/workflows/java-tests.yaml
+++ b/.github/workflows/java-tests.yaml
@@ -16,6 +16,8 @@ name: Java Tests
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -40,7 +42,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:41
+            image: ghcr.io/project-chip/chip-build-java:47
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
diff --git a/.github/workflows/kotlin-style.yaml b/.github/workflows/kotlin-style.yaml
index 2f8df6f486123b..a8d328268951bf 100644
--- a/.github/workflows/kotlin-style.yaml
+++ b/.github/workflows/kotlin-style.yaml
@@ -22,11 +22,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "detekt"
-        uses: natiginfo/action-detekt-all@1.23.5
+        uses: natiginfo/action-detekt-all@1.23.6
         # Detekt seems not to like circular symlinks, so we set up
         # explicit paths below
+        #
+        # In particular, if symlinks exist and recurse, detekt tries to
+        # follow, so for example `examples/android/CHIPTest` as a path
+        # will never end (and eventually run out of HEAP) because
+        # `examples/android/CHIPTest/third_party/connectedhomeip` is
+        # circular
         with:
-          args: --parallel --build-upon-default-config --config kotlin-detect-config.yaml --input examples/android/CHIPTest,examples/android/CHIPTool,examples/java-matter-controller/java,src/controller/java
+          args: --parallel --build-upon-default-config --config kotlin-detect-config.yaml --input examples/android/CHIPTest/app,examples/android/CHIPTool,examples/java-matter-controller/java,src/controller/java
 
   ktlint:
     name: "Format check"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 30907201df17d0..4fbaab2a46a675 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,14 +13,20 @@
 # limitations under the License.
 
 name: Lint Code Base
+
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
 
 concurrency:
-    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    group:
+        ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
+        'pull_request' && github.event.number) || (github.event_name ==
+        'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
 
 jobs:
@@ -29,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
 
         steps:
             - name: Checkout
@@ -40,7 +46,7 @@ jobs:
             - name: Checkout submodules & Bootstrap
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
-                platform: linux
+                  platform: linux
 
             - name: Check for orphaned gn files
               if: always()
@@ -90,7 +96,6 @@ jobs:
                      --known-failure app/app-platform/ContentAppPlatform.h \
                      --known-failure controller/ExamplePersistentStorage.cpp \
                      --known-failure controller/ExamplePersistentStorage.h \
-                     --known-failure app/AttributeAccessInterface.h \
                      --known-failure app/AttributeAccessToken.h \
                      --known-failure app/CommandHandler.h \
                      --known-failure app/CommandHandlerInterface.h \
@@ -100,11 +105,11 @@ jobs:
                      --known-failure app/reporting/reporting.cpp \
                      --known-failure app/reporting/tests/MockReportScheduler.cpp \
                      --known-failure app/reporting/tests/MockReportScheduler.h \
-                     --known-failure app/TestEventTriggerDelegate.h \
-                     --known-failure app/util/af.h \
                      --known-failure app/util/attribute-storage.cpp \
+                     --known-failure app/util/attribute-storage-detail.h \
                      --known-failure app/util/attribute-storage.h \
                      --known-failure app/util/attribute-table.cpp \
+                     --known-failure app/util/attribute-table-detail.h \
                      --known-failure app/util/attribute-table.h \
                      --known-failure app/util/binding-table.cpp \
                      --known-failure app/util/binding-table.h \
@@ -117,6 +122,7 @@ jobs:
                      --known-failure app/util/generic-callbacks.h \
                      --known-failure app/util/generic-callback-stubs.cpp \
                      --known-failure app/util/im-client-callbacks.h \
+                     --known-failure app/util/IMClusterCommandHandler.h \
                      --known-failure app/util/util.cpp \
                      --known-failure app/util/util.h \
                      --known-failure app/WriteHandler.h \
@@ -170,7 +176,8 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of PRI*8, which are not supported on some libcs.
+            - name:
+                  Check for use of PRI*8, which are not supported on some libcs.
               if: always()
               run: |
                   git grep -I -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
@@ -178,7 +185,9 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of PRI*16, which are not supported on some libcs.
+            - name:
+                  Check for use of PRI*16, which are not supported on some
+                  libcs.
               if: always()
               run: |
                   git grep -I -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
@@ -186,7 +195,9 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of PRI*64, which are not supported on some libcs.
+            - name:
+                  Check for use of PRI*64, which are not supported on some
+                  libcs.
               if: always()
               run: |
                   # TODO: MessageDefHelper should ideally not be excluded here.
@@ -226,7 +237,9 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of 0x%u and the like, which lead to misleading output.
+            - name:
+                  Check for use of 0x%u and the like, which lead to misleading
+                  output.
               if: always()
               run: |
                   git grep -I -n '0x%[0-9l.-]*[^0-9lxX".-]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
@@ -234,14 +247,18 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of '"0x" PRIu*' and the like, which lead to misleading output.
+            - name:
+                  Check for use of '"0x" PRIu*' and the like, which lead to
+                  misleading output.
               if: always()
               run: |
                   git grep -I -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
 
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.
-            - name: Check for use of NSLog instead of Matter logging in Matter framework
+            - name:
+                  Check for use of NSLog instead of Matter logging in Matter
+                  framework
               if: always()
               run: |
                   git grep -n 'NSLog(' -- src/darwin/Framework/CHIP && exit 1 || exit 0
@@ -250,20 +267,24 @@ jobs:
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself, as well as excluding the files
             # that implement the type-safe accessors
-            - name: Check for use of 'emberAfReadAttribute' instead of the type-safe getters
+            - name:
+                  Check for use of 'emberAfReadAttribute' instead of the
+                  type-safe getters
               if: always()
               run: |
-                  git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp'  && exit 1 || exit 0
+                  git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/attribute-table.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp'  && exit 1 || exit 0
 
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself, as well as excluding the files
             # that implement the type-safe accessors, attribute writing from the wire, and some
             # Pigweed RPC code that seems hard to update.
-            - name: Check for use of 'emberAfWriteAttribute' instead of the type-safe setters
+            - name:
+                  Check for use of 'emberAfWriteAttribute' instead of the
+                  type-safe setters
               if: always()
               run: |
-                  git grep -I -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
+                  git grep -I -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
 
             # Run ruff python linter
             - name: Check for errors using ruff Python linter
@@ -274,7 +295,9 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of "SuccessOrExit(CHIP_ERROR_*)", which should probably be "SuccessOrExit(err = CHIP_ERROR_*)"
+            - name:
+                  Check for use of "SuccessOrExit(CHIP_ERROR_*)", which should
+                  probably be "SuccessOrExit(err = CHIP_ERROR_*)"
               if: always()
               run: |
                   git grep -I -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
@@ -282,14 +305,19 @@ jobs:
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.  And we want to exclude this file,
             # to avoid our grep regexp matching itself.
-            - name: Check for use of "SuccessOrExit(something-without-assignment(", which should probably be "SuccessOrExit(err = something("
+            - name:
+                  Check for use of
+                  "SuccessOrExit(something-without-assignment(", which should
+                  probably be "SuccessOrExit(err = something("
               if: always()
               run: |
                   git grep -I -n 'SuccessOrExit([^=)]*(' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
 
             # git grep exits with 0 if it finds a match, but we want
             # to fail (exit nonzero) on match.
-            - name: Check for use of "using namespace" outside of a class/function in headers.
+            - name:
+                  Check for use of "using namespace" outside of a class/function
+                  in headers.
               if: always()
               run: |
                   # Various platforms have `using namespace chip::Ble` in their BLEManager* headers; just exclude those for now.
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index 029f3d759771fc..d5f705f35427de 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -16,6 +16,8 @@ name: Minimal Build (Linux / configure)
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -31,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-minimal:41
+            image: ghcr.io/project-chip/chip-build-minimal:47
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index dc356586b4dd96..534c46f3c206a1 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -16,6 +16,8 @@ name: QEMU
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -38,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:41
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
@@ -78,7 +80,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-tizen-qemu:41
+            image: ghcr.io/project-chip/chip-build-tizen-qemu:47
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index 57a1ce7b325dc3..1622808396cee8 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:41
+            image: ghcr.io/project-chip/chip-build-esp32:47
 
         steps:
             - name: Checkout
@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:41
+            image: ghcr.io/project-chip/chip-build-efr32:47
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index d1dd509fd5aa63..37a84e5f49535a 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:41
+            image: ghcr.io/project-chip/chip-build-android:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/spell.yml b/.github/workflows/spell.yml
index 84877bf6f8c8bb..f37a0e28711c6f 100644
--- a/.github/workflows/spell.yml
+++ b/.github/workflows/spell.yml
@@ -16,6 +16,8 @@ name: Run misspell
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
         paths:
             - "**.md"
             - ".github/.wordlist.txt"
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2907a4a89711ea..281ac5c76a2ab1 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,6 +16,8 @@ name: Tests
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -47,7 +49,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -247,7 +249,7 @@ jobs:
                      --chip-tool ./out/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
                      run \
                      --iterations 1 \
-                     --expected-failures 1 \
+                     --expected-failures 3 \
                      --keep-going \
                      --test-timeout-seconds 120 \
                      --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
@@ -398,7 +400,7 @@ jobs:
                      --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
                      run \
                      --iterations 1 \
-                     --expected-failures 1 \
+                     --expected-failures 3 \
                      --keep-going \
                      --test-timeout-seconds 120 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
@@ -437,7 +439,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -506,6 +508,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test/lit-icd-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_ICDM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test/lit-icd-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_ICDManagementCluster.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_IDM_1_4.py" --script-args "--hex-arg PIXIT.DGGEN.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_PWRTL_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index 478d347be25ab9..b4778381fab1b4 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -16,6 +16,8 @@ name: Unit / Integration Tests
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -37,7 +39,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 4488e23258cd65..670d711cade843 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -30,7 +30,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index f14b914ae7f88a..ce7b5946985144 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -16,6 +16,8 @@ name: ZAP
 
 on:
     push:
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
 
@@ -32,7 +34,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: ghcr.io/project-chip/chip-build:41
+            image: ghcr.io/project-chip/chip-build:47
         defaults:
             run:
                 shell: sh
diff --git a/.gitmodules b/.gitmodules
index 03554f83b5aac6..be8c70fb160cba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,6 +73,11 @@
 	url = https://github.com/SiliconLabs/ot-efr32.git
 	branch  = matter_sve
 	platforms = silabs,silabs_docker
+[submodule "ot-stm32"]
+	path = third_party/openthread/ot-stm32
+	url = https://github.com/openthread/openthread
+        branch = eb6377f
+        platforms = stm32
 [submodule "third_party/openthread/ot-ifx"]
 	path = third_party/openthread/ot-ifx
 	url = https://github.com/Infineon/ot-ifx-release.git
diff --git a/README.md b/README.md
index 1dad5ef6fe4d4f..d2967701288875 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![ASR](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ASR/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-asr.yaml)
 [![BouffaloLab](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20BouffaloLab/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-bouffalolab.yaml)
 [![Darwin](https://github.com/project-chip/connectedhomeip/workflows/Darwin/badge.svg)](https://github.com/project-chip/connectedhomeip/blob/master/.github/workflows/darwin.yaml)
-[![TI CC26X2X7](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC26X2X7/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc13x2x7_26x2x7.yaml)
+[![TI CC26X2X7](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC13XX_26XX/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc13xx_26xx.yaml)
 [![TI CC32XX](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC32XX/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc32xx.yaml)
 [![EFR32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20EFR32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-efr32.yaml)
 [![ESP32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ESP32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-esp32.yaml)
diff --git a/config/nrfconnect/chip-module/generate_factory_data.cmake b/config/nrfconnect/chip-module/generate_factory_data.cmake
index 3c286fc21dddee..21f7360cd03f10 100644
--- a/config/nrfconnect/chip-module/generate_factory_data.cmake
+++ b/config/nrfconnect/chip-module/generate_factory_data.cmake
@@ -15,25 +15,29 @@
 #
 
 
-# Create a JSON file based on factory data given via kConfigs.
+# Create a .hex file in CBOR format based on factory data given via kConfigs.
 #
 # This function creates a list of arguments for external script and then run it to write a JSON file.
 # Created JSON file can be checked using JSON SCHEMA file if it is provided.
+# Next, the resulting .hex file is generated based on previously created JSON file.
 #
 # This script can be manipulated using following kConfigs:
 # - To merge generated factory data with final zephyr.hex file set kConfig CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=y
 # - To use default certification paths set CONFIG_CHIP_FACTORY_DATA_USE_DEFAULTS_CERTS_PATH=y 
 # 
-# During generation process a some file will be created in zephyr's build directory:
+# During generation process the following files will be created in zephyr's build directory:
 # - <factory_data_target>.json a file containing all factory data written in JSON format.
+# - <factory_data_target>.hex a file containing all factory data in CBOR format.
+# - <factory_data_target>.bin a binary file containing all raw factory data in CBOR format.
+# - <factory_data_target>.cbor a file containing all factory data in CBOR format.
 #
 # [Args]:
 #   factory_data_target - a name for target to generate factory_data.
 #   script_path         - a path to script that makes a JSON factory data file from given arguments.
 #   schema_path         - a path to JSON schema file which can be used to verify generated factory data JSON file.
 #                         This argument is optional, if you don't want to verify the JSON file put it empty "".
-#   output_path         - a path to output directory, where created JSON file will be stored.
-function(nrfconnect_create_factory_data_json factory_data_target script_path schema_path output_path)
+#   output_path         - a path to output directory, where created hex and JSON files will be stored.
+function(nrfconnect_create_factory_data factory_data_target script_path schema_path output_path)
 
 # set script args for future purpose
 set(script_args)
@@ -120,62 +124,25 @@ if(CONFIG_CHIP_DEVICE_ENABLE_KEY)
 string(APPEND script_args "--enable_key \"${CONFIG_CHIP_DEVICE_ENABLE_KEY}\"\n")
 endif()
 
-# Set output JSON file and path to SCHEMA file to validate generated factory data
-set(factory_data_json ${output_path}/${factory_data_target}.json)
-string(APPEND script_args "-o \"${factory_data_json}\"\n")
+# Set output path and path to SCHEMA file to validate generated factory data
+set(factory_data_output_path ${output_path}/${factory_data_target})
+string(APPEND script_args "-o \"${factory_data_output_path}\"\n")
 string(APPEND script_args "-s \"${schema_path}\"\n")
 
+# Add optional offset and size arguments to generate both .hex and .json files.
+string(APPEND script_args "--offset $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_ADDRESS>\n")
+string(APPEND script_args "--size $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_OFFSET>\n")
+
 # execute first script to create a JSON file
 separate_arguments(separated_script_args NATIVE_COMMAND ${script_args})
 add_custom_command(
-    OUTPUT ${factory_data_json}
+    OUTPUT ${factory_data_output_path}.hex
     DEPENDS ${FACTORY_DATA_SCRIPT_PATH}
     COMMAND ${Python3_EXECUTABLE} ${FACTORY_DATA_SCRIPT_PATH} ${separated_script_args}
     COMMENT "Generating new Factory Data..."
     )
 add_custom_target(${factory_data_target} ALL
-    DEPENDS ${factory_data_json}
-    )
-
-endfunction()
-
-
-# Create a .hex file with factory data in CBOR format.
-#
-# This function creates a .hex and .cbor files from given JSON factory data file.
-#
-# 
-# During generation process some files will be created in zephyr's build directory:
-# - <factory_data_target>.hex a file containing all factory data in CBOR format.
-# - <factory_data_target>.bin a binary file containing all raw factory data in CBOR format.
-# - <factory_data_target>.cbor a file containing all factory data in CBOR format.
-#
-# [Args]:
-#   factory_data_hex_target - a name for target to generate factory data HEX file.
-#   factory_data_target     - a name for target to generate factory data JSON file.
-#   script_path             - a path to script that makes a factory data .hex file from given arguments.
-#   output_path             - a path to output directory, where created JSON file will be stored.
-function(nrfconnect_create_factory_data_hex_file factory_data_hex_target factory_data_target script_path output_path)
-
-# Pass the argument list via file
-set(cbor_script_args "-i ${output_path}/${factory_data_target}.json\n")
-string(APPEND cbor_script_args "-o ${output_path}/${factory_data_target}\n")
-# get partition address and offset from partition manager during compilation
-string(APPEND cbor_script_args "--offset $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_ADDRESS>\n")
-string(APPEND cbor_script_args "--size $<TARGET_PROPERTY:partition_manager,PM_FACTORY_DATA_OFFSET>\n")
-string(APPEND cbor_script_args "-r\n")
-
-# execute second script to create a hex file containing factory data in cbor format
-separate_arguments(separated_cbor_script_args NATIVE_COMMAND ${cbor_script_args})
-set(factory_data_hex ${output_path}/${factory_data_target}.hex)
-
-add_custom_command(OUTPUT ${factory_data_hex}
-    COMMAND ${Python3_EXECUTABLE} ${script_path} ${separated_cbor_script_args}
-    COMMENT "Generating factory data HEX file..."
-    DEPENDS ${factory_data_target} ${script_path}
-    )
-add_custom_target(${factory_data_hex_target}
-    DEPENDS ${factory_data_hex}
+    DEPENDS ${factory_data_output_path}.hex
     )
 
 endfunction()
@@ -202,22 +169,16 @@ set(GENERATE_CBOR_SCRIPT_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_g
 set(FACTORY_DATA_SCHEMA_PATH ${CHIP_ROOT}/scripts/tools/nrfconnect/nrfconnect_factory_data.schema)
 set(OUTPUT_FILE_PATH ${APPLICATION_BINARY_DIR}/zephyr)
 
-# create a JSON file with all factory data
-nrfconnect_create_factory_data_json(factory_data
-                                    ${FACTORY_DATA_SCRIPT_PATH} 
-                                    ${FACTORY_DATA_SCHEMA_PATH} 
-                                    ${OUTPUT_FILE_PATH})
-
 # create a .hex file with factory data in CBOR format based on the JSON file created previously 
-nrfconnect_create_factory_data_hex_file(factory_data_hex
-                                        factory_data
-                                        ${GENERATE_CBOR_SCRIPT_PATH} 
-                                        ${OUTPUT_FILE_PATH})
+nrfconnect_create_factory_data(factory_data
+                               ${FACTORY_DATA_SCRIPT_PATH} 
+                               ${FACTORY_DATA_SCHEMA_PATH} 
+                               ${OUTPUT_FILE_PATH})
 
 if(CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE)                                   
     # set custom target for merging factory_data hex file
     set_property(GLOBAL PROPERTY factory_data_PM_HEX_FILE ${OUTPUT_FILE_PATH}/factory_data.hex)
-    set_property(GLOBAL PROPERTY factory_data_PM_TARGET factory_data_hex)
+    set_property(GLOBAL PROPERTY factory_data_PM_TARGET factory_data)
 endif()
 
 
diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
index 7862d5f8b95d8e..27f429b390d528 100644
--- a/config/telink/chip-module/CMakeLists.txt
+++ b/config/telink/chip-module/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2022-2023 Project CHIP Authors
+#   Copyright (c) 2022-2024 Project CHIP Authors
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -149,47 +149,7 @@ set_property(GLOBAL APPEND PROPERTY ZEPHYR_INTERFACE_LIBS chip)
 # Define 'chip-ota-image' target for building CHIP OTA image
 # ==============================================================================
 
-string(REPLACE "_retention" "" BASE_BOARD ${BOARD})
-
-if(${TLNK_USB_DONGLE} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_usb_boot.overlay")
-    set(USB_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_usb_boot.overlay")
-  else()
-    unset(USB_BOOT_DTC_OVERLAY_FILE)
-  endif()
-else()
-  unset(USB_BOOT_DTC_OVERLAY_FILE)
-endif()
-
-if(${TLNK_MARS_BOARD} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_mars_boot.overlay")
-    set(MARS_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_mars_boot.overlay")
-  else()
-    unset(MARS_BOOT_DTC_OVERLAY_FILE)
-  endif()
-else()
-  unset(MARS_CONF_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}.overlay")
-    set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}.overlay")
-else()
-    unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-    set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-    message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-    set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-    message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(EXISTS "${CHIP_ROOT}/config/telink/app/bootloader.conf")
-    set(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
-else()
-    unset(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE)
-endif()
+include(${TELINK_COMMON}/common.cmake)
 
 set(BLOCK_SIZE "1024")
 
@@ -202,7 +162,7 @@ if (CONFIG_BOOTLOADER_MCUBOOT)
     add_custom_target(build_mcuboot ALL
         COMMAND
         west build -b ${BASE_BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE};${MARS_BOOT_DTC_OVERLAY_FILE}"
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOT_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_BOOT_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE};${MARS_BOOT_DTC_OVERLAY_FILE}"
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/chip-module/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
index 964b08547bb0b5..f0584d8495149e 100644
--- a/config/telink/chip-module/Kconfig.defaults
+++ b/config/telink/chip-module/Kconfig.defaults
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2023 Project CHIP Authors
+#   Copyright (c) 2023-2024 Project CHIP Authors
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -20,6 +20,10 @@
 
 if CHIP
 
+config CHIP_PROJECT_CONFIG
+    string "Project configuration file for Matter"
+    default "include/CHIPProjectConfig.h"
+
 config LOG
     default y
 
@@ -106,6 +110,8 @@ config GPIO
 config BT
     default y
 
+if BT
+
 config BT_PERIPHERAL
     default y
 
@@ -157,9 +163,11 @@ choice B9X_BLE_CTRL_MAC_TYPE
     default B9X_BLE_CTRL_MAC_TYPE_RANDOM_STATIC
 endchoice
 
+endif
+
 # Board retention config
-if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9258A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION 
-config BOARD_TLSR9X_NON_RETENTION_RAM_CODE
+if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9258A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
+config SOC_SERIES_RISCV_TELINK_B9X_NON_RETENTION_RAM_CODE
     default y if PM
 
 config TELINK_B9x_MATTER_RETENTION_LAYOUT
@@ -218,6 +226,12 @@ config SETTINGS_NVS_SECTOR_COUNT
 config NET_L2_OPENTHREAD
     default y
 
+if NET_L2_OPENTHREAD
+
+config CHIP_OPENTHREAD_CONFIG
+    string "Custom OpenThread configuration file"
+    default "../../platform/telink/project_include/OpenThreadConfig.h"
+
 choice CHIP_THREAD_DEVICE_ROLE
     prompt "Thread network device role"
     default CHIP_THREAD_DEVICE_ROLE_ROUTER
@@ -256,6 +270,8 @@ config OPENTHREAD_DEFAULT_TX_POWER
     default 3 if PM
     default 9
 
+endif # NET_L2_OPENTHREAD
+
 config NET_TX_STACK_SIZE
     default 554 if PM
 
diff --git a/docs/examples/index.md b/docs/examples/index.md
index fc82f2a0bc9016..2c0225cbbf3b9f 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -213,7 +213,6 @@ pigweed-app/**/README
 :maxdepth: 1
 
 pump-app/**/README
-pump-app/cc13x2x7_26x2x7/doc/programming*
 ```
 
 ## Pump controller example
@@ -223,7 +222,6 @@ pump-app/cc13x2x7_26x2x7/doc/programming*
 :maxdepth: 1
 
 pump-controller-app/**/README
-pump-controller-app/cc13x2x7_26x2x7/doc/programming*
 ```
 
 ## Refrigerator example
diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
index f521c78ec3caf9..12ae984ce7d586 100644
--- a/docs/guides/BUILDING.md
+++ b/docs/guides/BUILDING.md
@@ -470,7 +470,7 @@ gn desc out/unified '//src/controller(//build/toolchain/host:linux_x64_clang)'
 > **Note:** Some platforms that can be built as part of the unified build
 > require downloading additional tools. To add these to the build, the location
 > must be provided as a build argument. For example, to add the Simplelink
-> cc13x2_26x2 examples to the unified build, install
+> cc13xx_26xx examples to the unified build, install
 > [SysConfig](https://www.ti.com/tool/SYSCONFIG) and add the following build
 > arguments:
 >
diff --git a/docs/guides/nrfconnect_factory_data_configuration.md b/docs/guides/nrfconnect_factory_data_configuration.md
index e4c3be4899df4e..212963d5266b66 100644
--- a/docs/guides/nrfconnect_factory_data_configuration.md
+++ b/docs/guides/nrfconnect_factory_data_configuration.md
@@ -37,7 +37,7 @@ data secure by applying hardware write protection.
             -   [Appearance field description](#appearance-field-description)
     -   [Enabling factory data support](#enabling-factory-data-support)
     -   [Generating factory data](#generating-factory-data)
-        -   [Creating the factory data JSON file with the first script](#creating-the-factory-data-json-file-with-the-first-script)
+        -   [Creating the factory data JSON and HEX files with the first script](#creating-the-factory-data-json-and-hex-files-with-the-first-script)
         -   [How to set user data](#how-to-set-user-data)
             -   [How to handle user data](#how-to-handle-user-data)
         -   [Verifying using the JSON Schema tool](#verifying-using-the-json-schema-tool)
@@ -218,14 +218,19 @@ file written in another way. To make sure that the JSON file is correct and the
 device is able to read out parameters,
 [verify the file using the JSON schema tool](#verifying-using-the-json-schema-tool).
 
-### Creating the factory data JSON file with the first script
+You can also use only the first script to generate both JSON and HEX files, by
+providing optional `offset` and `size` arguments, which results in invoking the
+script internally. Such option is the recommended one, but invoking two scripts
+one by one is also supported to provide backward compatibility.
+
+### Creating the factory data JSON and HEX files with the first script
 
 A Matter device needs a proper factory data partition stored in the flash memory
 to read out all required parameters during startup. To simplify the factory data
 generation, you can use the
 [generate_nrfconnect_chip_factory_data.py](../../scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py)
 Python script to provide all required parameters and generate a human-readable
-JSON file.
+JSON file and save it to a HEX file.
 
 To use this script, complete the following steps:
 
@@ -245,10 +250,10 @@ To use this script, complete the following steps:
     --sn --vendor_id, --product_id, --vendor_name, --product_name, --date, --hw_ver, --hw_ver_str, --spake2_it, --spake2_salt, --discriminator
     ```
 
-    b. Add output file path:
+    b. Add output path to store .json file, e.g. my_dir/output:
 
     ```
-    -o <path_to_output_json_file>
+    -o <path_to_output_file>
     ```
 
     c. Generate SPAKE2 verifier using one of the following methods:
@@ -341,6 +346,34 @@ To use this script, complete the following steps:
     > `chip-cert` executable. See the note at the end of this section to learn
     > how to get it.
 
+    k. (optional) Partition offset that is an address in device's NVM memory,
+    where factory data will be stored.
+
+    ```
+    --offset <offset>
+    ```
+
+    > **Note:** To generate a HEX file with factory data, you need to provide
+    > both `offset` and `size` optional arguments. As a result,
+    > `factory_data.hex` and `factory_data.bin` files are created in the
+    > `output` directory. The first file contains the required memory offset.
+    > For this reason, it can be programmed directly to the device using a
+    > programmer (for example, `nrfjprog`).
+
+    l. (optional) The maximum partition size in device's NVM memory, where
+    factory data will be stored.
+
+    ```
+    --size <size>
+    ```
+
+    > **Note:** To generate a HEX file with factory data, you need to provide
+    > both `offset` and `size` optional arguments. As a result,
+    > `factory_data.hex` and `factory_data.bin` files are created in the
+    > `output` directory. The first file contains the required memory offset.
+    > For this reason, it can be programmed directly to the device using a
+    > programmer (for example, `nrfjprog`).
+
 4. Run the script using the prepared list of arguments:
 
     ```
@@ -370,8 +403,10 @@ $ python scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py \
 --passcode 20202021 \
 --product_finish "matte" \
 --product_color "black" \
---out "build.json" \
---schema "scripts/tools/nrfconnect/nrfconnect_factory_data.schema"
+--out "build" \
+--schema "scripts/tools/nrfconnect/nrfconnect_factory_data.schema" \
+--offset 0xf7000 \
+--size 0x1000
 ```
 
 As the result of the above example, a unique ID for the rotating device ID is
@@ -570,7 +605,7 @@ To generate a manual pairing code and a QR code, complete the following steps:
     ```
 
 2. Complete steps 1, 2, and 3 from the
-   [Creating the factory data JSON file with the first script](#creating-the-factory-data-json-file-with-the-first-script)
+   [Creating the factory data JSON and HEX files with the first script](#creating-the-factory-data-json-and-hex-files-with-the-first-script)
    section to prepare the final invocation of the Python script.
 
 3. Add the `--generate_onboarding` argument to the Python script final
@@ -686,10 +721,15 @@ The output will look similar to the following one:
 ### Creating a factory data partition with the second script
 
 To store the factory data set in the device's persistent storage, convert the
-data from the JSON file to its binary representation in the CBOR format. To do
-this, use the
+data from the JSON file to its binary representation in the CBOR format. This is
+done by the
+[generate_nrfconnect_chip_factory_data.py](../../scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py),
+if you provide optional `offset` and `size` arguments. If you provided these
+arguments, skip the following steps of this section.
+
+You can skip these optional arguments and do this, using the
 [nrfconnect_generate_partition.py](../../scripts/tools/nrfconnect/nrfconnect_generate_partition.py)
-to generate the factory data partition:
+script, but this is obsolete solution kept only for backward compatibility:
 
 1. Navigate to the _connectedhomeip_ root directory
 2. Run the following command pattern:
@@ -924,14 +964,13 @@ $ west flash
 ## Using own factory data implementation
 
 The [factory data generation process](#generating-factory-data) described above
-is only an example valid for the nRF Connect platform. You can also create a HEX
-file containing all components from the
-[factory data component table](#factory-data-component-table) in any format and
-then implement a parser to read out all parameters and pass them to a provider.
-Each manufacturer can implement a factory data set on its own by implementing a
-parser and a factory data accessor inside the Matter stack. Use the
-[nRF Connect Provider](../../src/platform/nrfconnect/FactoryDataProvider.h) and
-[FactoryDataParser](../../src/platform/nrfconnect/FactoryDataParser.h) as
+is only an example valid for the nRF Connect platform. You can well create a HEX
+file containing all [factory data components](#factory-data-component-table) in
+any format and then implement a parser to read out all parameters and pass them
+to a provider. Each manufacturer can implement a factory data set on its own by
+implementing a parser and a factory data accessor inside the Matter stack. Use
+the [nRF Connect Provider](../../src/platform/nrfconnect/FactoryDataProvider.h)
+and [FactoryDataParser](../../src/platform/nrfconnect/FactoryDataParser.h) as
 examples.
 
 You can read the factory data set from the device's flash memory in different
diff --git a/docs/guides/ti/images/cc13x2_memmap.png b/docs/guides/ti/images/cc13x2_memmap.png
deleted file mode 100644
index a89aee7837e3aa..00000000000000
Binary files a/docs/guides/ti/images/cc13x2_memmap.png and /dev/null differ
diff --git a/docs/guides/ti/ti_factory_data_user_guide.md b/docs/guides/ti/ti_factory_data_user_guide.md
index c8168779d17119..50dfc41b15231d 100644
--- a/docs/guides/ti/ti_factory_data_user_guide.md
+++ b/docs/guides/ti/ti_factory_data_user_guide.md
@@ -33,29 +33,26 @@ Each element is described in more detail below:
    Developers can configure this per device. Elements in this file are from the
    specification.
 2. Matter Application with dummy factory data: Any TI Matter example application
-3. `BIM`/MCUBoot: Boot Image Manager/MCUBoot image used for OTA. This is built
-   with the Matter application and does not require additional build steps from
-   developers.
+3. MCUBoot: MCUBoot image used for OTA. This is built with the Matter
+   application and does not require additional build steps from developers.
 4. create_factory_data.py: Processes a factory data JSON file and generates a
    hex file with the unique factory data values configured in the JSON file.
 5. factory_data_trim.py: When using the custom factory data option, this script
    removes the dummy factory data which is required to be able to successfully
    compile the application.
 6. `oad`\_and_factory_data_merge_tool.py: Merges the factory data hex, Matter
-   application without factory data and `BIM`/MCUBoot image to generate a
-   functional hex that can be programmed onto the device.
+   application without factory data and MCUBoot image to generate a functional
+   hex that can be programmed onto the device.
 
 ## Flash memory layout
 
-![Memory Layout 1](images/cc13x2_memmap.png)
-
 ![Memory Layout 2](images/cc13x4_memmap.png)
 
 ## How to use
 
 Out of box factory data location is configured to be on second last page of
-flash. For CC13x2, the starting address is `0xAC000`. For CC13x4, the starting
-address is `0xFE800`. This can be configured in the linker file.
+flash. For CC13x4, the starting address is `0xFE800`. This can be configured in
+the linker file.
 
 To configure:
 
@@ -63,13 +60,13 @@ To configure:
    used by the application
 
 ```
-FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
+FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000fe800, LENGTH = 0x00000900
 ```
 
 ```
 /* Define base address for the DAC arrays and struct */
     PROVIDE (_factory_data_base_address =
-        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xAC000);
+        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xFE800);
 ```
 
 2. create_factory_data.py: Set the address of the start of the factory data
@@ -78,7 +75,7 @@ FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
 ```
     # there are 17 elements, each element will need 8 bytes in the struct
     # 4 for length of the element, and 4 for the pointer to the element
-    # factory data starts at 0xAC000 or 0xFE800, so the elements will
+    # factory data starts at 0xFE800, so the elements will
     # start 136 bytes after the start address
     factory_data_dict = json.load(args.factory_data_json_file[0])
     factory_data_schema = json.load(args.factory_data_schema[0])
@@ -88,23 +85,16 @@ FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
 
     struct_idx = 0
     values_idx = 0
-    if device_family == 'cc13x2_26x2':
-        value_address = 0xAC088
-    else:
-        value_address = 0xFE888
+    value_address = 0xFE888
 ```
 
 ```
-    if device_family == 'cc13x2_26x2':
-        subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xac000'])
-    else:
-        subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
+   subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
 ```
 
 3. In the example's args.gni file, set 'custom_factory_data' to true
 
-It is recommended to keep a dedicated page (2 pages for CC13x4) for factory
-data.
+It is recommended to keep 2 dedicated pages for CC13x4 for factory data.
 
 ### Formatting certs and keys for JSON file
 
@@ -121,7 +111,6 @@ being copied into the JSON file.
 The example application can be built using the instructions in the example's
 README. The factory data from the JSON file will be formatted into a hex file
 that will then be merged into the final executable. The final executable will be
-named _{example-application}-`bim`.hex_ for CC13x2 and
-_{example-application}-mcuboot.hex_ for CC13x4, and the factory data that was
-inputted into the JSON file will be named
+named _{example-application}-mcuboot.hex_ for CC13x4, and the factory data that
+was inputted into the JSON file will be named
 _{example-application}-factory-data.hex_.
diff --git a/docs/guides/ti/ti_platform_overview.md b/docs/guides/ti/ti_platform_overview.md
index 47e140cfa06ba0..a26ade4d224b0a 100644
--- a/docs/guides/ti/ti_platform_overview.md
+++ b/docs/guides/ti/ti_platform_overview.md
@@ -48,8 +48,8 @@ In the TI example applications the Bluetooth Low Energy protocol is used to
 provision the Thread protocol to enable Matter communication. Then Thread is
 used for IP communication with other Matter devices.
 
-The TI applications leverage the Bluetooth Low Energy stack on the CC13X2 and
-CC26X2 families. This BLE software is distributed in binary form within the TI
+The TI applications leverage the Bluetooth Low Energy stack on the CC13XX and
+CC26XX families. This BLE software is distributed in binary form within the TI
 SimpleLink SDK. The BLE stack leverages code that is present in the device ROM
 for certain common BLE operations.
 
@@ -103,9 +103,9 @@ handled by the platform implementation files.
 Sample Matter applications are provided for the TI platform. These can be used
 as reference for your own application.
 
--   [lock-app](../../../examples/lock-app/cc13x2x7_26x2x7/README.md)
--   [pump-app](../../../examples/pump-app/cc13x2x7_26x2x7/README.md)
--   [pump-controller-app](../../../examples/pump-controller-app/cc13x2x7_26x2x7/README.md)
+-   [lock-app](../../../examples/lock-app/cc13x4_26x4/README.md)
+-   [pump-app](../../../examples/pump-app/cc13x4_26x4/README.md)
+-   [pump-controller-app](../../../examples/pump-controller-app/cc13x4_26x4/README.md)
 
 <hr>
 
diff --git a/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp b/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
index 42551f7cb40579..deb3731f1b25d4 100644
--- a/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/air-purifier-app/ameba/main/chipinterface.cpp b/examples/air-purifier-app/ameba/main/chipinterface.cpp
index 264ad532b513aa..fd1c568afbf44f 100644
--- a/examples/air-purifier-app/ameba/main/chipinterface.cpp
+++ b/examples/air-purifier-app/ameba/main/chipinterface.cpp
@@ -30,7 +30,7 @@
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/core/ErrorStr.h>
 #include <platform/Ameba/AmebaConfig.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
diff --git a/examples/air-purifier-app/linux/main.cpp b/examples/air-purifier-app/linux/main.cpp
index 98d8d405cfadfb..0335ebcaac3bba 100644
--- a/examples/air-purifier-app/linux/main.cpp
+++ b/examples/air-purifier-app/linux/main.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/util/af.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 #define AIR_PURIFIER_ENDPOINT 1
diff --git a/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp b/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp
index 41a53d4fd94c7d..7aaa873a906706 100644
--- a/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp
+++ b/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp
@@ -30,6 +30,7 @@
 
 #include <limits>
 #include <map>
+#include <string>
 
 using namespace chip;
 using namespace chip::app;
diff --git a/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.h b/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.h
index e608b7a671457d..88b60d13174300 100644
--- a/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.h
+++ b/examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.h
@@ -23,6 +23,8 @@
 #include <json/json.h>
 #include <platform/DiagnosticDataProvider.h>
 
+#include <string>
+
 class AirQualitySensorAttrUpdateHandler
 {
 public:
diff --git a/examples/air-quality-sensor-app/linux/main.cpp b/examples/air-quality-sensor-app/linux/main.cpp
index 9dee0c20982f0a..39a13ba1c8e20c 100644
--- a/examples/air-quality-sensor-app/linux/main.cpp
+++ b/examples/air-quality-sensor-app/linux/main.cpp
@@ -20,9 +20,10 @@
 #include <AppMain.h>
 #include <air-quality-sensor-manager.h>
 
-#include <app/util/af.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <string>
+
 #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED
 #include <imgui_ui/ui.h>
 #include <imgui_ui/windows/qrcode.h>
diff --git a/examples/air-quality-sensor-app/telink/CMakeLists.txt b/examples/air-quality-sensor-app/telink/CMakeLists.txt
index 5ed8c314f1b334..4d34c74fcdba68 100644
--- a/examples/air-quality-sensor-app/telink/CMakeLists.txt
+++ b/examples/air-quality-sensor-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,70 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-set(ignoreMe "${TLNK_MARS_BOARD}")
-
-if(${TLNK_MARS_BOARD} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-  else()
-    unset(MARS_DTC_OVERLAY_FILE)
-  endif()
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-  else()
-    unset(MARS_CONF_OVERLAY_FILE)
-  endif()
-else()
-  unset(MARS_CONF_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-air-quality-sensor-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-air-quality-sensor-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -84,7 +32,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/air-quality-sensor-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/include)
+                           ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -92,12 +41,16 @@ target_sources(app PRIVATE
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
-               ${TELINK_COMMON}/util/src/WS2812Device.cpp
-               ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${CHIP_ROOT}/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/air-quality-sensor-app/telink/include/AppConfig.h b/examples/air-quality-sensor-app/telink/include/AppConfig.h
index 7513ed3771b961..0888260c26a7f1 100644
--- a/examples/air-quality-sensor-app/telink/include/AppConfig.h
+++ b/examples/air-quality-sensor-app/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- Air Quality Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/air-quality-sensor-app/telink/prj.conf b/examples/air-quality-sensor-app/telink/prj.conf
index b43fbe9636d9aa..12ee5d07bb1eb4 100644
--- a/examples/air-quality-sensor-app/telink/prj.conf
+++ b/examples/air-quality-sensor-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32774 == 0x8006 (example air-quality-sensor-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
 
diff --git a/examples/air-quality-sensor-app/telink/src/AppTask.cpp b/examples/air-quality-sensor-app/telink/src/AppTask.cpp
index ac2f61b3c06f52..da0f80ec9c15f7 100644
--- a/examples/air-quality-sensor-app/telink/src/AppTask.cpp
+++ b/examples/air-quality-sensor-app/telink/src/AppTask.cpp
@@ -37,9 +37,7 @@ CHIP_ERROR AppTask::Init(void)
 {
     CHIP_ERROR err;
 
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(AirQualitySensorUpdateTimerEventHandler);
-#endif
     InitCommonParts();
 
     err = SensorMgr().Init();
diff --git a/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h b/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h
index 604496f886b3c2..2ff1696e9378cc 100644
--- a/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h
+++ b/examples/all-clusters-app/all-clusters-common/include/dishwasher-mode.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/include/laundry-dryer-controls-delegate-impl.h b/examples/all-clusters-app/all-clusters-common/include/laundry-dryer-controls-delegate-impl.h
index 898cf8806f4111..920d7030c2aa78 100644
--- a/examples/all-clusters-app/all-clusters-common/include/laundry-dryer-controls-delegate-impl.h
+++ b/examples/all-clusters-app/all-clusters-common/include/laundry-dryer-controls-delegate-impl.h
@@ -20,7 +20,6 @@
 
 #include <app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-delegate.h>
 #include <app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h
index 15a72482726ba0..f9d3d1bf8c7bdf 100644
--- a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h
+++ b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-controls-delegate-impl.h
@@ -20,7 +20,6 @@
 
 #include <app/clusters/laundry-washer-controls-server/laundry-washer-controls-delegate.h>
 #include <app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h
index 2f59b0dfd04bab..5d35c03d4e50cd 100644
--- a/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h
+++ b/examples/all-clusters-app/all-clusters-common/include/laundry-washer-mode.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h b/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h
index dd5d5b4bcaf2eb..df06d23a7dc5d7 100644
--- a/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h
+++ b/examples/all-clusters-app/all-clusters-common/include/microwave-oven-mode.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/include/oven-modes.h b/examples/all-clusters-app/all-clusters-common/include/oven-modes.h
index 7e264a4c47e272..2c58229ef6e541 100644
--- a/examples/all-clusters-app/all-clusters-common/include/oven-modes.h
+++ b/examples/all-clusters-app/all-clusters-common/include/oven-modes.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/include/rvc-modes.h b/examples/all-clusters-app/all-clusters-common/include/rvc-modes.h
index 8af4aa5f6f9155..8449878260f053 100644
--- a/examples/all-clusters-app/all-clusters-common/include/rvc-modes.h
+++ b/examples/all-clusters-app/all-clusters-common/include/rvc-modes.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
index ef90de38697f4c..b4ce50b8cd49a3 100644
--- a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
+++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-select-server/supported-modes-manager.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
index 3fdce87e109317..9698df8c094cc8 100644
--- a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
+++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 
 namespace chip {
diff --git a/examples/all-clusters-app/all-clusters-common/include/tcc-mode.h b/examples/all-clusters-app/all-clusters-common/include/tcc-mode.h
index dcd9024e8d0385..8d8cdb02962d68 100644
--- a/examples/all-clusters-app/all-clusters-common/include/tcc-mode.h
+++ b/examples/all-clusters-app/all-clusters-common/include/tcc-mode.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
index 13c0205a4e3ca1..41171d760d0048 100644
--- a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
@@ -19,6 +19,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp
index 9a9fcccd73f4f2..9309b597db434f 100644
--- a/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp
@@ -20,6 +20,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/clusters/fan-control-server/fan-control-server.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index 3450d27befe551..48f327611f0891 100644
--- a/examples/all-clusters-app/ameba/README.md
+++ b/examples/all-clusters-app/ameba/README.md
@@ -27,11 +27,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:42
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
 
 -   Setup build environment:
 
diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
index 338a469bb32947..ef4a733dde4339 100644
--- a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/all-clusters-app/ameba/main/chipinterface.cpp b/examples/all-clusters-app/ameba/main/chipinterface.cpp
index c9547136035f81..aa7cc4afe75047 100644
--- a/examples/all-clusters-app/ameba/main/chipinterface.cpp
+++ b/examples/all-clusters-app/ameba/main/chipinterface.cpp
@@ -34,7 +34,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <laundry-dryer-controls-delegate-impl.h>
 #include <laundry-washer-controls-delegate-impl.h>
 #include <lib/core/ErrorStr.h>
diff --git a/examples/all-clusters-app/asr/src/AppTask.cpp b/examples/all-clusters-app/asr/src/AppTask.cpp
index 92b6aaef3dba49..1a829ca3de1798 100644
--- a/examples/all-clusters-app/asr/src/AppTask.cpp
+++ b/examples/all-clusters-app/asr/src/AppTask.cpp
@@ -34,6 +34,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <lega_rtos_api.h>
 #include <platform/ASR/NetworkCommissioningDriver.h>
diff --git a/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp b/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
index cc48488fd7e3ca..459b3e9921799f 100644
--- a/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/all-clusters-app/asr/src/DeviceCallbacks.cpp
@@ -30,7 +30,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 6cf5941e79d2c4..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":all-clusters-app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "${project_dir}/chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-
-    # disabled until upstream generation is aligned
-    #"tiop_config.h",
-    #"tiop_config.c",
-
-    # not traditional source files
-    #"ti_utils_build_linker.cmd.genlibs",
-    #"syscfg_c.rov.xs",
-    #"ti_utils_runtime_model.gv",
-    #"ti_utils_runtime_Makefile",
-    #"ti_ble_app_config.opt",
-    #"ti_build_config.opt",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("all-clusters-app") {
-  output_name = "chip-${ti_simplelink_board}-all-clusters-example.out"
-
-  sources = [
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/air-quality-instance.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/concentration-measurement-instances.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/device-energy-management-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/oven-modes.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/ClusterManager.cpp",
-    "${project_dir}/main/Globals.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-    "${chip_root}/examples/energy-management-app/energy-management-common/include",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":all-clusters-app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 68d6f927224585..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,241 +0,0 @@
-# Matter CC1352 CC2652 All-clusters Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter CC1352 CC2652 All Clusters Example Application](#matter-cc1352-cc2652-all-clusters-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-![CC1352R1_LAUNCHXL](../../pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg)
-
-The CC13XX_26XX all clusters example application provides the basis to query and
-run commands for all currently implemented Matter clusters. This uses the
-open-source Matter implementation and the Texas Instruments SimpleLink™ CC13XX
-and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The all-clusters example is intended to serve both as a means to explore the
-workings of Matter, as well as a template for creating real products based on
-the Texas Instruments devices.
-
-## Device UI
-
-This example application has a simple User Interface to depict the state of the
-various Matter clusters and the attribute changes associated with them. The user
-LEDs on the LaunchPad are used for the onoff, levelcontrol and identify clusters
-to provide a working demonstration of the cluster attribute changes. The Green
-LED is used to represent attribute changes to endpoint 1 while the Red LED is
-used to represent changes to endpoint 2.
-
-Short presses (less than 1000ms) of the user buttons are used currently unused
-in the all-clusters application, but stubs are provided.
-
-Long presses (greater than 1000ms) of the user buttons are used for controlling
-BLE advertisements and resets. The left button (`BTN-1`) is used to perform a
-factory reset of the device. The Right button (`BTN-2`) is used to disable BLE
-advertisements (if enabled) or enable advertisements (if disabled).
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Thread network. The following sections assume that a Thread network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-2` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://github.com/project-chip/connectedhomeip
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[cc1352r1_launchxl]: https://www.ti.com/tool/LAUNCHXL-CC1352R1
-[e2e]: https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 23c3aee1afb0bb..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = false
-
-# Disable FTD Build for all-clusters app to save Flash
-chip_openthread_ftd = false
-
-# Disable CHIP Logging
-chip_progress_logging = false
-
-# Dsiable verbose logs for all-clusters app to save Flash
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides b/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index 4f02a9fd40da9a..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RTOS        = scripting.addModule("/ti/drivers/RTOS");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var Thread      = scripting.addModule("/ti/thread/thread");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART        = scripting.addModule("/ti/drivers/UART");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART1       = UART.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-AESCTRDRBG1.aesctrObject.$name = "CONFIG_AESCTR_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* RTOS */
-RTOS.name = "FreeRTOS";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART1.$hardware     = system.deviceData.board.components.XDS110UART;
-UART1.$name         = "CONFIG_UART_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_1";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-RTOS.name = "FreeRTOS";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param1";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index b6b9bf1e8bd8f4..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include <app/server/Server.h>
-#include <app/util/af.h>
-
-#include "FreeRTOS.h"
-#include "Globals.h"
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <static-supported-temperature-levels.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13x2_26x2/OTAImageProcessorImpl.h>
-#endif
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
-#endif
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (5000)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
-
-namespace {
-app::Clusters::TemperatureControl::AppSupportedTemperatureLevelsDelegate sAppSupportedTemperatureLevelsDelegate;
-}
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-#ifdef AUTO_PRINT_METRICS
-static void printMetrics(void)
-{
-    chip::DeviceLayer::ThreadMetrics *threadMetricsOut, *currThread;
-    uint64_t heapFree, heapUsed;
-
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapUsed(heapUsed);
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapFree(heapFree);
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetThreadMetrics(&threadMetricsOut);
-
-    PLAT_LOG("Heap Metrics\n Heap Free: %d Heap Used: %d", (uint32_t) heapFree, (uint32_t) heapUsed);
-
-    PLAT_LOG("Thread Metrics\n");
-
-    currThread = threadMetricsOut;
-    while (currThread)
-    {
-        PLAT_LOG("Task Name: %s ID: %d Stack Free Min: %d", currThread->name, (uint32_t) currThread->id,
-                 (uint32_t) currThread->stackFreeMinimum);
-
-        currThread = currThread->Next;
-    }
-
-    DiagnosticDataProviderImpl::GetDefaultInstance().ReleaseThreadMetrics(threadMetricsOut);
-}
-#endif
-
-void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    switch (event->Type)
-    {
-    case DeviceEventType::kCHIPoBLEConnectionEstablished:
-        PLAT_LOG("CHIPoBLE connection established");
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionClosed:
-        PLAT_LOG("CHIPoBLE disconnected");
-        break;
-
-    case DeviceEventType::kCommissioningComplete:
-        PLAT_LOG("Commissioning complete");
-        break;
-    }
-
-#ifdef AUTO_PRINT_METRICS
-    printMetrics();
-#endif
-}
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13x2_26x2LogInit();
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    chip::Server::GetInstance().Init(initParams);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    // We only have network commissioning on endpoint 0.
-    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
-
-    // Register a function to receive events from the CHIP device layer.  Note that calls to
-    // this function will happen on the CHIP event loop thread, not the app_main thread.
-    PlatformMgr().AddEventHandler(DeviceEventCallback, reinterpret_cast<intptr_t>(nullptr));
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    app::Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
deleted file mode 100644
index df12e131ca069a..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#include "ClusterManager.h"
-#include "Globals.h"
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app/CommandHandler.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/util/basic-types.h>
-
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
-#endif
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Inet;
-using namespace ::chip::System;
-using namespace ::chip::DeviceLayer;
-
-constexpr uint32_t kIdentifyTimerDelayMS     = 250;
-constexpr uint32_t kIdentifyTimerDelayPerSec = 4;
-ClusterManager ClusterManager::sCluster;
-
-#define ENDPOINT_ID_0 (0)
-#define ENDPOINT_ID_1 (1)
-#define ENDPOINT_ID_2 (2)
-
-void OnIdentifyTriggerEffect(Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kBlink");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kBreathe");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kOkay");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kChannelChange");
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-        break;
-    }
-    return;
-}
-
-Identify gIdentify0 = {
-    chip::EndpointId{ 0 },
-    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
-    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
-    Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
-    OnIdentifyTriggerEffect,
-};
-
-Identify gIdentify1 = {
-    chip::EndpointId{ 1 },
-    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
-    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
-    Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
-    OnIdentifyTriggerEffect,
-};
-
-void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::OnOff::Attributes;
-
-    VerifyOrExit(attributeId == OnOff::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    // At this point we can assume that value points to a bool value.
-    mEndpointOnOffState[endpointId - 1] = *value;
-    endpointId == ENDPOINT_ID_1 ? LED_write(sAppGreenHandle, *value) : LED_write(sAppRedHandle, *value);
-
-exit:
-    return;
-}
-
-void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::LevelControl::Attributes;
-
-    bool onOffState    = mEndpointOnOffState[endpointId - 1];
-    uint8_t brightness = onOffState ? *value : 0;
-
-    VerifyOrExit(brightness > 0, PLAT_LOG("Brightness set to 0, ignoring"));
-    VerifyOrExit(attributeId == CurrentLevel::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    if (brightness > LED_BRIGHTNESS_MAX)
-    {
-        brightness = LED_BRIGHTNESS_MAX;
-    }
-
-    endpointId == ENDPOINT_ID_1 ? LED_setOn(sAppGreenHandle, brightness) : LED_setOn(sAppRedHandle, brightness);
-
-exit:
-    return;
-}
-
-void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::ColorControl::Attributes;
-
-    VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id,
-                 PLAT_LOG("Unhandled AttributeId ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    if (endpointId == ENDPOINT_ID_1)
-    {
-        uint8_t hue, saturation;
-        if (attributeId == CurrentHue::Id)
-        {
-            hue = *value;
-            /* Read Current Saturation value when Attribute change callback for HUE Attribute */
-            CurrentSaturation::Get(endpointId, &saturation);
-        }
-        else
-        {
-            saturation = *value;
-            /* Read Current Hue value when Attribute change callback for SATURATION Attribute */
-            CurrentHue::Get(endpointId, &hue);
-        }
-        PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation);
-    }
-exit:
-    return;
-}
-
-void ClusterManager::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint16_t size,
-                                                           uint8_t * value)
-{
-    if (attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id && size == 2)
-    {
-        uint16_t identifyTime;
-        memcpy(&identifyTime, value, size);
-        if (identifyTime)
-        {
-            // Currently we have no separate indicator LEDs on each endpoints.
-            // We are using LED1 for endpoint 0,1 and LED2 for endpoint 2
-            if (endpointId == ENDPOINT_ID_2)
-            {
-                LED_startBlinking(sAppGreenHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
-            }
-            else
-            {
-                LED_startBlinking(sAppRedHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
-            }
-        }
-        else
-        {
-            bool onOffState;
-            endpointId == ENDPOINT_ID_0 ? onOffState = mEndpointOnOffState[0] : onOffState = mEndpointOnOffState[endpointId - 1];
-            endpointId == ENDPOINT_ID_2 ? LED_write(sAppRedHandle, onOffState) : LED_write(sAppGreenHandle, onOffState);
-        }
-    }
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp
deleted file mode 100644
index 01a945e1a33d12..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "Globals.h"
-
-LED_Handle sAppRedHandle;
-LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index ba3f7bd1c205f8..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "Globals.h"
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "ClusterManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/CommandHandler.h>
-#include <app/util/af-types.h>
-#include <app/util/af.h>
-#include <app/util/basic-types.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    EndpointId endpoint     = attributePath.mEndpointId;
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    PLAT_LOG("MatterPostAttributeChangeCallback - Cluster ID: " ChipLogFormatMEI
-             ", EndPoint ID: '0x%02x', Attribute ID: " ChipLogFormatMEI,
-             ChipLogValueMEI(clusterId), endpoint, ChipLogValueMEI(attributeId));
-
-    switch (clusterId)
-    {
-    case OnOff::Id:
-        ClusterMgr().OnOnOffPostAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-
-    case Identify::Id:
-        ClusterMgr().OnIdentifyPostAttributeChangeCallback(endpoint, attributeId, size, value);
-        break;
-
-    case LevelControl::Id:
-        ClusterMgr().OnLevelControlAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-
-    case ColorControl::Id:
-        ClusterMgr().OnColorControlAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-    default:
-        PLAT_LOG("Unhandled cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-        break;
-    }
-}
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index f7302b6efd10cd..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-#endif // APP_CONFIG_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index ad9e93ee3ad1a5..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- *    Copyright (c) 2018 Nest Labs, Inc.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } BoltLockEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index 6ab8ca425ddbdf..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostEvent(const AppEvent * event);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index 97357823332342..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13X2_26X2_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
-
-// All clusters app has 3 group endpoints. This needs to defined here so that
-// CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
-#define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
deleted file mode 100644
index 1599ef1ef19264..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file ClusterManager.h
- *
- * Declarations for the ClusterManager callbacks for this application
- *
- **/
-
-#pragma once
-
-#include <app/util/af-types.h>
-#include <app/util/basic-types.h>
-#include <platform/CHIPDeviceLayer.h>
-
-class ClusterManager
-{
-public:
-    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint16_t size,
-                                               uint8_t * value);
-
-private:
-    friend ClusterManager & ClusterMgr(void);
-    bool mEndpointOnOffState[2];
-    static ClusterManager sCluster;
-};
-
-inline ClusterManager & ClusterMgr(void)
-{
-    return ClusterManager::sCluster;
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h
deleted file mode 100644
index 43f9362e0341b9..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <ti/drivers/apps/LED.h>
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13x2_26x2LogInit(void);
-void cc13x2_26x2Log(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13x2_26x2Log(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-extern LED_Handle sAppRedHandle;
-extern LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
deleted file mode 100644
index 30f5633cc3bc7f..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 8311c8990aa5c6..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-#include <ti/drivers/UART.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc800)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    UART_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
index 513bf01de715d4..4cb76380ce2df4 100644
--- a/examples/all-clusters-app/cc13x4_26x4/README.md
+++ b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
index 6df3ff32d1862b..3e338474833eab 100644
--- a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -20,10 +20,10 @@
 #include "AppConfig.h"
 #include "AppEvent.h"
 #include <app/server/Server.h>
-#include <app/util/af.h>
 
 #include "FreeRTOS.h"
 #include "Globals.h"
+#include <app/util/endpoint-config-api.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <examples/platform/cc13x4_26x4/CC13X4_26X4DeviceAttestationCreds.h>
 
@@ -40,8 +40,8 @@
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPPlatformMemory.h>
 
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
+#if AUTO_PRINT_METRICS
+// #include <platform/cc13xx_26xx/DiagnosticDataProviderImpl.h>
 #endif
 #include <app/server/OnboardingCodesUtil.h>
 
diff --git a/examples/all-clusters-app/cc13x4_26x4/main/ZclCallbacks.cpp b/examples/all-clusters-app/cc13x4_26x4/main/ZclCallbacks.cpp
index 09505504315cad..b21e2ad4c1b9f0 100644
--- a/examples/all-clusters-app/cc13x4_26x4/main/ZclCallbacks.cpp
+++ b/examples/all-clusters-app/cc13x4_26x4/main/ZclCallbacks.cpp
@@ -30,7 +30,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 
 using namespace ::chip;
diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
index 0668411a9bfbd3..6f35995a445110 100644
--- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
@@ -22,6 +22,10 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+#include <tuple>
+#include <vector>
+
 #if CONFIG_HAVE_DISPLAY
 using namespace ::chip;
 using namespace ::chip::Credentials;
diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
index e1d8805e689326..2cec0c32093734 100644
--- a/examples/all-clusters-app/esp32/main/Kconfig.projbuild
+++ b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
@@ -59,10 +59,6 @@ menu "Demo"
             depends on IDF_TARGET_ESP32H2
     endchoice
 
-    config CHIP_PROJECT_CONFIG
-        string "CHIP Project Configuration file"
-        default "main/include/CHIPProjectConfig.h"
-
     choice
       prompt "Rendezvous Mode"
       default RENDEZVOUS_MODE_BLE if BT_ENABLED
diff --git a/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
index 578f44003f435e..ac39b9498e9f21 100644
--- a/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
+++ b/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
@@ -42,6 +42,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 // TODO need sensible library tag when put in library
 extern const char TAG[];
 
diff --git a/examples/all-clusters-app/esp32/main/StatusScreen.cpp b/examples/all-clusters-app/esp32/main/StatusScreen.cpp
index 55f42a32723823..0013bda66c5c70 100644
--- a/examples/all-clusters-app/esp32/main/StatusScreen.cpp
+++ b/examples/all-clusters-app/esp32/main/StatusScreen.cpp
@@ -45,6 +45,8 @@
 #include <app/server/Server.h>
 #include <lib/core/DataModelTypes.h>
 
+#include <string>
+
 #define MAX_LENGTH_SMALL_FONT 30
 
 using namespace chip;
diff --git a/examples/all-clusters-app/esp32/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/esp32/main/include/CHIPProjectConfig.h
deleted file mode 100644
index 9fff1bd10e67b4..00000000000000
--- a/examples/all-clusters-app/esp32/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#pragma once
-
-/**
- * @def CONFIG_BUILD_FOR_HOST_UNIT_TEST
- *
- * @brief Defines whether we're currently building for unit testing, which enables a set of features
- *        that are only utilized in those tests. This flag should not be enabled on devices. If you have a test
- *        that uses this flag, either appropriately conditionalize the entire test on this flag, or to exclude
- *        the compliation of that test source file entirely.
- */
-#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
diff --git a/examples/all-clusters-app/esp32/main/include/QRCodeScreen.h b/examples/all-clusters-app/esp32/main/include/QRCodeScreen.h
index ced5be2ac3a670..9599280b7fd3b0 100644
--- a/examples/all-clusters-app/esp32/main/include/QRCodeScreen.h
+++ b/examples/all-clusters-app/esp32/main/include/QRCodeScreen.h
@@ -31,6 +31,7 @@
 #include "ScreenManager.h"
 
 #include <cstdint>
+#include <string>
 #include <vector>
 
 class QRCodeScreen : public Screen
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
index a3af54f3a22e06..af94d2b2d36afe 100644
--- a/examples/all-clusters-app/esp32/main/main.cpp
+++ b/examples/all-clusters-app/esp32/main/main.cpp
@@ -34,7 +34,7 @@
 #include "platform/PlatformManager.h"
 #include "shell_extension/launch.h"
 #include <app/server/OnboardingCodesUtil.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <binding-handler.h>
 #include <common/CHIPDeviceManager.h>
 #include <common/Esp32AppServer.h>
diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
index b75b5abfc74294..0d0ba0f5b25663 100644
--- a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
@@ -29,6 +29,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index d1bab3649f0b67..8effe6426cc49d 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -25,6 +25,7 @@
 #include <app/clusters/switch-server/switch-server.h>
 #include <app/server/Server.h>
 #include <app/util/att-storage.h>
+#include <app/util/attribute-storage.h>
 #include <platform/PlatformManager.h>
 
 #include <air-quality-instance.h>
@@ -35,6 +36,8 @@
 #include <oven-operational-state-delegate.h>
 #include <rvc-modes.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.h b/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
index 4022b06e9f8565..f097c539b54fb6 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.h
@@ -23,6 +23,8 @@
 #include <json/json.h>
 #include <platform/DiagnosticDataProvider.h>
 
+#include <string>
+
 class AllClustersAppCommandHandler
 {
 public:
diff --git a/examples/all-clusters-app/linux/AppOptions.cpp b/examples/all-clusters-app/linux/AppOptions.cpp
index 50be6561c6bb4a..bd5147102715eb 100644
--- a/examples/all-clusters-app/linux/AppOptions.cpp
+++ b/examples/all-clusters-app/linux/AppOptions.cpp
@@ -21,6 +21,8 @@
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Server.h>
 
+#include <string>
+
 using namespace chip::ArgParser;
 
 using chip::ArgParser::OptionDef;
diff --git a/examples/all-clusters-app/linux/AppOptions.h b/examples/all-clusters-app/linux/AppOptions.h
index dfdd2c0e66fe70..69c1af83b72909 100644
--- a/examples/all-clusters-app/linux/AppOptions.h
+++ b/examples/all-clusters-app/linux/AppOptions.h
@@ -22,6 +22,8 @@
 
 #include <app/tests/suites/credentials/TestHarnessDACProvider.h>
 
+#include <string>
+
 class AppOptions
 {
 public:
diff --git a/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp b/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp
index 4dc94da1338c28..afb75a7ef666c4 100644
--- a/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp
+++ b/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp
@@ -20,6 +20,8 @@
 
 #include <lib/support/SafeInt.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app::Clusters::DiagnosticLogs;
 
diff --git a/examples/all-clusters-app/linux/include/diagnostic-logs-provider-delegate-impl.h b/examples/all-clusters-app/linux/include/diagnostic-logs-provider-delegate-impl.h
index c0e69f1c5bde0b..f90c8d600f4526 100644
--- a/examples/all-clusters-app/linux/include/diagnostic-logs-provider-delegate-impl.h
+++ b/examples/all-clusters-app/linux/include/diagnostic-logs-provider-delegate-impl.h
@@ -22,6 +22,7 @@
 
 #include <fstream>
 #include <map>
+#include <string>
 
 namespace chip {
 namespace app {
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
index 8760bcb92d456c..73af031ecbdb5d 100644
--- a/examples/all-clusters-app/linux/main-common.cpp
+++ b/examples/all-clusters-app/linux/main-common.cpp
@@ -48,7 +48,6 @@
 #include <app/clusters/time-synchronization-server/time-synchronization-server.h>
 #include <app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CHIPMem.h>
@@ -61,6 +60,8 @@
 #include <transport/SessionManager.h>
 #include <transport/raw/PeerAddress.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::DeviceLayer;
diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
index efdee7153b493c..3551087a969411 100644
--- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
+++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
@@ -31,6 +31,7 @@
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/all-clusters-app/nxp/common/main/AppTask.cpp b/examples/all-clusters-app/nxp/common/main/AppTask.cpp
index 7f4c1f257d0405..0b945d49561e43 100644
--- a/examples/all-clusters-app/nxp/common/main/AppTask.cpp
+++ b/examples/all-clusters-app/nxp/common/main/AppTask.cpp
@@ -23,6 +23,7 @@
 #include "ICDUtil.h"
 #include <app/InteractionModelEngine.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
diff --git a/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp b/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp
index 86ea10f4687558..d4be6f1eb89a8c 100644
--- a/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp
+++ b/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 
diff --git a/examples/all-clusters-app/telink/CMakeLists.txt b/examples/all-clusters-app/telink/CMakeLists.txt
index 2c59e658a7e6dc..d5f2132c9d2747 100644
--- a/examples/all-clusters-app/telink/CMakeLists.txt
+++ b/examples/all-clusters-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
@@ -21,47 +22,11 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 get_filename_component(ALL_CLUSTERS_COMMON_DIR ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common REALPATH)
 get_filename_component(ENERGY_MANAGEMENT_COMMON_DIR ${CHIP_ROOT}/examples/energy-management-app/energy-management-common/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-all-clusters-app-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-all-clusters-app-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -70,7 +35,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/all-clusters-app
                            ${TELINK_COMMON}/common/include
-                           ${TELINK_COMMON}/util/include)
+                           ${TELINK_COMMON}/util/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -92,10 +58,15 @@ target_sources(app PRIVATE
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementManager.cpp                  
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/all-clusters-app/telink/include/AppConfig.h b/examples/all-clusters-app/telink/include/AppConfig.h
index 68263bbda460db..602aa6065313a5 100644
--- a/examples/all-clusters-app/telink/include/AppConfig.h
+++ b/examples/all-clusters-app/telink/include/AppConfig.h
@@ -19,11 +19,5 @@
 #pragma once
 
 // ---- All Clusters Application example config ----
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 1
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 1
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/all-clusters-app/telink/prj.conf b/examples/all-clusters-app/telink/prj.conf
index 18b7edcc11f395..a2b81f952a17f3 100644
--- a/examples/all-clusters-app/telink/prj.conf
+++ b/examples/all-clusters-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # CHIP PID: 32769 == 0x8001 (all-clusters-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
 
diff --git a/examples/all-clusters-app/tizen/src/main.cpp b/examples/all-clusters-app/tizen/src/main.cpp
index e3e8aa736846fc..49c9f06ad9b8f6 100644
--- a/examples/all-clusters-app/tizen/src/main.cpp
+++ b/examples/all-clusters-app/tizen/src/main.cpp
@@ -20,7 +20,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <platform/Tizen/NetworkCommissioningDriver.h>
 #include <static-supported-temperature-levels.h>
 
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
index 693b06cbaa80e4..f6f6c9206ae4b4 100644
--- a/examples/all-clusters-minimal-app/ameba/README.md
+++ b/examples/all-clusters-minimal-app/ameba/README.md
@@ -27,13 +27,13 @@ The CHIP demo application is supported on
 -   Pull docker image:
 
           ```
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:35
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
           ```
 
 -   Run docker container:
 
           ```
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
           ```
 
 -   Setup build environment:
diff --git a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
index 67b13d9abb9506..a02dd619100928 100644
--- a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
index bc297dfa3d426b..abb0791ac9a132 100644
--- a/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
+++ b/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp
@@ -28,7 +28,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/core/ErrorStr.h>
diff --git a/examples/all-clusters-minimal-app/asr/src/AppTask.cpp b/examples/all-clusters-minimal-app/asr/src/AppTask.cpp
index d6f77d2f28a836..f9d05c2157382d 100644
--- a/examples/all-clusters-minimal-app/asr/src/AppTask.cpp
+++ b/examples/all-clusters-minimal-app/asr/src/AppTask.cpp
@@ -34,6 +34,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <event_groups.h>
 #include <platform/ASR/NetworkCommissioningDriver.h>
diff --git a/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
index 89266592872d3e..c40de8c006e1fc 100644
--- a/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/all-clusters-minimal-app/asr/src/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
index c588c84bcff2d0..f56a3e69a023e7 100644
--- a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
@@ -21,6 +21,9 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+#include <tuple>
+
 #if CONFIG_HAVE_DISPLAY
 using namespace ::chip;
 using namespace ::chip::Credentials;
diff --git a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
index 9fe8f460e6b0a4..171af4f0ba2c24 100644
--- a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
+++ b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
@@ -48,10 +48,6 @@ menu "Demo"
             depends on IDF_TARGET_ESP32C2
     endchoice
 
-    config CHIP_PROJECT_CONFIG
-        string "CHIP Project Configuration file"
-        default "main/include/CHIPProjectConfig.h"
-
     choice
       prompt "Rendezvous Mode"
       default RENDEZVOUS_MODE_BLE if BT_ENABLED
diff --git a/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
index 578f44003f435e..ac39b9498e9f21 100644
--- a/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
@@ -42,6 +42,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 // TODO need sensible library tag when put in library
 extern const char TAG[];
 
diff --git a/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp b/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp
index 55f42a32723823..0013bda66c5c70 100644
--- a/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/StatusScreen.cpp
@@ -45,6 +45,8 @@
 #include <app/server/Server.h>
 #include <lib/core/DataModelTypes.h>
 
+#include <string>
+
 #define MAX_LENGTH_SMALL_FONT 30
 
 using namespace chip;
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/esp32/main/include/CHIPProjectConfig.h
deleted file mode 100644
index 9fff1bd10e67b4..00000000000000
--- a/examples/all-clusters-minimal-app/esp32/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#pragma once
-
-/**
- * @def CONFIG_BUILD_FOR_HOST_UNIT_TEST
- *
- * @brief Defines whether we're currently building for unit testing, which enables a set of features
- *        that are only utilized in those tests. This flag should not be enabled on devices. If you have a test
- *        that uses this flag, either appropriately conditionalize the entire test on this flag, or to exclude
- *        the compliation of that test source file entirely.
- */
-#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
diff --git a/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h b/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h
index da0ca8de53fe20..c02cd619d3ca82 100644
--- a/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h
+++ b/examples/all-clusters-minimal-app/esp32/main/include/QRCodeScreen.h
@@ -32,6 +32,7 @@
 #include "ScreenManager.h"
 
 #include <cstdint>
+#include <string>
 #include <vector>
 
 class QRCodeScreen : public Screen
diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp
index 0ac538607efd89..993dc609300943 100644
--- a/examples/all-clusters-minimal-app/esp32/main/main.cpp
+++ b/examples/all-clusters-minimal-app/esp32/main/main.cpp
@@ -36,7 +36,7 @@
 #include <common/CHIPDeviceManager.h>
 
 #include <app/server/OnboardingCodesUtil.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <binding-handler.h>
 #include <common/Esp32AppServer.h>
 #include <common/Esp32ThreadInit.h>
diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
index 7cbaf6f447d405..ccc271dd7a2d06 100644
--- a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
@@ -29,6 +29,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/all-clusters-minimal-app/linux/main-common.cpp b/examples/all-clusters-minimal-app/linux/main-common.cpp
index d9f0a51cd747cf..f0bf3cafe8553c 100644
--- a/examples/all-clusters-minimal-app/linux/main-common.cpp
+++ b/examples/all-clusters-minimal-app/linux/main-common.cpp
@@ -21,7 +21,6 @@
 #include <app/CommandHandler.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <lib/support/CHIPMem.h>
 #include <new>
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
index b3c8b951372c0f..86bfe7a9aa132b 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
@@ -26,6 +26,7 @@
 #include <app/server/Server.h>
 
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/all-clusters-minimal-app/telink/CMakeLists.txt b/examples/all-clusters-minimal-app/telink/CMakeLists.txt
index a68471e379a842..3cfcc56d36783c 100644
--- a/examples/all-clusters-minimal-app/telink/CMakeLists.txt
+++ b/examples/all-clusters-minimal-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
@@ -20,47 +21,11 @@ get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALP
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 get_filename_component(ALL_CLUSTERS_COMMON_DIR ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-all-clusters-minimal-app-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-all-clusters-minimal-app-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -68,7 +33,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/all-clusters-minimal-app
                            ${TELINK_COMMON}/common/include
-                           ${TELINK_COMMON}/util/include)
+                           ${TELINK_COMMON}/util/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -78,9 +44,15 @@ target_sources(app PRIVATE
                ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
-               ${TELINK_COMMON}/util/src/ThreadUtil.cpp)
+               ${TELINK_COMMON}/util/src/ThreadUtil.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/all-clusters-minimal-app/telink/include/AppConfig.h b/examples/all-clusters-minimal-app/telink/include/AppConfig.h
index 5ef62e04203e1b..38bbe54833078b 100644
--- a/examples/all-clusters-minimal-app/telink/include/AppConfig.h
+++ b/examples/all-clusters-minimal-app/telink/include/AppConfig.h
@@ -20,8 +20,5 @@
 
 // ---- All Clusters Minimal Application example config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 0
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 1
diff --git a/examples/all-clusters-minimal-app/telink/prj.conf b/examples/all-clusters-minimal-app/telink/prj.conf
index 8b63c719c3875c..0b226d2c74a374 100644
--- a/examples/all-clusters-minimal-app/telink/prj.conf
+++ b/examples/all-clusters-minimal-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -25,10 +25,6 @@ CONFIG_STD_CPP17=y
 # enable GPIO
 CONFIG_GPIO=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # CHIP PID: 32769 == 0x8001 (all-clusters-minimal-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
 
diff --git a/examples/all-clusters-minimal-app/tizen/src/main.cpp b/examples/all-clusters-minimal-app/tizen/src/main.cpp
index 327623911831bb..fd2a345c952dd8 100644
--- a/examples/all-clusters-minimal-app/tizen/src/main.cpp
+++ b/examples/all-clusters-minimal-app/tizen/src/main.cpp
@@ -20,7 +20,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <platform/Tizen/NetworkCommissioningDriver.h>
 
 #include <TizenServiceAppMain.h>
diff --git a/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp b/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
index 4a0235adbff06e..abf57152cd153d 100644
--- a/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
+++ b/examples/android/CHIPTool/app/src/main/cpp/native-lib.cpp
@@ -26,6 +26,8 @@
 #include <jni.h>
 #include <lib/support/CodeUtils.h>
 
+#include <string>
+
 // This is just a sample function to demonstrate end-to-end calling in/out of CHIP stack
 // is working.
 std::string base38Encode(void)
diff --git a/examples/bridge-app/asr/src/AppTask.cpp b/examples/bridge-app/asr/src/AppTask.cpp
index 9583fb3a7017e4..ea95500d402f07 100755
--- a/examples/bridge-app/asr/src/AppTask.cpp
+++ b/examples/bridge-app/asr/src/AppTask.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/ASR/NetworkCommissioningDriver.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/bridge-app/asr/src/DeviceCallbacks.cpp b/examples/bridge-app/asr/src/DeviceCallbacks.cpp
index f16b4c956c8022..232e22799e7b65 100644
--- a/examples/bridge-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/bridge-app/asr/src/DeviceCallbacks.cpp
@@ -32,7 +32,6 @@
 #include <app/InteractionModelEngine.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/bridge-app/asr/src/bridged-actions-stub.cpp b/examples/bridge-app/asr/src/bridged-actions-stub.cpp
index b63fee3fd300a7..9e26bae9803fa1 100755
--- a/examples/bridge-app/asr/src/bridged-actions-stub.cpp
+++ b/examples/bridge-app/asr/src/bridged-actions-stub.cpp
@@ -18,6 +18,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp b/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp
index 9d4eda96e98438..3508068c4832c6 100644
--- a/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp
+++ b/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp
@@ -27,6 +27,7 @@
 #include <app/reporting/reporting.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/ErrorStr.h>
diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
index b54c8b4ebb3934..13ced6a2e1c7c6 100644
--- a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
@@ -20,6 +20,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
index 07db2ba94a534f..016b75803cd69b 100644
--- a/examples/bridge-app/esp32/main/main.cpp
+++ b/examples/bridge-app/esp32/main/main.cpp
@@ -26,6 +26,7 @@
 #include <app/reporting/reporting.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/bridge-app/linux/Device.cpp b/examples/bridge-app/linux/Device.cpp
index e049e270c49f42..d7862260f820d2 100644
--- a/examples/bridge-app/linux/Device.cpp
+++ b/examples/bridge-app/linux/Device.cpp
@@ -22,6 +22,8 @@
 #include <cstdio>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <string>
+
 using namespace chip::app::Clusters::Actions;
 
 Device::Device(const char * szDeviceName, std::string szLocation)
diff --git a/examples/bridge-app/linux/bridged-actions-stub.cpp b/examples/bridge-app/linux/bridged-actions-stub.cpp
index 6127df0206a4d0..00f6913b8012c5 100644
--- a/examples/bridge-app/linux/bridged-actions-stub.cpp
+++ b/examples/bridge-app/linux/bridged-actions-stub.cpp
@@ -19,6 +19,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h
index d5c8434b29eda1..1a5f5bba795394 100644
--- a/examples/bridge-app/linux/include/Device.h
+++ b/examples/bridge-app/linux/include/Device.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 
 #include <functional>
+#include <string>
 #include <vector>
 
 class Device
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
index c569e7c06e8b45..3643f5ea1eb02a 100644
--- a/examples/bridge-app/linux/main.cpp
+++ b/examples/bridge-app/linux/main.cpp
@@ -22,12 +22,13 @@
 
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/EventLogging.h>
 #include <app/reporting/reporting.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <app/util/util.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
@@ -48,6 +49,7 @@
 
 #include <cassert>
 #include <iostream>
+#include <string>
 #include <vector>
 
 using namespace chip;
diff --git a/examples/bridge-app/telink/CMakeLists.txt b/examples/bridge-app/telink/CMakeLists.txt
index f4da959953def8..1da3944812e014 100644
--- a/examples/bridge-app/telink/CMakeLists.txt
+++ b/examples/bridge-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-bridge-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-bridge-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,19 +32,24 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/bridge-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/ZclCallbacks.cpp
                src/Device.cpp
                src/DeviceCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/bridge-app/telink/include/AppConfig.h b/examples/bridge-app/telink/include/AppConfig.h
index e5e26efb2871d1..e4af6138744261 100644
--- a/examples/bridge-app/telink/include/AppConfig.h
+++ b/examples/bridge-app/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- Bridge App Example Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 1
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/bridge-app/telink/include/AppTask.h b/examples/bridge-app/telink/include/AppTask.h
index 6b8a60df890dbf..18275849c015a4 100644
--- a/examples/bridge-app/telink/include/AppTask.h
+++ b/examples/bridge-app/telink/include/AppTask.h
@@ -19,14 +19,20 @@
 #pragma once
 
 #include "AppTaskCommon.h"
-#include "PWMDevice.h"
 
 class AppTask : public AppTaskCommon
 {
 public:
+    enum Action_t : uint8_t
+    {
+        ON_ACTION = 0,
+        OFF_ACTION,
+        LEVEL_ACTION,
+        INVALID_ACTION
+    };
+
     void UpdateClusterState(void);
     static void InitServer(intptr_t context);
-    PWMDevice & GetPWMDevice(void) { return mPwmRgbBlueLed; }
 
 private:
     friend AppTask & GetAppTask(void);
@@ -34,13 +40,8 @@ class AppTask : public AppTaskCommon
 
     CHIP_ERROR Init(void);
 
-    static void ActionInitiated(PWMDevice::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor);
-
     static void LightingActionEventHandler(AppEvent * aEvent);
 
-    PWMDevice mPwmRgbBlueLed;
-
     static AppTask sAppTask;
 };
 
diff --git a/examples/bridge-app/telink/include/Device.h b/examples/bridge-app/telink/include/Device.h
index bd91dcb9f346c0..19b3b1bae7c1af 100644
--- a/examples/bridge-app/telink/include/Device.h
+++ b/examples/bridge-app/telink/include/Device.h
@@ -20,6 +20,7 @@
 
 #include <functional>
 #include <stdbool.h>
+#include <string>
 
 #include <stdint.h>
 
diff --git a/examples/bridge-app/telink/prj.conf b/examples/bridge-app/telink/prj.conf
index fba10bf033c9e7..28b99fe97cce99 100644
--- a/examples/bridge-app/telink/prj.conf
+++ b/examples/bridge-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32770 == 0x8002 (example bridge-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32770
 
diff --git a/examples/bridge-app/telink/src/AppTask.cpp b/examples/bridge-app/telink/src/AppTask.cpp
index 72a997c91e9511..76a59c4de5e293 100644
--- a/examples/bridge-app/telink/src/AppTask.cpp
+++ b/examples/bridge-app/telink/src/AppTask.cpp
@@ -18,15 +18,18 @@
 
 #include "AppTask.h"
 #include "Device.h"
+#include "PWMManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/reporting/reporting.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/support/ZclString.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 namespace {
-const struct pwm_dt_spec sPwmRgbSpecBlueLed = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0));
+bool sTurnedOn;
+uint8_t sLevel;
 } // namespace
 
 AppTask AppTask::sAppTask;
@@ -394,29 +397,32 @@ bool emberAfActionsClusterInstantActionCallback(app::CommandHandler * commandObj
 
 CHIP_ERROR AppTask::Init(void)
 {
-    // Init lighting manager
-    uint8_t minLightLevel = kDefaultMinLevel;
-    Clusters::LevelControl::Attributes::MinLevel::Get(kExampleEndpointId, &minLightLevel);
+    SetExampleButtonCallbacks(LightingActionEventHandler);
+    InitCommonParts();
 
-    uint8_t maxLightLevel = kDefaultMaxLevel;
-    Clusters::LevelControl::Attributes::MaxLevel::Get(kExampleEndpointId, &maxLightLevel);
+    Protocols::InteractionModel::Status status;
 
-    // Initialize PWM LED
-    CHIP_ERROR err = sAppTask.mPwmRgbBlueLed.Init(&sPwmRgbSpecBlueLed, minLightLevel, maxLightLevel, maxLightLevel);
-    if (err != CHIP_NO_ERROR)
+    app::DataModel::Nullable<uint8_t> level;
+    // Read brightness value
+    status = Clusters::LevelControl::Attributes::CurrentLevel::Get(kExampleEndpointId, level);
+    if (status == Protocols::InteractionModel::Status::Success && !level.IsNull())
     {
-        LOG_ERR("Blue RGB PWM Device Init fail");
-        return err;
+        sLevel = level.Value();
     }
 
-    sAppTask.mPwmRgbBlueLed.SetCallbacks(ActionInitiated, ActionCompleted, nullptr);
-
-#if APP_USE_EXAMPLE_START_BUTTON
-    SetExampleButtonCallbacks(LightingActionEventHandler);
-#endif
-    InitCommonParts();
+    bool isOn;
+    // Read storedValue on/off value
+    status = Clusters::OnOff::Attributes::OnOff::Get(1, &isOn);
+    if (status == Protocols::InteractionModel::Status::Success)
+    {
+        sTurnedOn = isOn;
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, sTurnedOn);
+    }
 
-    memset(gDevices, 0, sizeof(gDevices));
+    for (size_t i = 0; i < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; i++)
+    {
+        gDevices[i] = nullptr;
+    }
 
     gLight1.SetReachable(true);
     gLight2.SetReachable(true);
@@ -530,66 +536,26 @@ Protocols::InteractionModel::Status HandleReadTempMeasurementAttribute(DeviceTem
 
 void AppTask::LightingActionEventHandler(AppEvent * aEvent)
 {
-    PWMDevice::Action_t action = PWMDevice::INVALID_ACTION;
-    int32_t actor              = 0;
+    Action_t action = INVALID_ACTION;
+    int32_t actor   = 0;
 
     if (aEvent->Type == AppEvent::kEventType_Lighting)
     {
-        action = static_cast<PWMDevice::Action_t>(aEvent->LightingEvent.Action);
+        action = static_cast<Action_t>(aEvent->LightingEvent.Action);
         actor  = aEvent->LightingEvent.Actor;
     }
     else if (aEvent->Type == AppEvent::kEventType_Button)
     {
-        action = sAppTask.mPwmRgbBlueLed.IsTurnedOn() ? PWMDevice::OFF_ACTION : PWMDevice::ON_ACTION;
-        actor  = AppEvent::kEventType_Button;
-    }
-
-    if (action != PWMDevice::INVALID_ACTION && (!sAppTask.mPwmRgbBlueLed.InitiateAction(action, actor, NULL)))
-    {
-        LOG_INF("Action is in progress or active");
-    }
-}
-
-void AppTask::ActionInitiated(PWMDevice::Action_t aAction, int32_t aActor)
-{
-    if (aAction == PWMDevice::ON_ACTION)
-    {
-        LOG_DBG("ON_ACTION initiated");
-    }
-    else if (aAction == PWMDevice::OFF_ACTION)
-    {
-        LOG_DBG("OFF_ACTION initiated");
-    }
-    else if (aAction == PWMDevice::LEVEL_ACTION)
-    {
-        LOG_DBG("LEVEL_ACTION initiated");
-    }
-}
-
-void AppTask::ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor)
-{
-    if (aAction == PWMDevice::ON_ACTION)
-    {
-        LOG_DBG("ON_ACTION completed");
-    }
-    else if (aAction == PWMDevice::OFF_ACTION)
-    {
-        LOG_DBG("OFF_ACTION completed");
-    }
-    else if (aAction == PWMDevice::LEVEL_ACTION)
-    {
-        LOG_DBG("LEVEL_ACTION completed");
-    }
+        sTurnedOn = !sTurnedOn;
 
-    if (aActor == AppEvent::kEventType_Button)
-    {
-        sAppTask.UpdateClusterState();
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, sTurnedOn);
+        GetAppTask().UpdateClusterState();
     }
 }
 
 void AppTask::UpdateClusterState(void)
 {
-    bool isTurnedOn = sAppTask.mPwmRgbBlueLed.IsTurnedOn();
+    bool isTurnedOn = sTurnedOn;
 
     // write the new on/off value
     Protocols::InteractionModel::Status status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn);
@@ -598,7 +564,7 @@ void AppTask::UpdateClusterState(void)
     {
         LOG_ERR("Update OnOff fail: %x", to_underlying(status));
     }
-    uint8_t setLevel = sAppTask.mPwmRgbBlueLed.GetLevel();
+    uint8_t setLevel = sLevel;
     status           = Clusters::LevelControl::Attributes::CurrentLevel::Set(kExampleEndpointId, setLevel);
     if (status != Protocols::InteractionModel::Status::Success)
     {
diff --git a/examples/bridge-app/telink/src/Device.cpp b/examples/bridge-app/telink/src/Device.cpp
index 053bf2ce187679..769f1ec420f154 100644
--- a/examples/bridge-app/telink/src/Device.cpp
+++ b/examples/bridge-app/telink/src/Device.cpp
@@ -21,6 +21,8 @@
 #include <lib/support/CHIPMemString.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <string>
+
 using namespace ::chip::Platform;
 
 Device::Device(const char * szDeviceName, const char * szLocation)
diff --git a/examples/bridge-app/telink/src/DeviceCallbacks.cpp b/examples/bridge-app/telink/src/DeviceCallbacks.cpp
index 6742953d7ec2d2..b0657e586fabc2 100644
--- a/examples/bridge-app/telink/src/DeviceCallbacks.cpp
+++ b/examples/bridge-app/telink/src/DeviceCallbacks.cpp
@@ -20,6 +20,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/bridge-app/telink/src/ZclCallbacks.cpp b/examples/bridge-app/telink/src/ZclCallbacks.cpp
deleted file mode 100644
index e83993165acb51..00000000000000
--- a/examples/bridge-app/telink/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "ColorFormat.h"
-#include "PWMDevice.h"
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-using namespace chip;
-using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::OnOff;
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    Protocols::InteractionModel::Status status;
-    bool storedValue;
-
-    // Read storedValue on/off value
-    status = Attributes::OnOff::Get(1, &storedValue);
-    if (status == Protocols::InteractionModel::Status::Success)
-    {
-        // Set actual state to stored before reboot
-        GetAppTask().GetPWMDevice().Set(storedValue);
-    }
-
-    GetAppTask().UpdateClusterState();
-}
diff --git a/examples/chef/ameba/main/DeviceCallbacks.cpp b/examples/chef/ameba/main/DeviceCallbacks.cpp
index fd8a63e5a846c4..90c783a8578f33 100644
--- a/examples/chef/ameba/main/DeviceCallbacks.cpp
+++ b/examples/chef/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/chef/ameba/main/chipinterface.cpp b/examples/chef/ameba/main/chipinterface.cpp
index ad9946ef5a3719..f747cbbd886c42 100644
--- a/examples/chef/ameba/main/chipinterface.cpp
+++ b/examples/chef/ameba/main/chipinterface.cpp
@@ -29,7 +29,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <lib/core/ErrorStr.h>
diff --git a/examples/chef/common/chef-fan-control-manager.cpp b/examples/chef/common/chef-fan-control-manager.cpp
index 998491d4a61aeb..899892501bf4f1 100644
--- a/examples/chef/common/chef-fan-control-manager.cpp
+++ b/examples/chef/common/chef-fan-control-manager.cpp
@@ -20,6 +20,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/clusters/fan-control-server/fan-control-server.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
diff --git a/examples/chef/common/chef-laundry-washer-controls-delegate-impl.h b/examples/chef/common/chef-laundry-washer-controls-delegate-impl.h
index 15a72482726ba0..f9d3d1bf8c7bdf 100644
--- a/examples/chef/common/chef-laundry-washer-controls-delegate-impl.h
+++ b/examples/chef/common/chef-laundry-washer-controls-delegate-impl.h
@@ -20,7 +20,6 @@
 
 #include <app/clusters/laundry-washer-controls-server/laundry-washer-controls-delegate.h>
 #include <app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/chef/common/chef-laundry-washer-mode.h b/examples/chef/common/chef-laundry-washer-mode.h
index 2f59b0dfd04bab..5d35c03d4e50cd 100644
--- a/examples/chef/common/chef-laundry-washer-mode.h
+++ b/examples/chef/common/chef-laundry-washer-mode.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/chef/common/chef-rvc-mode-delegate.h b/examples/chef/common/chef-rvc-mode-delegate.h
index 3b08552776319a..5f96957420a441 100644
--- a/examples/chef/common/chef-rvc-mode-delegate.h
+++ b/examples/chef/common/chef-rvc-mode-delegate.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/chef/common/clusters/audio-output/AudioOutputManager.h b/examples/chef/common/clusters/audio-output/AudioOutputManager.h
index 5f9157de773ee7..ad64b7c9c96d5d 100644
--- a/examples/chef/common/clusters/audio-output/AudioOutputManager.h
+++ b/examples/chef/common/clusters/audio-output/AudioOutputManager.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app/clusters/audio-output-server/audio-output-server.h>
+#include <string>
 #include <vector>
 
 class AudioOutputManager : public chip::app::Clusters::AudioOutput::Delegate
diff --git a/examples/chef/common/clusters/channel/ChannelManager.cpp b/examples/chef/common/clusters/channel/ChannelManager.cpp
index 36df31af6de280..c47bf447dd3124 100644
--- a/examples/chef/common/clusters/channel/ChannelManager.cpp
+++ b/examples/chef/common/clusters/channel/ChannelManager.cpp
@@ -23,6 +23,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <string>
 #include <vector>
 
 using namespace chip;
diff --git a/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp b/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
index 7d92300ca5659c..90b9fd017b0a01 100644
--- a/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <app/data-model/Nullable.h>
-#include <app/util/af.h>
 #include <lib/core/DataModelTypes.h>
 
 #ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER
diff --git a/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp b/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
index 4770a9ce6e3c4b..c7fe5696d9ba74 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/util/af.h>
 #include <cstring>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
diff --git a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
index 0b81cce895b264..b6c3f7a4a35090 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
@@ -15,7 +15,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <app/util/af.h>
 #include <iostream>
 #include <lib/support/logging/CHIPLogging.h>
 
diff --git a/examples/chef/common/clusters/door-lock/chef-lock-manager.h b/examples/chef/common/clusters/door-lock/chef-lock-manager.h
index 709f13c1addc66..f941620880678e 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-manager.h
+++ b/examples/chef/common/clusters/door-lock/chef-lock-manager.h
@@ -22,8 +22,6 @@
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <cstdint>
 
-#include <app/util/af.h>
-
 class LockManager
 {
 public:
diff --git a/examples/chef/common/clusters/media-input/MediaInputManager.h b/examples/chef/common/clusters/media-input/MediaInputManager.h
index 104db65e2bbe97..ebd4a436fdbf24 100644
--- a/examples/chef/common/clusters/media-input/MediaInputManager.h
+++ b/examples/chef/common/clusters/media-input/MediaInputManager.h
@@ -20,6 +20,8 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/clusters/media-input-server/media-input-server.h>
+
+#include <string>
 #include <vector>
 
 class MediaInputManager : public chip::app::Clusters::MediaInput::Delegate
diff --git a/examples/chef/common/clusters/media-playback/MediaPlaybackManager.cpp b/examples/chef/common/clusters/media-playback/MediaPlaybackManager.cpp
index 512da2966d68b6..14be124252a7c0 100644
--- a/examples/chef/common/clusters/media-playback/MediaPlaybackManager.cpp
+++ b/examples/chef/common/clusters/media-playback/MediaPlaybackManager.cpp
@@ -21,6 +21,8 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/util/config.h>
 
+#include <string>
+
 using namespace std;
 using namespace chip::app::DataModel;
 using namespace chip::app::Clusters::MediaPlayback;
diff --git a/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.cpp b/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.cpp
index 17acf11b39bf23..be20f92f53a8fe 100644
--- a/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.cpp
+++ b/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.cpp
@@ -20,6 +20,9 @@
 #include "TargetNavigatorManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 
+#include <list>
+#include <string>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters::TargetNavigator;
diff --git a/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.h b/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.h
index 21a08b9595cd82..e9528081661e8d 100644
--- a/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.h
+++ b/examples/chef/common/clusters/target-navigator/TargetNavigatorManager.h
@@ -19,6 +19,8 @@
 
 #include <app/clusters/target-navigator-server/target-navigator-server.h>
 
+#include <string>
+
 class TargetNavigatorManager : public chip::app::Clusters::TargetNavigator::Delegate
 {
     using TargetInfoType             = chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Type;
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
index a578cc06a5d79f..9f2c7509031e86 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
@@ -2114,6 +2114,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
+  device type ma_powersource = 17, version 1;
   device type ma_contactsensor = 21, version 1;
 
 
@@ -2122,11 +2123,13 @@ endpoint 1 {
     ram      attribute identifyType default = 0x0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
+    callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 2;
 
     handle command Identify;
+    handle command TriggerEffect;
   }
 
   server cluster Descriptor {
@@ -2142,15 +2145,25 @@ endpoint 1 {
   }
 
   server cluster PowerSource {
-    ram      attribute status;
-    ram      attribute order;
-    ram      attribute description;
+    ram      attribute status default = 1;
+    ram      attribute order default = 1;
+    ram      attribute description default = "Primary Battery";
+    ram      attribute batVoltage default = 4100;
+    ram      attribute batPercentRemaining default = 95;
+    ram      attribute batTimeRemaining default = 5184000;
+    ram      attribute batChargeLevel default = 0;
+    ram      attribute batReplacementNeeded default = 0;
+    ram      attribute batReplaceability default = 1;
+    ram      attribute batPresent default = 1;
+    ram      attribute batCapacity default = 350;
+    ram      attribute batChargeState default = 4;
+    ram      attribute batFunctionalWhileCharging default = 1;
     callback attribute endpointList;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 0x06;
     ram      attribute clusterRevision default = 1;
   }
 
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
index 77bffd9fd09486..4a57e6a0b9e2fa 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
@@ -2316,13 +2316,21 @@
           "profileId": 259,
           "label": "MA-contactsensor",
           "name": "MA-contactsensor"
+        },
+        {
+          "code": 17,
+          "profileId": 259,
+          "label": "MA-powersource",
+          "name": "MA-powersource"
         }
       ],
       "deviceVersions": [
+        1,
         1
       ],
       "deviceIdentifiers": [
-        21
+        21,
+        17
       ],
       "deviceTypeName": "MA-contactsensor",
       "deviceTypeCode": 21,
@@ -2343,6 +2351,14 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -2410,6 +2426,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2632,7 +2664,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2648,7 +2680,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2664,7 +2696,167 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "Primary Battery",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatVoltage",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatPercentRemaining",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "95",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatTimeRemaining",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5184000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatChargeLevel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatChargeLevelEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatReplacementNeeded",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatReplaceability",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatReplaceabilityEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatPresent",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatCapacity",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "350",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatChargeState",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatChargeStateEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatFunctionalWhileCharging",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2760,7 +2952,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "0x06",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4525,7 +4717,7 @@
     {
       "endpointTypeName": "Anonymous Endpoint Type",
       "endpointTypeIndex": 1,
-      "profileId": 260,
+      "profileId": 259,
       "endpointId": 1,
       "networkId": 0,
       "parentEndpointIdentifier": null
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index f49d0a1e6e03b1..b8026a69abb6e2 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -569,6 +569,265 @@ cluster TimeFormatLocalization = 44 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
+cluster PowerSource = 47 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum BatApprovedChemistryEnum : enum16 {
+    kUnspecified = 0;
+    kAlkaline = 1;
+    kLithiumCarbonFluoride = 2;
+    kLithiumChromiumOxide = 3;
+    kLithiumCopperOxide = 4;
+    kLithiumIronDisulfide = 5;
+    kLithiumManganeseDioxide = 6;
+    kLithiumThionylChloride = 7;
+    kMagnesium = 8;
+    kMercuryOxide = 9;
+    kNickelOxyhydride = 10;
+    kSilverOxide = 11;
+    kZincAir = 12;
+    kZincCarbon = 13;
+    kZincChloride = 14;
+    kZincManganeseDioxide = 15;
+    kLeadAcid = 16;
+    kLithiumCobaltOxide = 17;
+    kLithiumIon = 18;
+    kLithiumIonPolymer = 19;
+    kLithiumIronPhosphate = 20;
+    kLithiumSulfur = 21;
+    kLithiumTitanate = 22;
+    kNickelCadmium = 23;
+    kNickelHydrogen = 24;
+    kNickelIron = 25;
+    kNickelMetalHydride = 26;
+    kNickelZinc = 27;
+    kSilverZinc = 28;
+    kSodiumIon = 29;
+    kSodiumSulfur = 30;
+    kZincBromide = 31;
+    kZincCerium = 32;
+  }
+
+  enum BatChargeFaultEnum : enum8 {
+    kUnspecified = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevelEnum : enum8 {
+    kOK = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeStateEnum : enum8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatCommonDesignationEnum : enum16 {
+    kUnspecified = 0;
+    kAAA = 1;
+    kAA = 2;
+    kC = 3;
+    kD = 4;
+    k4v5 = 5;
+    k6v0 = 6;
+    k9v0 = 7;
+    k12AA = 8;
+    kAAAA = 9;
+    kA = 10;
+    kB = 11;
+    kF = 12;
+    kN = 13;
+    kNo6 = 14;
+    kSubC = 15;
+    kA23 = 16;
+    kA27 = 17;
+    kBA5800 = 18;
+    kDuplex = 19;
+    k4SR44 = 20;
+    k523 = 21;
+    k531 = 22;
+    k15v0 = 23;
+    k22v5 = 24;
+    k30v0 = 25;
+    k45v0 = 26;
+    k67v5 = 27;
+    kJ = 28;
+    kCR123A = 29;
+    kCR2 = 30;
+    k2CR5 = 31;
+    kCRP2 = 32;
+    kCRV3 = 33;
+    kSR41 = 34;
+    kSR43 = 35;
+    kSR44 = 36;
+    kSR45 = 37;
+    kSR48 = 38;
+    kSR54 = 39;
+    kSR55 = 40;
+    kSR57 = 41;
+    kSR58 = 42;
+    kSR59 = 43;
+    kSR60 = 44;
+    kSR63 = 45;
+    kSR64 = 46;
+    kSR65 = 47;
+    kSR66 = 48;
+    kSR67 = 49;
+    kSR68 = 50;
+    kSR69 = 51;
+    kSR516 = 52;
+    kSR731 = 53;
+    kSR712 = 54;
+    kLR932 = 55;
+    kA5 = 56;
+    kA10 = 57;
+    kA13 = 58;
+    kA312 = 59;
+    kA675 = 60;
+    kAC41E = 61;
+    k10180 = 62;
+    k10280 = 63;
+    k10440 = 64;
+    k14250 = 65;
+    k14430 = 66;
+    k14500 = 67;
+    k14650 = 68;
+    k15270 = 69;
+    k16340 = 70;
+    kRCR123A = 71;
+    k17500 = 72;
+    k17670 = 73;
+    k18350 = 74;
+    k18500 = 75;
+    k18650 = 76;
+    k19670 = 77;
+    k25500 = 78;
+    k26650 = 79;
+    k32600 = 80;
+  }
+
+  enum BatFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceabilityEnum : enum8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatusEnum : enum8 {
+    kUnspecified = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentTypeEnum : enum8 {
+    kAC = 0;
+    kDC = 1;
+  }
+
+  enum WiredFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  struct BatChargeFaultChangeType {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  struct BatFaultChangeType {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  struct WiredFaultChangeType {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event WiredFaultChange = 0 {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event BatFaultChange = 1 {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  info event BatChargeFaultChange = 2 {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  readonly attribute PowerSourceStatusEnum status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute optional nullable int32u wiredAssessedInputVoltage = 3;
+  readonly attribute optional nullable int16u wiredAssessedInputFrequency = 4;
+  readonly attribute optional WiredCurrentTypeEnum wiredCurrentType = 5;
+  readonly attribute optional nullable int32u wiredAssessedCurrent = 6;
+  readonly attribute optional int32u wiredNominalVoltage = 7;
+  readonly attribute optional int32u wiredMaximumCurrent = 8;
+  readonly attribute optional boolean wiredPresent = 9;
+  readonly attribute optional WiredFaultEnum activeWiredFaults[] = 10;
+  readonly attribute optional nullable int32u batVoltage = 11;
+  readonly attribute optional nullable int8u batPercentRemaining = 12;
+  readonly attribute optional nullable int32u batTimeRemaining = 13;
+  readonly attribute optional BatChargeLevelEnum batChargeLevel = 14;
+  readonly attribute optional boolean batReplacementNeeded = 15;
+  readonly attribute optional BatReplaceabilityEnum batReplaceability = 16;
+  readonly attribute optional boolean batPresent = 17;
+  readonly attribute optional BatFaultEnum activeBatFaults[] = 18;
+  readonly attribute optional char_string<60> batReplacementDescription = 19;
+  readonly attribute optional BatCommonDesignationEnum batCommonDesignation = 20;
+  readonly attribute optional char_string<20> batANSIDesignation = 21;
+  readonly attribute optional char_string<20> batIECDesignation = 22;
+  readonly attribute optional BatApprovedChemistryEnum batApprovedChemistry = 23;
+  readonly attribute optional int32u batCapacity = 24;
+  readonly attribute optional int8u batQuantity = 25;
+  readonly attribute optional BatChargeStateEnum batChargeState = 26;
+  readonly attribute optional nullable int32u batTimeToFullCharge = 27;
+  readonly attribute optional boolean batFunctionalWhileCharging = 28;
+  readonly attribute optional nullable int32u batChargingCurrent = 29;
+  readonly attribute optional BatChargeFaultEnum activeBatChargeFaults[] = 30;
+  readonly attribute endpoint_no endpointList[] = 31;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 cluster GeneralCommissioning = 48 {
   revision 1; // NOTE: Default/not specifically set
@@ -1544,6 +1803,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
+  device type ma_powersource = 17, version 1;
   device type ma_contactsensor = 21, version 1;
 
   binding cluster Binding;
@@ -1558,6 +1818,7 @@ endpoint 1 {
     ram      attribute clusterRevision default = 2;
 
     handle command Identify;
+    handle command TriggerEffect;
   }
 
   server cluster Groups {
@@ -1592,10 +1853,35 @@ endpoint 1 {
     callback attribute clusterRevision;
   }
 
+  server cluster PowerSource {
+    ram      attribute status default = 1;
+    ram      attribute order default = 1;
+    ram      attribute description default = "Battery";
+    ram      attribute batVoltage default = 2590;
+    ram      attribute batPercentRemaining default = 98;
+    ram      attribute batTimeRemaining default = 52560000;
+    ram      attribute batChargeLevel default = 0;
+    ram      attribute batReplacementNeeded default = 0;
+    ram      attribute batReplaceability default = 2;
+    ram      attribute batPresent default = 1;
+    ram      attribute batReplacementDescription default = "2x AA/LR6 Alkaline";
+    ram      attribute batCommonDesignation default = 2;
+    ram      attribute batApprovedChemistry default = 1;
+    ram      attribute batQuantity;
+    callback attribute endpointList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x0A;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster BooleanState {
     ram      attribute stateValue default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
+    callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
     ram      attribute clusterRevision default = 1;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 40b85db5d09ef7..a47dc3a0b5c53e 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -2480,13 +2480,21 @@
           "profileId": 259,
           "label": "MA-contactsensor",
           "name": "MA-contactsensor"
+        },
+        {
+          "code": 17,
+          "profileId": 259,
+          "label": "MA-powersource",
+          "name": "MA-powersource"
         }
       ],
       "deviceVersions": [
+        1,
         1
       ],
       "deviceIdentifiers": [
-        21
+        21,
+        17
       ],
       "deviceTypeName": "MA-contactsensor",
       "deviceTypeCode": 21,
@@ -2507,6 +2515,14 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -3008,6 +3024,352 @@
             }
           ]
         },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PowerSourceStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "Battery",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatVoltage",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2590",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatPercentRemaining",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "98",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatTimeRemaining",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "52560000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatChargeLevel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatChargeLevelEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatReplacementNeeded",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatReplaceability",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatReplaceabilityEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatPresent",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatReplacementDescription",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2x AA/LR6 Alkaline",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatCommonDesignation",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatCommonDesignationEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatApprovedChemistry",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BatApprovedChemistryEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BatQuantity",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EndpointList",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0A",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Boolean State",
           "code": 69,
@@ -3064,6 +3426,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": null,
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -3129,7 +3507,7 @@
     {
       "endpointTypeName": "Anonymous Endpoint Type",
       "endpointTypeIndex": 1,
-      "profileId": 260,
+      "profileId": 259,
       "endpointId": 1,
       "networkId": 0,
       "parentEndpointIdentifier": null
diff --git a/examples/chef/esp32/main/QRCodeScreen.cpp b/examples/chef/esp32/main/QRCodeScreen.cpp
index 578f44003f435e..ac39b9498e9f21 100644
--- a/examples/chef/esp32/main/QRCodeScreen.cpp
+++ b/examples/chef/esp32/main/QRCodeScreen.cpp
@@ -42,6 +42,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 // TODO need sensible library tag when put in library
 extern const char TAG[];
 
diff --git a/examples/chef/esp32/main/include/QRCodeScreen.h b/examples/chef/esp32/main/include/QRCodeScreen.h
index e24fcd86d81e1a..f4994a3d6c372a 100644
--- a/examples/chef/esp32/main/include/QRCodeScreen.h
+++ b/examples/chef/esp32/main/include/QRCodeScreen.h
@@ -31,6 +31,7 @@
 #if CONFIG_HAVE_DISPLAY
 
 #include <cstdint>
+#include <string>
 #include <vector>
 
 class QRCodeScreen : public Screen
diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
index 3744cacc225ef8..c5f29dc0f847d8 100644
--- a/examples/chef/esp32/main/main.cpp
+++ b/examples/chef/esp32/main/main.cpp
@@ -41,7 +41,6 @@
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
diff --git a/examples/chef/telink/CMakeLists.txt b/examples/chef/telink/CMakeLists.txt
index 71f0c549e6ed79..3c6b352e55b873 100755
--- a/examples/chef/telink/CMakeLists.txt
+++ b/examples/chef/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
@@ -24,47 +25,11 @@ include(${CHEF}/project_include.cmake)
 
 get_filename_component(GEN_DIR ${CHEF}/out/${SAMPLE_NAME}/zap-generated REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-chef-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-chef-example)
 
 target_include_directories(app PRIVATE
                            ${CMAKE_CURRENT_SOURCE_DIR}
@@ -78,6 +43,7 @@ target_include_directories(app PRIVATE
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
                            ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext
 )
 
 if (CONFIG_CHIP_LIB_SHELL)
@@ -96,9 +62,15 @@ target_sources(app PRIVATE
     src/AppTask.cpp
     ${TELINK_COMMON}/common/src/mainCommon.cpp
     ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-    ${TELINK_COMMON}/util/src/PWMDevice.cpp
+    ${TELINK_COMMON}/util/src/LEDManager.cpp
     ${TELINK_COMMON}/util/src/ButtonManager.cpp
     ${TELINK_COMMON}/util/src/ThreadUtil.cpp
+    ${TELINK_COMMON}/util/src/PWMManager.cpp
+    ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+    ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+    ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+    ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+    ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c
     ${CHEF}/common/stubs.cpp
 )
 
@@ -114,126 +86,5 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
 endif()
 
 if (CONFIG_CHIP_PW_RPC)
-
-# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
-link_libraries($<BUILD_INTERFACE:zephyr_interface>)
-
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-
-include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-include($ENV{PW_ROOT}/pw_log/backend.cmake)
-include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
-
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.telink)
-
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/telink/pw_sys_io)
-
-pw_proto_library(attributes_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
-  PREFIX
-    attributes_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(descriptor_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
-  PREFIX
-    descriptor_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(device_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
-  PREFIX
-    device_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(ot_cli_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    ot_cli_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(thread_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    thread_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-target_sources(app PRIVATE
-  ../../common/pigweed/RpcService.cpp
-  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
-  ${TELINK_COMMON}/Rpc.cpp
-  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
-)
-
-target_include_directories(app PRIVATE
-  ${PIGWEED_ROOT}/pw_sys_io/public
-  ${CHIP_ROOT}/src/lib/support
-  ${CHIP_ROOT}/src/system
-  ${TELINK_COMMON}
-  ../../common
-  ../../common/pigweed
-  ../../common/pigweed/telink)
-
-target_compile_options(app PRIVATE
-                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
-                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
-                       "-DPW_RPC_DEVICE_SERVICE=1"
-                       "-DPW_RPC_THREAD_SERVICE=1"
-)
-
-target_link_libraries(app PRIVATE
-  attributes_service.nanopb_rpc
-  descriptor_service.nanopb_rpc
-  device_service.nanopb_rpc
-  thread_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_log
-  pw_rpc.server
-  pw_sys_io
-)
-
+  include(${TELINK_COMMON}/Rpc.cmake)
 endif(CONFIG_CHIP_PW_RPC)
diff --git a/examples/chef/telink/include/AppConfig.h b/examples/chef/telink/include/AppConfig.h
index b3092856c49902..b5c1335abf1774 100644
--- a/examples/chef/telink/include/AppConfig.h
+++ b/examples/chef/telink/include/AppConfig.h
@@ -20,8 +20,5 @@
 
 // ---- Chef Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 1
-#define APP_USE_THREAD_START_BUTTON 1
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
diff --git a/examples/chef/telink/include/AppTask.h b/examples/chef/telink/include/AppTask.h
index 3b91e9a3733786..13ede39ec8cfdb 100644
--- a/examples/chef/telink/include/AppTask.h
+++ b/examples/chef/telink/include/AppTask.h
@@ -20,6 +20,8 @@
 
 #include "AppTaskCommon.h"
 
+class ButtonManager;
+
 class AppTask : public AppTaskCommon
 {
 public:
@@ -28,6 +30,7 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkButtons(ButtonManager & buttonManager);
 
     static AppTask sAppTask;
 };
diff --git a/examples/chef/telink/prj.conf b/examples/chef/telink/prj.conf
index 5fdb2805860a94..72d253e97aa052 100755
--- a/examples/chef/telink/prj.conf
+++ b/examples/chef/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
diff --git a/examples/chef/telink/src/AppTask.cpp b/examples/chef/telink/src/AppTask.cpp
index a9683f0d8c3610..4b3116d4fd675c 100644
--- a/examples/chef/telink/src/AppTask.cpp
+++ b/examples/chef/telink/src/AppTask.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "AppTask.h"
+#include "ButtonManager.h"
 #include <app/server/Server.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
@@ -49,3 +50,10 @@ CHIP_ERROR AppTask::Init(void)
 
     return CHIP_NO_ERROR;
 }
+
+void AppTask::LinkButtons(ButtonManager & buttonManager)
+{
+    buttonManager.addCallback(FactoryResetButtonEventHandler, 0, true);
+    buttonManager.addCallback(ExampleActionButtonEventHandler, 1, true);
+    buttonManager.addCallback(StartBleAdvButtonEventHandler, 2, true);
+}
diff --git a/examples/chip-tool/commands/clusters/CustomArgument.h b/examples/chip-tool/commands/clusters/CustomArgument.h
index f977cd20c1a027..c7d81414659755 100644
--- a/examples/chip-tool/commands/clusters/CustomArgument.h
+++ b/examples/chip-tool/commands/clusters/CustomArgument.h
@@ -24,6 +24,8 @@
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/SafeInt.h>
 
+#include <string>
+
 #include "JsonParser.h"
 
 namespace {
diff --git a/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp b/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp
index 2a5b2d5d7c97a1..9be365ab27e2bf 100644
--- a/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp
+++ b/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp
@@ -18,6 +18,7 @@
 
 #include "BDXDiagnosticLogsServerDelegate.h"
 
+#include <string>
 #include <unistd.h>
 
 constexpr const char kTmpDir[]          = "/tmp/";
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index 29de06b5e0069c..c35eb11836d6c8 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -27,6 +27,8 @@
 #include <lib/support/TestGroupData.h>
 #include <platform/LockTracker.h>
 
+#include <string>
+
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 #include "TraceDecoder.h"
 #include "TraceHandlers.h"
diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h
index 55817b5213e589..50ab851d284502 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.h
+++ b/examples/chip-tool/commands/common/CHIPCommand.h
@@ -37,7 +37,7 @@
 #include <crypto/PersistentStorageOperationalKeystore.h>
 #include <crypto/RawKeySessionKeystore.h>
 
-#pragma once
+#include <string>
 
 inline constexpr char kIdentityAlpha[] = "alpha";
 inline constexpr char kIdentityBeta[]  = "beta";
diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
index 8d32a3fd1fc4f7..2c4f1eb3540e9f 100644
--- a/examples/chip-tool/commands/common/Command.cpp
+++ b/examples/chip-tool/commands/common/Command.cpp
@@ -24,6 +24,7 @@
 #include <functional>
 #include <netdb.h>
 #include <sstream>
+#include <string>
 #include <sys/socket.h>
 #include <sys/types.h>
 
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
index 26b80e54b6b322..556716a5c1d2ca 100644
--- a/examples/chip-tool/commands/common/Command.h
+++ b/examples/chip-tool/commands/common/Command.h
@@ -30,6 +30,7 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
+#include <string>
 #include <vector>
 
 class Command;
diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
index bb6c62dcb035fe..e6a392cbeec248 100644
--- a/examples/chip-tool/commands/common/Commands.h
+++ b/examples/chip-tool/commands/common/Commands.h
@@ -24,6 +24,7 @@
 
 #include "Command.h"
 #include <map>
+#include <string>
 
 class Commands
 {
diff --git a/examples/chip-tool/commands/common/CredentialIssuerCommands.h b/examples/chip-tool/commands/common/CredentialIssuerCommands.h
index afb36773529e1e..fd096b31835723 100644
--- a/examples/chip-tool/commands/common/CredentialIssuerCommands.h
+++ b/examples/chip-tool/commands/common/CredentialIssuerCommands.h
@@ -20,6 +20,7 @@
 
 #include <app/util/basic-types.h>
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <lib/core/CASEAuthTag.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <vector>
diff --git a/examples/chip-tool/commands/common/DeviceScanner.cpp b/examples/chip-tool/commands/common/DeviceScanner.cpp
index 35d74bd06c844f..9d3dbca98f8db9 100644
--- a/examples/chip-tool/commands/common/DeviceScanner.cpp
+++ b/examples/chip-tool/commands/common/DeviceScanner.cpp
@@ -55,7 +55,7 @@ CHIP_ERROR DeviceScanner::Stop()
 
 void DeviceScanner::OnNodeDiscovered(const DiscoveredNodeData & nodeData)
 {
-    auto & commissionData = nodeData.commissionData;
+    auto & commissionData = nodeData.nodeData;
 
     auto discriminator = commissionData.longDiscriminator;
     auto vendorId      = static_cast<VendorId>(commissionData.vendorId);
diff --git a/examples/chip-tool/commands/common/DeviceScanner.h b/examples/chip-tool/commands/common/DeviceScanner.h
index bcdcf26c84feb1..e8259ffc554897 100644
--- a/examples/chip-tool/commands/common/DeviceScanner.h
+++ b/examples/chip-tool/commands/common/DeviceScanner.h
@@ -25,6 +25,7 @@
 #include <controller/CHIPDeviceController.h>
 #include <lib/dnssd/platform/Dnssd.h>
 
+#include <string>
 #include <unordered_map>
 #include <vector>
 
@@ -41,7 +42,7 @@ struct DeviceScannerResult
     chip::Optional<chip::Dnssd::CommonResolutionData> mResolutionData;
 };
 
-class DeviceScanner : public chip::Dnssd::CommissioningResolveDelegate,
+class DeviceScanner : public chip::Dnssd::DiscoverNodeDelegate,
                       public chip::Dnssd::DnssdBrowseDelegate
 #if CONFIG_NETWORK_LAYER_BLE
     ,
@@ -55,7 +56,7 @@ class DeviceScanner : public chip::Dnssd::CommissioningResolveDelegate,
     CHIP_ERROR Get(uint16_t index, chip::Dnssd::CommonResolutionData & resolutionData);
     void Log() const;
 
-    /////////// CommissioningResolveDelegate Interface /////////
+    /////////// DiscoverNodeDelegate Interface /////////
     void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override;
 
     /////////// DnssdBrowseDelegate Interface /////////
diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
index 37955e821e8b82..9e3026262db97d 100644
--- a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
+++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
@@ -209,7 +209,7 @@ CHIP_ERROR LogDiscoveredNodeData(const chip::Dnssd::DiscoveredNodeData & nodeDat
     VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
 
     auto & resolutionData = nodeData.resolutionData;
-    auto & commissionData = nodeData.commissionData;
+    auto & commissionData = nodeData.nodeData;
 
     if (!chip::CanCastTo<uint8_t>(resolutionData.numIPs))
     {
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
index 284c145cfe0569..92861f7711d566 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -22,6 +22,9 @@
 
 #include <editline.h>
 
+#include <string>
+#include <vector>
+
 constexpr char kInteractiveModePrompt[]          = ">>> ";
 constexpr char kInteractiveModeHistoryFileName[] = "chip_tool_history";
 constexpr char kInteractiveModeStopCommand[]     = "quit()";
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.h b/examples/chip-tool/commands/interactive/InteractiveCommands.h
index 88a33dcb26c96f..a3b66769ced308 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.h
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.h
@@ -24,6 +24,8 @@
 
 #include <websocket-server/WebSocketServer.h>
 
+#include <string>
+
 class Commands;
 
 class InteractiveCommand : public CHIPCommand
diff --git a/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h
index 9d3d3deabd83d7..a541b1b9fe0f2d 100644
--- a/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h
+++ b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include "../common/CHIPCommand.h"
+#include "../common/RemoteDataModelLogger.h"
 
 class GetCommissionerNodeIdCommand : public CHIPCommand
 {
diff --git a/examples/chip-tool/commands/pairing/GetCommissionerRootCertificateCommand.h b/examples/chip-tool/commands/pairing/GetCommissionerRootCertificateCommand.h
index 7a350a9ca16bb8..f904cbbcfaa0a6 100644
--- a/examples/chip-tool/commands/pairing/GetCommissionerRootCertificateCommand.h
+++ b/examples/chip-tool/commands/pairing/GetCommissionerRootCertificateCommand.h
@@ -19,9 +19,12 @@
 #pragma once
 
 #include "../common/CHIPCommand.h"
+#include "../common/RemoteDataModelLogger.h"
 
 #include "ToTLVCert.h"
 
+#include <string>
+
 class GetCommissionerRootCertificateCommand : public CHIPCommand
 {
 public:
diff --git a/examples/chip-tool/commands/pairing/IssueNOCChainCommand.h b/examples/chip-tool/commands/pairing/IssueNOCChainCommand.h
index 8b89f07f106006..a04ed4f3e9a27f 100644
--- a/examples/chip-tool/commands/pairing/IssueNOCChainCommand.h
+++ b/examples/chip-tool/commands/pairing/IssueNOCChainCommand.h
@@ -19,9 +19,12 @@
 #pragma once
 
 #include "../common/CHIPCommand.h"
+#include "../common/RemoteDataModelLogger.h"
 
 #include "ToTLVCert.h"
 
+#include <string>
+
 class IssueNOCChainCommand : public CHIPCommand
 {
 public:
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
index f872692dc45235..5ec206c25b7ea0 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.cpp
+++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -28,6 +28,8 @@
 #include <setup_payload/ManualSetupPayloadParser.h>
 #include <setup_payload/QRCodeSetupPayloadParser.h>
 
+#include <string>
+
 using namespace ::chip;
 using namespace ::chip::Controller;
 
@@ -480,7 +482,7 @@ void PairingCommand::OnICDStayActiveComplete(NodeId deviceId, uint32_t promisedA
 void PairingCommand::OnDiscoveredDevice(const chip::Dnssd::DiscoveredNodeData & nodeData)
 {
     // Ignore nodes with closed commissioning window
-    VerifyOrReturn(nodeData.commissionData.commissioningMode != 0);
+    VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
 
     auto & resolutionData = nodeData.resolutionData;
 
diff --git a/examples/chip-tool/commands/pairing/ToTLVCert.cpp b/examples/chip-tool/commands/pairing/ToTLVCert.cpp
index 2c06b7f1629171..3a54d37d1a29e8 100644
--- a/examples/chip-tool/commands/pairing/ToTLVCert.cpp
+++ b/examples/chip-tool/commands/pairing/ToTLVCert.cpp
@@ -21,6 +21,8 @@
 #include <credentials/CHIPCert.h>
 #include <lib/support/Base64.h>
 
+#include <string>
+
 constexpr char kBase64Header[]    = "base64:";
 constexpr size_t kBase64HeaderLen = ArraySize(kBase64Header) - 1;
 
diff --git a/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp b/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp
index c6afc4a4715be5..1a9a7e4e4ab8e4 100644
--- a/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp
+++ b/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp
@@ -24,6 +24,8 @@
 #include <setup_payload/QRCodeSetupPayloadParser.h>
 #include <setup_payload/SetupPayload.h>
 
+#include <string>
+
 using namespace ::chip;
 
 void SetupPayloadGenerateCommand::ConfigurePayload(SetupPayload & payload)
diff --git a/examples/chip-tool/commands/payload/SetupPayloadParseCommand.cpp b/examples/chip-tool/commands/payload/SetupPayloadParseCommand.cpp
index 1bec63002776d4..7ab62c7da5101d 100644
--- a/examples/chip-tool/commands/payload/SetupPayloadParseCommand.cpp
+++ b/examples/chip-tool/commands/payload/SetupPayloadParseCommand.cpp
@@ -22,6 +22,8 @@
 #include <setup_payload/QRCodeSetupPayloadParser.h>
 #include <setup_payload/SetupPayload.h>
 
+#include <string>
+
 using namespace ::chip;
 
 namespace {
diff --git a/examples/chip-tool/commands/payload/SetupPayloadParseCommand.h b/examples/chip-tool/commands/payload/SetupPayloadParseCommand.h
index 08474023a1ff9f..925df0a51f1f00 100644
--- a/examples/chip-tool/commands/payload/SetupPayloadParseCommand.h
+++ b/examples/chip-tool/commands/payload/SetupPayloadParseCommand.h
@@ -21,6 +21,8 @@
 #include "../common/Command.h"
 #include <setup_payload/SetupPayload.h>
 
+#include <string>
+
 class SetupPayloadParseCommand : public Command
 {
 public:
diff --git a/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.cpp b/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.cpp
index 238e753708921c..d0dcc8ffaa8854 100644
--- a/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.cpp
+++ b/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.cpp
@@ -21,6 +21,8 @@
 #include <setup_payload/SetupPayload.h>
 #include <support/verhoeff/Verhoeff.h>
 
+#include <string>
+
 using namespace ::chip;
 
 CHIP_ERROR SetupPayloadVerhoeffVerify::Run()
diff --git a/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.h b/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.h
index 0f531e3dd822bb..bf61ead3589b12 100644
--- a/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.h
+++ b/examples/chip-tool/commands/payload/SetupPayloadVerhoeff.h
@@ -21,6 +21,8 @@
 #include "../common/Command.h"
 #include <setup_payload/SetupPayload.h>
 
+#include <string>
+
 class SetupPayloadVerhoeffVerify : public Command
 {
 public:
diff --git a/examples/common/pigweed/efr32/PigweedLoggerMutex.h b/examples/common/pigweed/efr32/PigweedLoggerMutex.h
index 4df8b616895e39..a60b9a28f30141 100644
--- a/examples/common/pigweed/efr32/PigweedLoggerMutex.h
+++ b/examples/common/pigweed/efr32/PigweedLoggerMutex.h
@@ -20,8 +20,7 @@
 
 #include "PigweedLogger.h"
 #include "pigweed/RpcService.h"
-#include "semphr.h"
-#include <FreeRTOS.h>
+#include <cmsis_os2.h>
 
 namespace chip {
 namespace rpc {
@@ -32,18 +31,18 @@ class PigweedLoggerMutex : public ::chip::rpc::Mutex
     PigweedLoggerMutex() {}
     void Lock() override
     {
-        SemaphoreHandle_t * sem = PigweedLogger::GetSemaphore();
+        osMutexId_t * sem = PigweedLogger::GetMutex();
         if (sem)
         {
-            xSemaphoreTake(*sem, portMAX_DELAY);
+            osMutexAcquire(*sem, osWaitForever);
         }
     }
     void Unlock() override
     {
-        SemaphoreHandle_t * sem = PigweedLogger::GetSemaphore();
+        osMutexId_t * sem = PigweedLogger::GetMutex();
         if (sem)
         {
-            xSemaphoreGive(*sem);
+            osMutexRelease(*sem);
         }
     }
 };
diff --git a/examples/common/pigweed/rpc_services/Attributes.h b/examples/common/pigweed/rpc_services/Attributes.h
index 78e310f70ab5b5..e246c5361bd281 100644
--- a/examples/common/pigweed/rpc_services/Attributes.h
+++ b/examples/common/pigweed/rpc_services/Attributes.h
@@ -25,6 +25,7 @@
 #include <app/InteractionModelEngine.h>
 #include <app/MessageDef/AttributeReportIBs.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/attribute-table.h>
 #include <app/util/ember-compatibility-functions.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVTags.h>
diff --git a/examples/common/pigweed/rpc_services/Descriptor.h b/examples/common/pigweed/rpc_services/Descriptor.h
index 48038831d62301..a6760cdcf61ce3 100644
--- a/examples/common/pigweed/rpc_services/Descriptor.h
+++ b/examples/common/pigweed/rpc_services/Descriptor.h
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app/util/endpoint-config-api.h>
 #include <platform/PlatformManager.h>
 
 namespace chip {
diff --git a/examples/common/screen-framework/ScreenManager.cpp b/examples/common/screen-framework/ScreenManager.cpp
index 0d3525956d3f35..6e2dfe141e03ec 100644
--- a/examples/common/screen-framework/ScreenManager.cpp
+++ b/examples/common/screen-framework/ScreenManager.cpp
@@ -30,6 +30,7 @@
 #include <lib/support/CHIPMem.h>
 
 #include <cassert>
+#include <string>
 #include <vector>
 
 uint16_t ScreenFontHeight;
diff --git a/examples/common/tracing/TraceDecoder.cpp b/examples/common/tracing/TraceDecoder.cpp
index 1d6828b1dfe9b2..115c5d022712af 100644
--- a/examples/common/tracing/TraceDecoder.cpp
+++ b/examples/common/tracing/TraceDecoder.cpp
@@ -25,7 +25,9 @@
 #include <lib/support/BytesToHex.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/StringBuilder.h>
+#include <string>
 #include <transport/raw/MessageHeader.h>
+#include <vector>
 
 constexpr uint16_t kMaxLineLen    = 4096;
 constexpr const char jsonPrefix[] = "    json\t";
diff --git a/examples/common/tracing/TraceDecoder.h b/examples/common/tracing/TraceDecoder.h
index 4630b556e329b7..9a99041578d94b 100644
--- a/examples/common/tracing/TraceDecoder.h
+++ b/examples/common/tracing/TraceDecoder.h
@@ -24,6 +24,8 @@
 #include <json/json.h>
 #include <lib/core/CHIPError.h>
 
+#include <string>
+
 namespace chip {
 namespace trace {
 
diff --git a/examples/common/websocket-server/WebSocketServer.cpp b/examples/common/websocket-server/WebSocketServer.cpp
index 2dba035601ea0e..2f5fb9fd2bd0c9 100644
--- a/examples/common/websocket-server/WebSocketServer.cpp
+++ b/examples/common/websocket-server/WebSocketServer.cpp
@@ -23,6 +23,7 @@
 
 #include <deque>
 #include <mutex>
+#include <string>
 
 constexpr uint16_t kDefaultWebSocketServerPort                 = 9002;
 constexpr uint16_t kMaxMessageBufferLen                        = 8192;
diff --git a/examples/contact-sensor-app/linux/main.cpp b/examples/contact-sensor-app/linux/main.cpp
index 0b520bdd538e04..f1d2889c724377 100644
--- a/examples/contact-sensor-app/linux/main.cpp
+++ b/examples/contact-sensor-app/linux/main.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <AppMain.h>
-#include <app/util/af.h>
 #include <platform/CHIPDeviceConfig.h>
 
 #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED
diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp b/examples/contact-sensor-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
index fafcb37290aab8..2a38dd8d1c84e2 100644
--- a/examples/contact-sensor-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
+++ b/examples/contact-sensor-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
@@ -27,7 +27,6 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/EventLogging.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app;
diff --git a/examples/contact-sensor-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp b/examples/contact-sensor-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
index 5937d134194c30..e69daab9803d23 100644
--- a/examples/contact-sensor-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
+++ b/examples/contact-sensor-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
@@ -28,7 +28,6 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/EventLogging.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 #if CONFIG_DIAG_LOGS_DEMO
 #include "DiagnosticLogsProviderDelegateImpl.h"
diff --git a/examples/contact-sensor-app/telink/CMakeLists.txt b/examples/contact-sensor-app/telink/CMakeLists.txt
index c29ef949914036..fb8098b36fdbee 100755
--- a/examples/contact-sensor-app/telink/CMakeLists.txt
+++ b/examples/contact-sensor-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,60 +13,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-contact-sensor-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-contact-sensor-example)
 
 target_include_directories(app PRIVATE
                            include
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/contact-sensor-app
                            ${TELINK_COMMON}/common/include
-                           ${TELINK_COMMON}/util/include)
+                           ${TELINK_COMMON}/util/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -74,10 +40,15 @@ target_sources(app PRIVATE
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/contact-sensor-app/telink/include/AppConfig.h b/examples/contact-sensor-app/telink/include/AppConfig.h
index feb2b82d7417fc..ecde0f2317eb92 100644
--- a/examples/contact-sensor-app/telink/include/AppConfig.h
+++ b/examples/contact-sensor-app/telink/include/AppConfig.h
@@ -19,11 +19,5 @@
 #pragma once
 
 // ---- All Clusters Application example config ----
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/contact-sensor-app/telink/include/AppTask.h b/examples/contact-sensor-app/telink/include/AppTask.h
index 3ac0028c78e3bb..8d888daa25a6de 100644
--- a/examples/contact-sensor-app/telink/include/AppTask.h
+++ b/examples/contact-sensor-app/telink/include/AppTask.h
@@ -39,6 +39,7 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkLeds(LedManager & ledManager);
 
     static void OnStateChanged(ContactSensorManager::State aState);
 
diff --git a/examples/contact-sensor-app/telink/prj.conf b/examples/contact-sensor-app/telink/prj.conf
index eefe9b944c8331..5eee03e2ce9a39 100755
--- a/examples/contact-sensor-app/telink/prj.conf
+++ b/examples/contact-sensor-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32774 == 0x8006 (example contact-sensor-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
 
diff --git a/examples/contact-sensor-app/telink/src/AppTask.cpp b/examples/contact-sensor-app/telink/src/AppTask.cpp
index dbcf9e1ce48405..8ddb43d7b7f084 100644
--- a/examples/contact-sensor-app/telink/src/AppTask.cpp
+++ b/examples/contact-sensor-app/telink/src/AppTask.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "AppTask.h"
+#include "LEDManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 
@@ -25,25 +26,14 @@
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
-namespace {
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-LEDWidget sContactSensorLED;
-#endif
-} // namespace
-
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(ContactActionEventHandler);
-#endif
     InitCommonParts();
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sContactSensorLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios));
-    sContactSensorLED.Set(ContactSensorMgr().IsContactClosed());
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, ContactSensorMgr().IsContactClosed());
 
     UpdateDeviceState();
 
@@ -60,16 +50,12 @@ void AppTask::OnStateChanged(ContactSensorManager::State aState)
     if (ContactSensorManager::State::kContactClosed == aState)
     {
         LOG_INF("Contact state changed to CLOSED");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sContactSensorLED.Set(true);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, true);
     }
     else if (ContactSensorManager::State::kContactOpened == aState)
     {
         LOG_INF("Contact state changed to OPEN");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sContactSensorLED.Set(false);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, false);
     }
 
     if (sAppTask.IsSyncClusterToButtonAction())
@@ -155,8 +141,15 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg)
     /* get boolean state attribute value */
     (void) app::Clusters::BooleanState::Attributes::StateValue::Get(1, &stateValueAttrValue);
 
-    ChipLogProgress(NotSpecified, "StateValue::Get : %d", stateValueAttrValue);
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, stateValueAttrValue);
+}
+
+void AppTask::LinkLeds(LedManager & ledManager)
+{
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sContactSensorLED.Set(stateValueAttrValue);
-#endif
+    ledManager.linkLed(LedManager::EAppLed_Status, 0);
+    ledManager.linkLed(LedManager::EAppLed_App0, 1);
+#else
+    ledManager.linkLed(LedManager::EAppLed_App0, 0);
+#endif // CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
 }
diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
index 205b56d6a64e3d..bb232e3772135e 100644
--- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
+++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
@@ -26,6 +26,9 @@
 
 #include "MTRError_Utils.h"
 
+#include <map>
+#include <string>
+
 static CHIPToolPersistentStorageDelegate * storage = nil;
 std::set<CHIPCommandBridge *> CHIPCommandBridge::sDeferredCleanups;
 std::map<std::string, MTRDeviceController *> CHIPCommandBridge::mControllers;
diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
index 2219b6231e63bc..2652e2c2364101 100644
--- a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
+++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm
@@ -22,6 +22,8 @@
 #include <logging/logging.h>
 #include <platform/logging/LogV.h>
 
+#include <string>
+
 #include <editline.h>
 #include <stdlib.h>
 
diff --git a/examples/dishwasher-app/asr/src/AppTask.cpp b/examples/dishwasher-app/asr/src/AppTask.cpp
index 8e9cb88b8f5b34..8c038cfe3674e9 100644
--- a/examples/dishwasher-app/asr/src/AppTask.cpp
+++ b/examples/dishwasher-app/asr/src/AppTask.cpp
@@ -23,6 +23,7 @@
 #include "qrcodegen.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
diff --git a/examples/dishwasher-app/asr/src/DeviceCallbacks.cpp b/examples/dishwasher-app/asr/src/DeviceCallbacks.cpp
index 23e6de9a118b03..9f9e7fd8d3e0e4 100644
--- a/examples/dishwasher-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/dishwasher-app/asr/src/DeviceCallbacks.cpp
@@ -31,7 +31,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h b/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h
index 973e1e622576a4..a61be0f3c1770c 100644
--- a/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h
+++ b/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h
@@ -20,7 +20,6 @@
 
 #include "app/clusters/device-energy-management-server/device-energy-management-server.h"
 
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h b/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h
index e6f5c8c324d91e..df0d08b76f7e4e 100644
--- a/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h
+++ b/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h
@@ -21,7 +21,6 @@
 #include "app/clusters/energy-evse-server/energy-evse-server.h"
 #include <EVSECallbacks.h>
 
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/energy-management-app/energy-management-common/include/device-energy-management-modes.h b/examples/energy-management-app/energy-management-common/include/device-energy-management-modes.h
index 75d1a66fcb0f37..61c65892910ef9 100644
--- a/examples/energy-management-app/energy-management-common/include/device-energy-management-modes.h
+++ b/examples/energy-management-app/energy-management-common/include/device-energy-management-modes.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/energy-management-app/energy-management-common/include/energy-evse-modes.h b/examples/energy-management-app/energy-management-common/include/energy-evse-modes.h
index 97189b0069fa81..0e8fd42e21c6f7 100644
--- a/examples/energy-management-app/energy-management-common/include/energy-evse-modes.h
+++ b/examples/energy-management-app/energy-management-common/include/energy-evse-modes.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/laundry-washer-app/nxp/common/main/ZclCallbacks.cpp b/examples/laundry-washer-app/nxp/common/main/ZclCallbacks.cpp
index 0a26df6424b771..7602ab4d52ac21 100644
--- a/examples/laundry-washer-app/nxp/common/main/ZclCallbacks.cpp
+++ b/examples/laundry-washer-app/nxp/common/main/ZclCallbacks.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 #include "laundry-washer-controls-delegate-impl.h"
 
diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md
index bc7953a87f8da2..5af9d94f2c5983 100644
--- a/examples/light-switch-app/ameba/README.md
+++ b/examples/light-switch-app/ameba/README.md
@@ -26,11 +26,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:42
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
 
 -   Setup build environment:
 
diff --git a/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp b/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp
index 8463ccce3ada74..119fb710e5873e 100644
--- a/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp
@@ -28,7 +28,6 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/light-switch-app/ameba/main/chipinterface.cpp b/examples/light-switch-app/ameba/main/chipinterface.cpp
index 98bf21626b87a1..c141769ba7d483 100644
--- a/examples/light-switch-app/ameba/main/chipinterface.cpp
+++ b/examples/light-switch-app/ameba/main/chipinterface.cpp
@@ -30,7 +30,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/core/ErrorStr.h>
 #include <platform/Ameba/AmebaConfig.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
diff --git a/examples/light-switch-app/asr/src/AppTask.cpp b/examples/light-switch-app/asr/src/AppTask.cpp
index f398b3496edd0c..6dcabc80a9e91c 100755
--- a/examples/light-switch-app/asr/src/AppTask.cpp
+++ b/examples/light-switch-app/asr/src/AppTask.cpp
@@ -33,6 +33,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
diff --git a/examples/light-switch-app/asr/src/DeviceCallbacks.cpp b/examples/light-switch-app/asr/src/DeviceCallbacks.cpp
index e967094e0fbccd..80d2893d09aa72 100644
--- a/examples/light-switch-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/light-switch-app/asr/src/DeviceCallbacks.cpp
@@ -31,7 +31,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/light-switch-app/silabs/openthread.gni b/examples/light-switch-app/silabs/openthread.gni
index 17cc5885460379..30c7efbde3d623 100644
--- a/examples/light-switch-app/silabs/openthread.gni
+++ b/examples/light-switch-app/silabs/openthread.gni
@@ -28,7 +28,7 @@ openthread_external_platform =
 # ICD Default configurations
 chip_enable_icd_server = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
 sl_ot_idle_interval_ms = 15000  # 15s Idle Intervals
diff --git a/examples/light-switch-app/telink/CMakeLists.txt b/examples/light-switch-app/telink/CMakeLists.txt
index 451727b9fe20ae..7b98b235ea66e1 100755
--- a/examples/light-switch-app/telink/CMakeLists.txt
+++ b/examples/light-switch-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-light-switch-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-light-switch-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,7 +32,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/light-switch-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -75,10 +41,15 @@ target_sources(app PRIVATE
                src/binding-handler.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
@@ -89,155 +60,6 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
   target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp)
 endif()
 
-# Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70
-add_compile_options(-Wno-error=unused-parameter)
-
 if (CONFIG_CHIP_PW_RPC)
-
-# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
-link_libraries($<BUILD_INTERFACE:zephyr_interface>)
-
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-
-include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-include($ENV{PW_ROOT}/pw_log/backend.cmake)
-include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
-
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.telink)
-
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/telink/pw_sys_io)
-
-pw_proto_library(attributes_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
-  PREFIX
-    attributes_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(button_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
-  PREFIX
-    button_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(descriptor_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
-  PREFIX
-    descriptor_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(device_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
-  PREFIX
-    device_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(lighting_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    lighting_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(ot_cli_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    ot_cli_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(thread_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    thread_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-target_sources(app PRIVATE
-  ../../common/pigweed/RpcService.cpp
-  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
-  ${TELINK_COMMON}/Rpc.cpp
-  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
-)
-
-target_include_directories(app PRIVATE
-  ${PIGWEED_ROOT}/pw_sys_io/public
-  ${CHIP_ROOT}/src/lib/support
-  ${CHIP_ROOT}/src/system
-  ${TELINK_COMMON}
-  ../../common
-  ../../common/pigweed
-  ../../common/pigweed/telink)
-
-target_compile_options(app PRIVATE
-                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
-                       "-DPW_RPC_BUTTON_SERVICE=1"
-                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
-                       "-DPW_RPC_DEVICE_SERVICE=1"
-                       "-DPW_RPC_LIGHTING_SERVICE=1"
-                       "-DPW_RPC_THREAD_SERVICE=1")
-
-target_link_libraries(app PRIVATE
-  attributes_service.nanopb_rpc
-  button_service.nanopb_rpc
-  descriptor_service.nanopb_rpc
-  device_service.nanopb_rpc
-  lighting_service.nanopb_rpc
-  thread_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_log
-  pw_rpc.server
-  pw_sys_io
-)
-
+  include(${TELINK_COMMON}/Rpc.cmake)
 endif(CONFIG_CHIP_PW_RPC)
diff --git a/examples/light-switch-app/telink/include/AppConfig.h b/examples/light-switch-app/telink/include/AppConfig.h
index 8258f39573039c..15715b0e8a0a27 100644
--- a/examples/light-switch-app/telink/include/AppConfig.h
+++ b/examples/light-switch-app/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- Light Switch Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
index ebb196bb76980f..99691f0ab11fdb 100755
--- a/examples/light-switch-app/telink/prj.conf
+++ b/examples/light-switch-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32772 == 0x8004 (example light-switch-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32772
 
diff --git a/examples/light-switch-app/telink/src/AppTask.cpp b/examples/light-switch-app/telink/src/AppTask.cpp
index 39b92cca42519d..96dcdd0b43ca48 100644
--- a/examples/light-switch-app/telink/src/AppTask.cpp
+++ b/examples/light-switch-app/telink/src/AppTask.cpp
@@ -25,9 +25,7 @@ AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(SwitchActionEventHandler);
-#endif
     InitCommonParts();
 
     // Configure Bindings
diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
index 44bc04a0811dc4..b496e1cde4ae91 100644
--- a/examples/lighting-app/ameba/README.md
+++ b/examples/lighting-app/ameba/README.md
@@ -23,11 +23,11 @@ The CHIP demo application is supported on
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:42
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
 
 -   Setup build environment:
 
diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
index 0ba785b9b9233e..7783e6818f5668 100644
--- a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/lighting-app/ameba/main/chipinterface.cpp b/examples/lighting-app/ameba/main/chipinterface.cpp
index 1f05a9edb5b58e..461b8bea6143f6 100644
--- a/examples/lighting-app/ameba/main/chipinterface.cpp
+++ b/examples/lighting-app/ameba/main/chipinterface.cpp
@@ -31,7 +31,7 @@
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/core/ErrorStr.h>
 #include <platform/Ameba/AmebaConfig.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
diff --git a/examples/lighting-app/asr/src/AppTask.cpp b/examples/lighting-app/asr/src/AppTask.cpp
index b72ff5c8588f31..9bbd40af01a3a7 100755
--- a/examples/lighting-app/asr/src/AppTask.cpp
+++ b/examples/lighting-app/asr/src/AppTask.cpp
@@ -25,6 +25,7 @@
 #include "qrcodegen.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
diff --git a/examples/lighting-app/asr/src/DeviceCallbacks.cpp b/examples/lighting-app/asr/src/DeviceCallbacks.cpp
index f486aba1f5d9e0..10dc52e7c22025 100644
--- a/examples/lighting-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/lighting-app/asr/src/DeviceCallbacks.cpp
@@ -32,7 +32,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/lighting-app/beken/main/DeviceCallbacks.cpp b/examples/lighting-app/beken/main/DeviceCallbacks.cpp
index f2e5b099700d91..48b715feb76faf 100644
--- a/examples/lighting-app/beken/main/DeviceCallbacks.cpp
+++ b/examples/lighting-app/beken/main/DeviceCallbacks.cpp
@@ -30,7 +30,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/.gn b/examples/lighting-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  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/BUILD.gn b/examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 1292b5f5e9626c..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/lighting-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-  public_configs = [ ":lighting_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("lighting_app") {
-  output_name = "chip-${ti_simplelink_board}-lighting-example.out"
-
-  sources = [
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/src/AppTask.cpp",
-    "${project_dir}/src/LightingManager.cpp",
-    "${project_dir}/src/ZclCallbacks.cpp",
-    "${project_dir}/src/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/lighting-app/lighting-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":lighting_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index f6d77a423ac37a..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,297 +0,0 @@
-# Matter Lighting Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Lighting Example Application](#matter-lighting-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [Running the Example](#running-the-example)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX lighting example application provides a working demonstration of
-a connected light device. This uses the open-source Matter implementation and
-the Texas Instruments SimpleLink™ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The lighting example is intended to serve both as a means to explore the
-workings of Matter, as well as a template for creating real products based on
-the Texas Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | Light is turned on                     |
-| Left Button (`BTN-1`) Press (more than 1000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Light is turned off                    |
-| Right Button (`BTN-2`) Press (more than 1000 ms) | BLE Advertisement (Enable/Disable)     |
-| Red LED Solid On State                           | Light is turned on                     |
-| Red LED Off State                                | Light is turned off                    |
-| Green LED Blinking State                         | Identify Trigger Effect in progress    |
-| Green LED Off State                              | No Identify Trigger Effect in progress |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the lighting device onto the
-network and control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the light device onto the Matter network. Run the following command
-on the CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-2`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2**
-
-Send commands to the lighting app. Here are some example commands:
-
-On
-
-```
-./chip-tool onoff on <nodeID> 1
-./chip-tool onoff toggee <nodeID> 1 (assuming the light is off)
-
-```
-
-Off
-
-```
-./chip-tool onoff off <nodeID> 1
-./chip-tool onoff toggle <nodeID> 1 (assuming the light is on)
-
-```
-
-Identify
-
-```
-./chip-tool identify identify <IdentifyTime> <nodeID> 1   e.g.  ./chip-tool identify identify 100 1 1
-
-./chip-tool identify trigger-effect <EffectIdentifier> <EffectVariant> <nodeID> <endpointID>  e.g.  ./chip-tool identify trigger-effect 0x0000 0 1 1
-
-```
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/args.gni b/examples/lighting-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 8f2c82446b1cf0..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-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_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8005"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/build_overrides b/examples/lighting-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg b/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 88e08c63321770..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h
deleted file mode 100644
index a818b21d641875..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#define ACTUATOR_MOVEMENT_PERIOD_MS 1000
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h
deleted file mode 100644
index 9c55e1bf674531..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-        kEventType_Light,
-        kEventType_Timer,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventIdentifyType
-    {
-        kAppEventIdentifyType_Blink = 0,
-        kAppEventIdentifyType_Breathe,
-        kAppEventIdentifyType_Okay,
-        kAppEventIdentifyType_Finish,
-        kAppEventIdentifyType_Stop,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } TimerEvent;
-
-        struct
-        {
-            uint8_t Action;
-            int32_t Actor;
-            void * Context;
-        } LightEvent;
-
-        struct
-        {
-            enum AppEventIdentifyType Type;
-        } IdentifyEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp
deleted file mode 100644
index 7d84e656927d09..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/clusters/on-off-server/on-off-server.h>
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-#include <app/util/attribute-storage.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-#define IDENTIFY_TRIGGER_EFFECT_BLINK 0
-#define IDENTIFY_TRIGGER_EFFECT_BREATHE 1
-#define IDENTIFY_TRIGGER_EFFECT_OKAY 2
-#define IDENTIFY_TRIGGER_EFFECT_FINISH_STOP 3
-
-static uint32_t identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-
-#define LIGHTING_APPLICATION_IDENTIFY_ENDPOINT 1
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-::Identify stIdentify = { LIGHTING_APPLICATION_IDENTIFY_ENDPOINT, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (1)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (1)
-            ;
-    }
-    return ret;
-}
-
-// Action initiated callback
-void uiTurnOn(void)
-{
-    PLAT_LOG("Light On initiated");
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-// Action completed callback
-void uiTurnedOn(void)
-{
-    PLAT_LOG("Light On completed");
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-}
-
-// Action initiated callback
-void uiTurnOff(void)
-{
-    PLAT_LOG("Light Off initiated");
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-// Action completed callback
-void uiTurnedOff(void)
-{
-    PLAT_LOG("Light Off completed");
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOff(sAppRedHandle);
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (1)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (1)
-            ;
-    }
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (1)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (1)
-            ;
-    }
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    ret = LightMgr().Init();
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("LightMgr().Init() failed");
-        while (1)
-            ;
-    }
-
-    LightMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (1)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
-{
-    if (aAction == LightingManager::ON_ACTION)
-    {
-        uiTurnOn();
-    }
-    else if (aAction == LightingManager::OFF_ACTION)
-    {
-        uiTurnOff();
-    }
-}
-
-void AppTask::ActionCompleted(LightingManager::Action_t aAction)
-{
-    if (aAction == LightingManager::ON_ACTION)
-    {
-        uiTurnedOn();
-    }
-    else if (aAction == LightingManager::OFF_ACTION)
-    {
-        uiTurnedOff();
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (sAppEventQueue != NULL)
-    {
-        BaseType_t status;
-        if (xPortIsInsideInterrupt())
-        {
-            BaseType_t higherPrioTaskWoken = pdFALSE;
-            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
-
-#ifdef portYIELD_FROM_ISR
-            portYIELD_FROM_ISR(higherPrioTaskWoken);
-#elif portEND_SWITCHING_ISR // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-            portEND_SWITCHING_ISR(higherPrioTaskWoken);
-#else                       // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-#error "Must have portYIELD_FROM_ISR or portEND_SWITCHING_ISR"
-#endif // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-        }
-        else
-        {
-            status = xQueueSend(sAppEventQueue, aEvent, 1);
-        }
-
-        if (status != pdTRUE)
-        {
-            PLAT_LOG("Failed to post event to app task event queue");
-        }
-    }
-    else
-    {
-        PLAT_LOG("Event Queue is NULL should never happen");
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    int32_t actor;
-
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_Light: {
-        actor = aEvent->LightEvent.Actor;
-        LightMgr().IsLightOn() ? LightMgr().InitiateAction(actor, LightingManager::OFF_ACTION)
-                               : LightMgr().InitiateAction(actor, LightingManager::ON_ACTION);
-    }
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            actor = AppEvent::kEventType_ButtonLeft;
-            LightMgr().InitiateAction(actor, LightingManager::ON_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            actor = AppEvent::kEventType_ButtonRight;
-            LightMgr().InitiateAction(actor, LightingManager::OFF_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        switch (identify_trigger_effect)
-        {
-        case IDENTIFY_TRIGGER_EFFECT_BLINK:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 1000, LED_BLINK_FOREVER);
-            break;
-        case IDENTIFY_TRIGGER_EFFECT_BREATHE:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 100, LED_BLINK_FOREVER);
-            break;
-        case IDENTIFY_TRIGGER_EFFECT_OKAY:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 500, LED_BLINK_FOREVER);
-            break;
-        default:
-            break;
-        }
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_BLINK;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Starting breathe identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_BREATHE;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Starting okay identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_OKAY;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-        IdentifyStopHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h
deleted file mode 100644
index c82a122fef4ea8..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "LightingManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-// Application-defined error codes in the CHIP_ERROR space.
-#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
-#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
-#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
-#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
-#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
-#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
-#define APP_ERROR_ALLOCATION_FAILED CHIP_APPLICATION_ERROR(0x07)
-struct Identify;
-
-class AppTask
-{
-
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    static AppTask & GetAppTask() { return sAppTask; }
-
-    void PostLightActionRequest(int32_t aActor, LightingManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(LightingManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(LightingManager::Action_t aAction);
-
-    void DispatchEvent(AppEvent * event);
-    static void UpdateClusterState(intptr_t context);
-    static void SingleButtonEventHandler(AppEvent * aEvent);
-    static void ButtonTimerEventHandler(AppEvent * aEvent);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp
deleted file mode 100644
index ed5fc52e7e5638..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "LightingManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include <FreeRTOS.h>
-
-using namespace chip;
-using namespace ::chip::DeviceLayer;
-
-LightingManager LightingManager::sLight;
-
-TimerHandle_t sLightTimer;
-
-CHIP_ERROR LightingManager::Init()
-{
-    // Create FreeRTOS sw timer for light timer.
-    sLightTimer = xTimerCreate("lightTmr",       // Just a text name, not used by the RTOS kernel
-                               1,                // == default timer period (mS)
-                               false,            // no timer reload (==one-shot)
-                               (void *) this,    // init timer id = light obj context
-                               TimerEventHandler // timer callback handler
-    );
-
-    if (sLightTimer == NULL)
-    {
-        PLAT_LOG("sLightTimer timer create failed");
-    }
-
-    bool currentLedState;
-    // read current on/off value on endpoint one.
-    OnOffServer::Instance().getOnOffValue(1, &currentLedState);
-
-    mState = currentLedState ? kState_OnCompleted : kState_OffCompleted;
-
-    return CHIP_NO_ERROR;
-}
-
-void LightingManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool LightingManager::IsActionInProgress()
-{
-    return (mState == kState_OffInitiated || mState == kState_OnInitiated);
-}
-
-bool LightingManager::IsLightOn()
-{
-    return (mState == kState_OnCompleted);
-}
-
-bool LightingManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Turn On/Off Action only when the previous one is complete.
-    if (mState == kState_OffCompleted && aAction == ON_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_OnInitiated;
-    }
-    else if (mState == kState_OnCompleted && aAction == OFF_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_OffInitiated;
-    }
-
-    if (action_initiated)
-    {
-        StartTimer(ACTUATOR_MOVEMENT_PERIOD_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void LightingManager::StartTimer(uint32_t aTimeoutMs)
-{
-    if (xTimerIsTimerActive(sLightTimer))
-    {
-        PLAT_LOG("app timer already started!");
-        CancelTimer();
-    }
-
-    // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
-    // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLightTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
-    {
-        PLAT_LOG("sLightTimer timer start() failed");
-    }
-}
-
-void LightingManager::CancelTimer(void)
-{
-    if (xTimerStop(sLightTimer, 0) == pdFAIL)
-    {
-        PLAT_LOG("sLightTimer stop() failed");
-    }
-}
-
-void LightingManager::TimerEventHandler(TimerHandle_t xTimer)
-{
-    // Get light obj context from timer id.
-    LightingManager * light = static_cast<LightingManager *>(pvTimerGetTimerID(xTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sLightTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type               = AppEvent::kEventType_AppEvent;
-    event.LightEvent.Context = light;
-
-    event.Handler = ActuatorMovementTimerEventHandler;
-
-    AppTask::GetAppTask().PostEvent(&event);
-}
-
-void LightingManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    LightingManager * light = static_cast<LightingManager *>(aEvent->LightEvent.Context);
-
-    if (light->mState == kState_OffInitiated)
-    {
-        light->mState   = kState_OffCompleted;
-        actionCompleted = OFF_ACTION;
-        OnOffServer::Instance().setOnOffValue(1, 0, false);
-    }
-    else if (light->mState == kState_OnInitiated)
-    {
-        light->mState   = kState_OnCompleted;
-        actionCompleted = ON_ACTION;
-        OnOffServer::Instance().setOnOffValue(1, 1, false);
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (light->mActionCompleted_CB)
-        {
-            light->mActionCompleted_CB(actionCompleted);
-        }
-    }
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h b/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h
deleted file mode 100644
index 818feed45ee87a..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-#include "timers.h" // provides FreeRTOS timer support
-#include <app/clusters/on-off-server/on-off-server.h>
-
-#include <lib/core/CHIPError.h>
-
-class LightingManager
-{
-public:
-    enum Action_t
-    {
-        ON_ACTION = 0,
-        OFF_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_OffInitiated = 0,
-        kState_OffCompleted,
-        kState_OnInitiated,
-        kState_OnCompleted,
-    } State;
-
-    CHIP_ERROR Init();
-    bool IsLightOn();
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-    static void OnTriggerOffWithEffect(OnOffEffect * effect);
-
-private:
-    friend LightingManager & LightMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    void CancelTimer(void);
-    void StartTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t xTimer);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-    static void OffEffectTimerEventHandler(AppEvent * aEvent);
-
-    static LightingManager sLight;
-};
-
-inline LightingManager & LightMgr(void)
-{
-    return LightingManager::sLight;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
deleted file mode 100644
index 7bb20a45944545..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "LightingManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-
-    if (clusterId == OnOff::Id && attributeId == OnOff::Attributes::OnOff::Id)
-    {
-        LightMgr().InitiateAction(AppEvent::kEventType_Light, *value ? LightingManager::ON_ACTION : LightingManager::OFF_ACTION);
-    }
-    else if (clusterId == Identify::Id)
-    {
-        ChipLogProgress(Zcl, "Identify attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
-                        ChipLogValueMEI(attributeId), type, *value, size);
-    }
-    else if (clusterId == Groups::Id)
-    {
-        ChipLogProgress(Zcl, "Groups attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
-                        ChipLogValueMEI(attributeId), type, *value, size);
-    }
-}
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp
deleted file mode 100644
index 4fdb88703acab6..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc600)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (1)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (1)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (1)
-        ;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp b/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
index b869ba5ae61fbb..2027bbf0883ef4 100644
--- a/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
@@ -25,6 +25,8 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 using namespace ::chip;
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
diff --git a/examples/lighting-app/esp32/main/QRCodeScreen.cpp b/examples/lighting-app/esp32/main/QRCodeScreen.cpp
index d4113c4d0889b9..a75c29e9170d06 100644
--- a/examples/lighting-app/esp32/main/QRCodeScreen.cpp
+++ b/examples/lighting-app/esp32/main/QRCodeScreen.cpp
@@ -42,6 +42,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 namespace {
 
 constexpr int kVersion    = 4;
diff --git a/examples/lighting-app/esp32/main/StatusScreen.cpp b/examples/lighting-app/esp32/main/StatusScreen.cpp
index 698a12d835ce06..b97da9d671af7e 100644
--- a/examples/lighting-app/esp32/main/StatusScreen.cpp
+++ b/examples/lighting-app/esp32/main/StatusScreen.cpp
@@ -45,6 +45,8 @@
 #include <app/server/Server.h>
 #include <lib/core/DataModelTypes.h>
 
+#include <string>
+
 #define MAX_LENGTH_SMALL_FONT 30
 
 using namespace chip;
diff --git a/examples/lighting-app/esp32/main/include/QRCodeScreen.h b/examples/lighting-app/esp32/main/include/QRCodeScreen.h
index 3479c7d0256103..e6eb45d6ca2251 100644
--- a/examples/lighting-app/esp32/main/include/QRCodeScreen.h
+++ b/examples/lighting-app/esp32/main/include/QRCodeScreen.h
@@ -25,6 +25,7 @@
 #include "ScreenManager.h"
 
 #include <cstdint>
+#include <string>
 #include <vector>
 
 class QRCodeScreen : public Screen
diff --git a/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp
index 3d750b9446ea11..a121801134a24c 100644
--- a/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp
+++ b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp
@@ -19,7 +19,6 @@
 
 #include "LightingManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <stdio.h>
 
diff --git a/examples/lighting-app/linux/LightingAppCommandDelegate.cpp b/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
index 61946938e294c0..cc5af976eb8b1a 100644
--- a/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
+++ b/examples/lighting-app/linux/LightingAppCommandDelegate.cpp
@@ -24,8 +24,11 @@
 #include <app/clusters/switch-server/switch-server.h>
 #include <app/server/Server.h>
 #include <app/util/att-storage.h>
+#include <app/util/attribute-storage.h>
 #include <platform/PlatformManager.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp
index 149898bf86360f..56cafc2e527509 100644
--- a/examples/lighting-app/linux/main.cpp
+++ b/examples/lighting-app/linux/main.cpp
@@ -26,6 +26,8 @@
 #include <app/server/Server.h>
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <string>
+
 #if defined(CHIP_IMGUI_ENABLED) && CHIP_IMGUI_ENABLED
 #include <imgui_ui/ui.h>
 #include <imgui_ui/windows/light.h>
diff --git a/examples/lighting-app/nxp/k32w/k32w0/BUILD.gn b/examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
index 43a9860b5da48a..322c728a063ba7 100644
--- a/examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
+++ b/examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
@@ -112,6 +112,7 @@ k32w0_executable("light_app") {
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/lighting-app/nxp/zap/",
     "${chip_root}/examples/providers:device_info_provider",
+    "${chip_root}/src/app:test-event-trigger",
     "${chip_root}/src/lib",
     "${chip_root}/src/platform:syscalls_stub",
     "${chip_root}/third_party/mbedtls:mbedtls",
diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
index 5a4eee6e2c09e4..caccdf51b0665b 100644
--- a/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
+++ b/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters;
diff --git a/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp
index 96f5a5b96b3248..4c1d0875470ee4 100644
--- a/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp
+++ b/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp
@@ -236,7 +236,7 @@ void AppTask::InitServer(intptr_t arg)
 #endif
 
 #if defined(USE_SMU2_DYNAMIC)
-    VerifyOrDie(SMU2::Init(initParams.persistentStorageDelegate) == CHIP_NO_ERROR);
+    VerifyOrDie(SMU2::Init() == CHIP_NO_ERROR);
 #endif
 
     // Init ZCL Data Model and start server
diff --git a/examples/lighting-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp b/examples/lighting-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
index a9c6aee8798c49..97a3fb9aa72a98 100644
--- a/examples/lighting-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
+++ b/examples/lighting-app/nxp/k32w/k32w1/main/ZclCallbacks.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters;
diff --git a/examples/lighting-app/silabs/build_for_wifi_args.gni b/examples/lighting-app/silabs/build_for_wifi_args.gni
index bbb57ae35a4343..7e33551c30a97c 100644
--- a/examples/lighting-app/silabs/build_for_wifi_args.gni
+++ b/examples/lighting-app/silabs/build_for_wifi_args.gni
@@ -18,6 +18,9 @@ silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 chip_enable_openthread = false
 import("${chip_root}/src/platform/silabs/wifi_args.gni")
 
+# Not needed for the Lighting-app
+chip_enable_read_client = false
+
 chip_enable_ota_requestor = true
 app_data_model =
     "${chip_root}/examples/lighting-app/silabs/data_model:silabs-lighting"
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
index 415281989cae5d..0cb630900c3ddf 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -745,265 +745,6 @@ cluster TimeFormatLocalization = 44 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
-cluster PowerSource = 47 {
-  revision 1; // NOTE: Default/not specifically set
-
-  enum BatApprovedChemistryEnum : enum16 {
-    kUnspecified = 0;
-    kAlkaline = 1;
-    kLithiumCarbonFluoride = 2;
-    kLithiumChromiumOxide = 3;
-    kLithiumCopperOxide = 4;
-    kLithiumIronDisulfide = 5;
-    kLithiumManganeseDioxide = 6;
-    kLithiumThionylChloride = 7;
-    kMagnesium = 8;
-    kMercuryOxide = 9;
-    kNickelOxyhydride = 10;
-    kSilverOxide = 11;
-    kZincAir = 12;
-    kZincCarbon = 13;
-    kZincChloride = 14;
-    kZincManganeseDioxide = 15;
-    kLeadAcid = 16;
-    kLithiumCobaltOxide = 17;
-    kLithiumIon = 18;
-    kLithiumIonPolymer = 19;
-    kLithiumIronPhosphate = 20;
-    kLithiumSulfur = 21;
-    kLithiumTitanate = 22;
-    kNickelCadmium = 23;
-    kNickelHydrogen = 24;
-    kNickelIron = 25;
-    kNickelMetalHydride = 26;
-    kNickelZinc = 27;
-    kSilverZinc = 28;
-    kSodiumIon = 29;
-    kSodiumSulfur = 30;
-    kZincBromide = 31;
-    kZincCerium = 32;
-  }
-
-  enum BatChargeFaultEnum : enum8 {
-    kUnspecified = 0;
-    kAmbientTooHot = 1;
-    kAmbientTooCold = 2;
-    kBatteryTooHot = 3;
-    kBatteryTooCold = 4;
-    kBatteryAbsent = 5;
-    kBatteryOverVoltage = 6;
-    kBatteryUnderVoltage = 7;
-    kChargerOverVoltage = 8;
-    kChargerUnderVoltage = 9;
-    kSafetyTimeout = 10;
-  }
-
-  enum BatChargeLevelEnum : enum8 {
-    kOK = 0;
-    kWarning = 1;
-    kCritical = 2;
-  }
-
-  enum BatChargeStateEnum : enum8 {
-    kUnknown = 0;
-    kIsCharging = 1;
-    kIsAtFullCharge = 2;
-    kIsNotCharging = 3;
-  }
-
-  enum BatCommonDesignationEnum : enum16 {
-    kUnspecified = 0;
-    kAAA = 1;
-    kAA = 2;
-    kC = 3;
-    kD = 4;
-    k4v5 = 5;
-    k6v0 = 6;
-    k9v0 = 7;
-    k12AA = 8;
-    kAAAA = 9;
-    kA = 10;
-    kB = 11;
-    kF = 12;
-    kN = 13;
-    kNo6 = 14;
-    kSubC = 15;
-    kA23 = 16;
-    kA27 = 17;
-    kBA5800 = 18;
-    kDuplex = 19;
-    k4SR44 = 20;
-    k523 = 21;
-    k531 = 22;
-    k15v0 = 23;
-    k22v5 = 24;
-    k30v0 = 25;
-    k45v0 = 26;
-    k67v5 = 27;
-    kJ = 28;
-    kCR123A = 29;
-    kCR2 = 30;
-    k2CR5 = 31;
-    kCRP2 = 32;
-    kCRV3 = 33;
-    kSR41 = 34;
-    kSR43 = 35;
-    kSR44 = 36;
-    kSR45 = 37;
-    kSR48 = 38;
-    kSR54 = 39;
-    kSR55 = 40;
-    kSR57 = 41;
-    kSR58 = 42;
-    kSR59 = 43;
-    kSR60 = 44;
-    kSR63 = 45;
-    kSR64 = 46;
-    kSR65 = 47;
-    kSR66 = 48;
-    kSR67 = 49;
-    kSR68 = 50;
-    kSR69 = 51;
-    kSR516 = 52;
-    kSR731 = 53;
-    kSR712 = 54;
-    kLR932 = 55;
-    kA5 = 56;
-    kA10 = 57;
-    kA13 = 58;
-    kA312 = 59;
-    kA675 = 60;
-    kAC41E = 61;
-    k10180 = 62;
-    k10280 = 63;
-    k10440 = 64;
-    k14250 = 65;
-    k14430 = 66;
-    k14500 = 67;
-    k14650 = 68;
-    k15270 = 69;
-    k16340 = 70;
-    kRCR123A = 71;
-    k17500 = 72;
-    k17670 = 73;
-    k18350 = 74;
-    k18500 = 75;
-    k18650 = 76;
-    k19670 = 77;
-    k25500 = 78;
-    k26650 = 79;
-    k32600 = 80;
-  }
-
-  enum BatFaultEnum : enum8 {
-    kUnspecified = 0;
-    kOverTemp = 1;
-    kUnderTemp = 2;
-  }
-
-  enum BatReplaceabilityEnum : enum8 {
-    kUnspecified = 0;
-    kNotReplaceable = 1;
-    kUserReplaceable = 2;
-    kFactoryReplaceable = 3;
-  }
-
-  enum PowerSourceStatusEnum : enum8 {
-    kUnspecified = 0;
-    kActive = 1;
-    kStandby = 2;
-    kUnavailable = 3;
-  }
-
-  enum WiredCurrentTypeEnum : enum8 {
-    kAC = 0;
-    kDC = 1;
-  }
-
-  enum WiredFaultEnum : enum8 {
-    kUnspecified = 0;
-    kOverVoltage = 1;
-    kUnderVoltage = 2;
-  }
-
-  bitmap Feature : bitmap32 {
-    kWired = 0x1;
-    kBattery = 0x2;
-    kRechargeable = 0x4;
-    kReplaceable = 0x8;
-  }
-
-  struct BatChargeFaultChangeType {
-    BatChargeFaultEnum current[] = 0;
-    BatChargeFaultEnum previous[] = 1;
-  }
-
-  struct BatFaultChangeType {
-    BatFaultEnum current[] = 0;
-    BatFaultEnum previous[] = 1;
-  }
-
-  struct WiredFaultChangeType {
-    WiredFaultEnum current[] = 0;
-    WiredFaultEnum previous[] = 1;
-  }
-
-  info event WiredFaultChange = 0 {
-    WiredFaultEnum current[] = 0;
-    WiredFaultEnum previous[] = 1;
-  }
-
-  info event BatFaultChange = 1 {
-    BatFaultEnum current[] = 0;
-    BatFaultEnum previous[] = 1;
-  }
-
-  info event BatChargeFaultChange = 2 {
-    BatChargeFaultEnum current[] = 0;
-    BatChargeFaultEnum previous[] = 1;
-  }
-
-  readonly attribute PowerSourceStatusEnum status = 0;
-  readonly attribute int8u order = 1;
-  readonly attribute char_string<60> description = 2;
-  readonly attribute optional nullable int32u wiredAssessedInputVoltage = 3;
-  readonly attribute optional nullable int16u wiredAssessedInputFrequency = 4;
-  readonly attribute optional WiredCurrentTypeEnum wiredCurrentType = 5;
-  readonly attribute optional nullable int32u wiredAssessedCurrent = 6;
-  readonly attribute optional int32u wiredNominalVoltage = 7;
-  readonly attribute optional int32u wiredMaximumCurrent = 8;
-  readonly attribute optional boolean wiredPresent = 9;
-  readonly attribute optional WiredFaultEnum activeWiredFaults[] = 10;
-  readonly attribute optional nullable int32u batVoltage = 11;
-  readonly attribute optional nullable int8u batPercentRemaining = 12;
-  readonly attribute optional nullable int32u batTimeRemaining = 13;
-  readonly attribute optional BatChargeLevelEnum batChargeLevel = 14;
-  readonly attribute optional boolean batReplacementNeeded = 15;
-  readonly attribute optional BatReplaceabilityEnum batReplaceability = 16;
-  readonly attribute optional boolean batPresent = 17;
-  readonly attribute optional BatFaultEnum activeBatFaults[] = 18;
-  readonly attribute optional char_string<60> batReplacementDescription = 19;
-  readonly attribute optional BatCommonDesignationEnum batCommonDesignation = 20;
-  readonly attribute optional char_string<20> batANSIDesignation = 21;
-  readonly attribute optional char_string<20> batIECDesignation = 22;
-  readonly attribute optional BatApprovedChemistryEnum batApprovedChemistry = 23;
-  readonly attribute optional int32u batCapacity = 24;
-  readonly attribute optional int8u batQuantity = 25;
-  readonly attribute optional BatChargeStateEnum batChargeState = 26;
-  readonly attribute optional nullable int32u batTimeToFullCharge = 27;
-  readonly attribute optional boolean batFunctionalWhileCharging = 28;
-  readonly attribute optional nullable int32u batChargingCurrent = 29;
-  readonly attribute optional BatChargeFaultEnum activeBatChargeFaults[] = 30;
-  readonly attribute endpoint_no endpointList[] = 31;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 cluster GeneralCommissioning = 48 {
   revision 1; // NOTE: Default/not specifically set
@@ -1253,53 +994,6 @@ cluster NetworkCommissioning = 49 {
   command access(invoke: administer) QueryIdentity(QueryIdentityRequest): QueryIdentityResponse = 9;
 }
 
-/** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
-cluster DiagnosticLogs = 50 {
-  revision 1; // NOTE: Default/not specifically set
-
-  enum IntentEnum : enum8 {
-    kEndUserSupport = 0;
-    kNetworkDiag = 1;
-    kCrashLogs = 2;
-  }
-
-  enum StatusEnum : enum8 {
-    kSuccess = 0;
-    kExhausted = 1;
-    kNoLogs = 2;
-    kBusy = 3;
-    kDenied = 4;
-  }
-
-  enum TransferProtocolEnum : enum8 {
-    kResponsePayload = 0;
-    kBDX = 1;
-  }
-
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct RetrieveLogsRequestRequest {
-    IntentEnum intent = 0;
-    TransferProtocolEnum requestedProtocol = 1;
-    optional char_string<32> transferFileDesignator = 2;
-  }
-
-  response struct RetrieveLogsResponse = 1 {
-    StatusEnum status = 0;
-    long_octet_string logContent = 1;
-    optional epoch_us UTCTimeStamp = 2;
-    optional systime_us timeSinceBoot = 3;
-  }
-
-  /** Retrieving diagnostic logs from a Node */
-  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
-}
-
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 cluster GeneralDiagnostics = 51 {
   revision 2;
@@ -1431,43 +1125,6 @@ cluster GeneralDiagnostics = 51 {
   command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
 }
 
-/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
-cluster SoftwareDiagnostics = 52 {
-  revision 1; // NOTE: Default/not specifically set
-
-  bitmap Feature : bitmap32 {
-    kWatermarks = 0x1;
-  }
-
-  struct ThreadMetricsStruct {
-    int64u id = 0;
-    optional char_string<8> name = 1;
-    optional int32u stackFreeCurrent = 2;
-    optional int32u stackFreeMinimum = 3;
-    optional int32u stackSize = 4;
-  }
-
-  info event SoftwareFault = 0 {
-    int64u id = 0;
-    optional char_string name = 1;
-    optional octet_string faultRecording = 2;
-  }
-
-  readonly attribute optional ThreadMetricsStruct threadMetrics[] = 0;
-  readonly attribute optional int64u currentHeapFree = 1;
-  readonly attribute optional int64u currentHeapUsed = 2;
-  readonly attribute optional int64u currentHeapHighWatermark = 3;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  /** Reception of this command SHALL reset the values: The StackFreeMinimum field of the ThreadMetrics attribute, CurrentHeapHighWaterMark attribute. */
-  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
-}
-
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 cluster ThreadNetworkDiagnostics = 53 {
   revision 2;
@@ -1888,43 +1545,6 @@ cluster GroupKeyManagement = 63 {
   fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
 }
 
-/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
-labels. */
-cluster FixedLabel = 64 {
-  revision 1; // NOTE: Default/not specifically set
-
-  struct LabelStruct {
-    char_string<16> label = 0;
-    char_string<16> value = 1;
-  }
-
-  readonly attribute LabelStruct labelList[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
-/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
-cluster UserLabel = 65 {
-  revision 1; // NOTE: Default/not specifically set
-
-  struct LabelStruct {
-    char_string<16> label = 0;
-    char_string<16> value = 1;
-  }
-
-  attribute access(write: manage) LabelStruct labelList[] = 0;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 /** Attributes and commands for scene configuration and manipulation. */
 provisional cluster ScenesManagement = 98 {
   revision 1;
@@ -2515,13 +2135,6 @@ endpoint 0 {
     handle command ReorderNetwork;
   }
 
-  server cluster DiagnosticLogs {
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-
-    handle command RetrieveLogsRequest;
-  }
-
   server cluster GeneralDiagnostics {
     emits event BootReason;
     callback attribute networkInterfaces;
@@ -2541,18 +2154,6 @@ endpoint 0 {
     handle command TimeSnapshotResponse;
   }
 
-  server cluster SoftwareDiagnostics {
-    emits event SoftwareFault;
-    callback attribute threadMetrics;
-    callback attribute currentHeapFree;
-    callback attribute currentHeapUsed;
-    callback attribute currentHeapHighWatermark;
-    callback attribute featureMap;
-    ram      attribute clusterRevision default = 1;
-
-    handle command ResetWatermarks;
-  }
-
   server cluster ThreadNetworkDiagnostics {
     callback attribute channel;
     callback attribute routingRole;
@@ -2673,22 +2274,9 @@ endpoint 0 {
     handle command KeySetReadAllIndices;
     handle command KeySetReadAllIndicesResponse;
   }
-
-  server cluster FixedLabel {
-    callback attribute labelList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
-  server cluster UserLabel {
-    callback attribute labelList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
 }
 endpoint 1 {
-  device type ma_powersource = 17, version 1;
-  device type ma_dimmablelight = 257, version 1;
+  device type ma_extendedcolorlight = 269, version 1;
 
 
   server cluster Identify {
@@ -2767,7 +2355,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 3;
-    ram      attribute clusterRevision default = 6;
+    ram      attribute clusterRevision default = 5;
 
     handle command MoveToLevel;
     handle command Move;
@@ -2792,26 +2380,6 @@ endpoint 1 {
     callback attribute clusterRevision;
   }
 
-  server cluster PowerSource {
-    ram      attribute status default = 0;
-    ram      attribute order default = 0;
-    ram      attribute description default = "USB";
-    ram      attribute wiredAssessedInputVoltage;
-    ram      attribute wiredAssessedInputFrequency;
-    ram      attribute wiredCurrentType default = 1;
-    ram      attribute wiredAssessedCurrent;
-    ram      attribute wiredNominalVoltage default = 5000;
-    ram      attribute wiredMaximumCurrent default = 1000;
-    ram      attribute wiredPresent default = 1;
-    callback attribute endpointList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute eventList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 2;
-  }
-
   server cluster ScenesManagement {
     ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
@@ -2860,6 +2428,10 @@ endpoint 1 {
     ram      attribute colorTempPhysicalMaxMireds default = 0xFEFF;
     ram      attribute coupleColorTempToLevelMinMireds;
     persist  attribute startUpColorTemperatureMireds;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0x1F;
     ram      attribute clusterRevision default = 6;
 
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
index b894a2f5a70c00..437aac9d67bdac 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -1494,58 +1494,6 @@
             }
           ]
         },
-        {
-          "name": "Diagnostic Logs",
-          "code": 50,
-          "mfgCode": null,
-          "define": "DIAGNOSTIC_LOGS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "RetrieveLogsRequest",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "General Diagnostics",
           "code": 51,
@@ -1767,131 +1715,6 @@
             }
           ]
         },
-        {
-          "name": "Software Diagnostics",
-          "code": 52,
-          "mfgCode": null,
-          "define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "ResetWatermarks",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "ThreadMetrics",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentHeapFree",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentHeapUsed",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CurrentHeapHighWatermark",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int64u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            }
-          ],
-          "events": [
-            {
-              "name": "SoftwareFault",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            }
-          ]
-        },
         {
           "name": "Thread Network Diagnostics",
           "code": 53,
@@ -3451,229 +3274,105 @@
               "reportableChange": 0
             }
           ]
-        },
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "MA-dimmablelight",
+      "deviceTypeRef": {
+        "code": 269,
+        "profileId": 259,
+        "label": "MA-extendedcolorlight",
+        "name": "MA-extendedcolorlight"
+      },
+      "deviceTypes": [
+        {
+          "code": 269,
+          "profileId": 259,
+          "label": "MA-extendedcolorlight",
+          "name": "MA-extendedcolorlight"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        269
+      ],
+      "deviceTypeName": "MA-extendedcolorlight",
+      "deviceTypeCode": 269,
+      "deviceTypeProfileId": 259,
+      "clusters": [
         {
-          "name": "Fixed Label",
-          "code": 64,
+          "name": "Identify",
+          "code": 3,
           "mfgCode": null,
-          "define": "FIXED_LABEL_CLUSTER",
+          "define": "IDENTIFY_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
           "attributes": [
             {
-              "name": "LabelList",
+              "name": "IdentifyTime",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
+              "defaultValue": "0x0000",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "IdentifyType",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "IdentifyTypeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
+              "defaultValue": "0x0",
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "User Label",
-          "code": 65,
-          "mfgCode": null,
-          "define": "USER_LABEL_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "LabelList",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": 2,
-      "name": "MA-dimmablelight",
-      "deviceTypeRef": {
-        "code": 257,
-        "profileId": 259,
-        "label": "MA-dimmablelight",
-        "name": "MA-dimmablelight"
-      },
-      "deviceTypes": [
-        {
-          "code": 257,
-          "profileId": 259,
-          "label": "MA-dimmablelight",
-          "name": "MA-dimmablelight"
-        },
-        {
-          "code": 17,
-          "profileId": 259,
-          "label": "MA-powersource",
-          "name": "MA-powersource"
-        }
-      ],
-      "deviceVersions": [
-        1,
-        1
-      ],
-      "deviceIdentifiers": [
-        257,
-        17
-      ],
-      "deviceTypeName": "MA-dimmablelight",
-      "deviceTypeCode": 257,
-      "deviceTypeProfileId": 259,
-      "clusters": [
-        {
-          "name": "Identify",
-          "code": 3,
-          "mfgCode": null,
-          "define": "IDENTIFY_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "Identify",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "TriggerEffect",
-              "code": 64,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "IdentifyTime",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0000",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "IdentifyType",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "IdentifyTypeEnum",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3862,7 +3561,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4034,7 +3733,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4050,7 +3749,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x01",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4066,7 +3765,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4082,7 +3781,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4098,7 +3797,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0xFF",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4286,7 +3985,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x01",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4302,7 +4001,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4318,7 +4017,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x01",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -4398,7 +4097,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4430,7 +4129,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0xFF",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -4494,7 +4193,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "255",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -4589,7 +4288,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "6",
+              "defaultValue": "5",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -4632,7 +4331,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": null,
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -4648,7 +4347,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": null,
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -4664,7 +4363,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": null,
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -4767,288 +4466,6 @@
             }
           ]
         },
-        {
-          "name": "Power Source",
-          "code": 47,
-          "mfgCode": null,
-          "define": "POWER_SOURCE_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
-            {
-              "name": "Status",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "PowerSourceStatusEnum",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "Order",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "Description",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "char_string",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "USB",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredAssessedInputVoltage",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredAssessedInputFrequency",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredCurrentType",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "WiredCurrentTypeEnum",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredAssessedCurrent",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredNominalVoltage",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "5000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredMaximumCurrent",
-              "code": 8,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1000",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "WiredPresent",
-              "code": 9,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "EndpointList",
-              "code": 31,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Scenes Management",
           "code": 98,
@@ -5515,7 +4932,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5531,7 +4948,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x616B",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5547,7 +4964,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x607D",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5563,7 +4980,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00FA",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5579,7 +4996,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x01",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5595,7 +5012,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x00",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5611,7 +5028,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5643,7 +5060,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x01",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5739,7 +5156,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x1F",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5755,7 +5172,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x0000",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5771,7 +5188,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0xFEFF",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5787,7 +5204,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
@@ -5803,11 +5220,75 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 1,
+              "reportable": 0,
               "minInterval": 0,
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
diff --git a/examples/lighting-app/silabs/openthread.gni b/examples/lighting-app/silabs/openthread.gni
index 71fa3271ea5073..b39a1cb8e5878d 100644
--- a/examples/lighting-app/silabs/openthread.gni
+++ b/examples/lighting-app/silabs/openthread.gni
@@ -23,5 +23,8 @@ app_data_model =
 chip_enable_ota_requestor = true
 chip_enable_openthread = true
 
+# Not needed for the Lighting-app
+chip_enable_read_client = false
+
 openthread_external_platform =
     "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt
index 9620a00e1127e5..056f6d4173c49a 100644
--- a/examples/lighting-app/telink/CMakeLists.txt
+++ b/examples/lighting-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,85 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-set(ignoreMe "${TLNK_USB_DONGLE}")
-
-if(${TLNK_MARS_BOARD} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-  else()
-    unset(MARS_DTC_OVERLAY_FILE)
-  endif()
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-  else()
-    unset(MARS_CONF_OVERLAY_FILE)
-  endif()
-else()
-  unset(MARS_CONF_OVERLAY_FILE)
-endif()
-
-if(${TLNK_USB_DONGLE} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.overlay")
-    set(USB_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.overlay")
-  else()
-    unset(USB_DTC_OVERLAY_FILE)
-  endif()
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.conf")
-    set(USB_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.conf")
-  else()
-    unset(USB_CONF_OVERLAY_FILE)
-  endif()
-else()
-  unset(USB_CONF_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE ${USB_CONF_OVERLAY_FILE} ${MARS_CONF_OVERLAY_FILE} prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-lighting-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-lighting-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -99,19 +32,24 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/lighting-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
-               ${TELINK_COMMON}/util/src/WS2812Device.cpp
-               ${TELINK_COMMON}/util/src/ColorFormat.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/util/src/ColorFormat.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
@@ -122,155 +60,6 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
   target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp)
 endif()
 
-# Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70
-add_compile_options(-Wno-error=unused-parameter)
-
 if (CONFIG_CHIP_PW_RPC)
-
-# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
-link_libraries($<BUILD_INTERFACE:zephyr_interface>)
-
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-
-include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-include($ENV{PW_ROOT}/pw_log/backend.cmake)
-include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
-
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.telink)
-
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/telink/pw_sys_io)
-
-pw_proto_library(attributes_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
-  PREFIX
-    attributes_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(button_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
-  PREFIX
-    button_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(descriptor_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
-  PREFIX
-    descriptor_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(device_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
-  PREFIX
-    device_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(lighting_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    lighting_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(ot_cli_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    ot_cli_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(thread_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    thread_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-target_sources(app PRIVATE
-  ../../common/pigweed/RpcService.cpp
-  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
-  ${TELINK_COMMON}/Rpc.cpp
-  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
-)
-
-target_include_directories(app PRIVATE
-  ${PIGWEED_ROOT}/pw_sys_io/public
-  ${CHIP_ROOT}/src/lib/support
-  ${CHIP_ROOT}/src/system
-  ${TELINK_COMMON}
-  ../../common
-  ../../common/pigweed
-  ../../common/pigweed/telink)
-
-target_compile_options(app PRIVATE
-                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
-                       "-DPW_RPC_BUTTON_SERVICE=1"
-                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
-                       "-DPW_RPC_DEVICE_SERVICE=1"
-                       "-DPW_RPC_LIGHTING_SERVICE=1"
-                       "-DPW_RPC_THREAD_SERVICE=1")
-
-target_link_libraries(app PRIVATE
-  attributes_service.nanopb_rpc
-  button_service.nanopb_rpc
-  descriptor_service.nanopb_rpc
-  device_service.nanopb_rpc
-  lighting_service.nanopb_rpc
-  thread_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_log
-  pw_rpc.server
-  pw_sys_io
-)
-
+  include(${TELINK_COMMON}/Rpc.cmake)
 endif(CONFIG_CHIP_PW_RPC)
diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md
index 2f696170f3cca2..f4dfefe2b9795e 100644
--- a/examples/lighting-app/telink/README.md
+++ b/examples/lighting-app/telink/README.md
@@ -98,30 +98,6 @@ be used to specify the the effect. It is able to be in following effects:
 | Blinks (950 ms on/50 ms off)    | Finish ( `Clusters::Identify::EffectIdentifierEnum::kFinishEffect`)          |
 | LED off                         | Stop (`Clusters::Identify::EffectIdentifierEnum::kStopEffect`)               |
 
-#### Indicate current state of lightbulb
-
-By default, only **Blue** LED is used to show current state of lightbulb (only
-for lightning-app).
-
-To enable RGB functionality in Your application set this config:
-
-In Matter examples/lighting-app/telink/include/**AppConfig.h**, set the define
-`USE_RGB_PWM`:
-
-```bash
-    define USE_RGB_PWM 1
-```
-
-To get current state of lightbulb in RGB mode, connect 3-color LED module to
-following pins:
-
-| Name  |         Pin         |
-| :---: | :-----------------: |
-|  Red  | PE2 (pin 8 of J34)  |
-| Green | PE0 (pin 5 of J34)  |
-| Blue  | PB4 (pin 20 of J34) |
-|  GND  | GND (pin 24 of J50) |
-
 ### CHIP tool commands
 
 1. Build
diff --git a/examples/lighting-app/telink/include/AppConfig.h b/examples/lighting-app/telink/include/AppConfig.h
index b616746393ff03..a3639efb3183af 100644
--- a/examples/lighting-app/telink/include/AppConfig.h
+++ b/examples/lighting-app/telink/include/AppConfig.h
@@ -20,14 +20,5 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 1
-#define APP_USE_THREAD_START_BUTTON 1
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
-
-// Lighting LED config
-#define USE_RGB_PWM 0
diff --git a/examples/lighting-app/telink/include/AppTask.h b/examples/lighting-app/telink/include/AppTask.h
index 67b69ef84e2e45..c835c88e097c11 100644
--- a/examples/lighting-app/telink/include/AppTask.h
+++ b/examples/lighting-app/telink/include/AppTask.h
@@ -19,22 +19,29 @@
 #pragma once
 
 #include "AppTaskCommon.h"
-#include "PWMDevice.h"
 
 class AppTask : public AppTaskCommon
 {
 public:
+    enum Fixture_Action : uint8_t
+    {
+        ON_ACTION = 0,
+        OFF_ACTION,
+        LEVEL_ACTION,
+        COLOR_ACTION_XY,
+        COLOR_ACTION_HSV,
+        COLOR_ACTION_CT,
+
+        INVALID_ACTION
+    };
+
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
     void PowerOnFactoryReset(void);
 #endif /* CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET */
-    void SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uint8_t * value);
-    void UpdateClusterState(void);
 
-#ifdef CONFIG_WS2812_STRIP
-    WS2812Device & GetLightingDevice(void) { return mWS2812Device; }
-#else
-    PWMDevice & GetLightingDevice(void) { return mPwmRgbBlueLed; }
-#endif /* CONFIG_WS2812_STRIP */
+    bool IsTurnedOn() const;
+    void SetInitiateAction(Fixture_Action aAction, int32_t aActor, uint8_t * value);
+    void UpdateClusterState(void);
 
 private:
     friend AppTask & GetAppTask(void);
@@ -42,9 +49,6 @@ class AppTask : public AppTaskCommon
 
     CHIP_ERROR Init(void);
 
-    static void ActionInitiated(PWMDevice::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor);
-
     static void LightingActionEventHandler(AppEvent * aEvent);
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
     static void PowerOnFactoryResetEventHandler(AppEvent * aEvent);
@@ -54,16 +58,6 @@ class AppTask : public AppTaskCommon
     static k_timer sPowerOnFactoryResetTimer;
 #endif /* CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET */
 
-#ifdef CONFIG_WS2812_STRIP
-    WS2812Device mWS2812Device;
-#else
-    PWMDevice mPwmRgbBlueLed;
-#if USE_RGB_PWM
-    PWMDevice mPwmRgbGreenLed;
-    PWMDevice mPwmRgbRedLed;
-#endif
-#endif /* CONFIG_WS2812_STRIP */
-
     static AppTask sAppTask;
 };
 
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
index f4b2a44e1c672c..ca11bfdde52621 100644
--- a/examples/lighting-app/telink/prj.conf
+++ b/examples/lighting-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2021-2023 Project CHIP Authors
+#    Copyright (c) 2021-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32773 == 0x8005 (example lighting-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32773
 
@@ -51,7 +47,7 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 
-#Enable PWM
+# Enable PWM
 CONFIG_PWM=y
 
 # Enable Power Management
diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
index 54dd2703c16ce9..bb4dc4150db2be 100644
--- a/examples/lighting-app/telink/src/AppTask.cpp
+++ b/examples/lighting-app/telink/src/AppTask.cpp
@@ -20,34 +20,29 @@
 #include <app/server/Server.h>
 
 #include "ColorFormat.h"
-#include "PWMDevice.h"
+#include "PWMManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 namespace {
-#ifdef CONFIG_WS2812_STRIP
-const struct device * const ws2812_dev = DEVICE_DT_GET(DT_ALIAS(led_strip));
-#else
-const struct pwm_dt_spec sPwmRgbSpecBlueLed  = PWM_DT_SPEC_GET_OR(DT_ALIAS(pwm_led0), {});
-#if USE_RGB_PWM
-const struct pwm_dt_spec sPwmRgbSpecGreenLed = PWM_DT_SPEC_GET_OR(DT_ALIAS(pwm_led1), {});
-const struct pwm_dt_spec sPwmRgbSpecRedLed   = PWM_DT_SPEC_GET_OR(DT_ALIAS(pwm_led2), {});
-#endif
-#endif // CONFIG_WS2812_STRIP
-
-#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
+bool sfixture_on;
 uint8_t sBrightness;
-PWMDevice::Action_t sColorAction = PWMDevice::INVALID_ACTION;
+AppTask::Fixture_Action sColorAction = AppTask::INVALID_ACTION;
 XyColor_t sXY;
 HsvColor_t sHSV;
 CtColor_t sCT;
-#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
+RgbColor_t sLedRgb;
 } // namespace
 
 AppTask AppTask::sAppTask;
 
+bool AppTask::IsTurnedOn() const
+{
+    return sfixture_on;
+}
+
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
 void AppTask::PowerOnFactoryReset(void)
 {
@@ -61,143 +56,47 @@ void AppTask::PowerOnFactoryReset(void)
 
 CHIP_ERROR AppTask::Init(void)
 {
-    CHIP_ERROR err;
-
-    // Init lighting manager
-    uint8_t minLightLevel = kDefaultMinLevel;
-    Clusters::LevelControl::Attributes::MinLevel::Get(kExampleEndpointId, &minLightLevel);
+    SetExampleButtonCallbacks(LightingActionEventHandler);
+    InitCommonParts();
 
-    uint8_t maxLightLevel = kDefaultMaxLevel;
-    Clusters::LevelControl::Attributes::MaxLevel::Get(kExampleEndpointId, &maxLightLevel);
+    Protocols::InteractionModel::Status status;
 
-#ifdef CONFIG_WS2812_STRIP
-    err = sAppTask.mWS2812Device.Init(ws2812_dev, STRIP_NUM_PIXELS(led_strip));
-    if (err != CHIP_NO_ERROR)
+    app::DataModel::Nullable<uint8_t> brightness;
+    // Read brightness value
+    status = Clusters::LevelControl::Attributes::CurrentLevel::Get(kExampleEndpointId, brightness);
+    if (status == Protocols::InteractionModel::Status::Success && !brightness.IsNull())
     {
-        LOG_ERR("WS2812 Device Init fail");
-        return err;
-    }
-#else
-    err = sAppTask.mPwmRgbBlueLed.Init(&sPwmRgbSpecBlueLed, minLightLevel, maxLightLevel, maxLightLevel);
-    if (err != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Blue RGB PWM Device Init fail");
-        return err;
-    }
-#if USE_RGB_PWM
-    err = sAppTask.mPwmRgbRedLed.Init(&sPwmRgbSpecRedLed, minLightLevel, maxLightLevel, maxLightLevel);
-    if (err != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Red RGB PWM Device Init fail");
-        return err;
+        sBrightness = brightness.Value();
     }
 
-    err = sAppTask.mPwmRgbGreenLed.Init(&sPwmRgbSpecGreenLed, minLightLevel, maxLightLevel, maxLightLevel);
-    if (err != CHIP_NO_ERROR)
+    memset(&sLedRgb, sBrightness, sizeof(RgbColor_t));
+
+    bool storedValue;
+    // Read storedValue on/off value
+    status = Clusters::OnOff::Attributes::OnOff::Get(1, &storedValue);
+    if (status == Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Green RGB PWM Device Init fail");
-        return err;
+        // Set actual state to stored before reboot
+        SetInitiateAction(storedValue ? ON_ACTION : OFF_ACTION, static_cast<int32_t>(AppEvent::kEventType_Lighting), nullptr);
     }
-#endif
-    sAppTask.mPwmRgbBlueLed.SetCallbacks(ActionInitiated, ActionCompleted, nullptr);
-#endif // CONFIG_WS2812_STRIP
-
-#if APP_USE_EXAMPLE_START_BUTTON
-    SetExampleButtonCallbacks(LightingActionEventHandler);
-#endif
-    InitCommonParts();
 
     return CHIP_NO_ERROR;
 }
 
 void AppTask::LightingActionEventHandler(AppEvent * aEvent)
 {
-#ifdef CONFIG_WS2812_STRIP
-    if (aEvent->Type == AppEvent::kEventType_Button)
-    {
-        if (sAppTask.mWS2812Device.IsTurnedOn())
-        {
-            sAppTask.mWS2812Device.Set(SET_RGB_TURN_OFF);
-        }
-        else
-        {
-            sAppTask.mWS2812Device.Set(SET_RGB_TURN_ON);
-        }
-
-        sAppTask.UpdateClusterState();
-    }
-#else
-    PWMDevice::Action_t action = PWMDevice::INVALID_ACTION;
-    int32_t actor              = 0;
+    Fixture_Action action = INVALID_ACTION;
+    int32_t actor         = 0;
 
     if (aEvent->Type == AppEvent::kEventType_Lighting)
     {
-        action = static_cast<PWMDevice::Action_t>(aEvent->LightingEvent.Action);
+        action = static_cast<Fixture_Action>(aEvent->LightingEvent.Action);
         actor  = aEvent->LightingEvent.Actor;
     }
     else if (aEvent->Type == AppEvent::kEventType_Button)
     {
-#if USE_RGB_PWM
-        if (sAppTask.mPwmRgbRedLed.IsTurnedOn() || sAppTask.mPwmRgbGreenLed.IsTurnedOn() || sAppTask.mPwmRgbBlueLed.IsTurnedOn())
-        {
-            action = PWMDevice::OFF_ACTION;
-        }
-        else
-        {
-            action = PWMDevice::ON_ACTION;
-        }
-#else
-        action = sAppTask.mPwmRgbBlueLed.IsTurnedOn() ? PWMDevice::OFF_ACTION : PWMDevice::ON_ACTION;
-#endif
-        actor = AppEvent::kEventType_Button;
-    }
-
-    if (action != PWMDevice::INVALID_ACTION &&
-        (
-#if USE_RGB_PWM
-            !sAppTask.mPwmRgbRedLed.InitiateAction(action, actor, NULL) ||
-            !sAppTask.mPwmRgbGreenLed.InitiateAction(action, actor, NULL) ||
-#endif
-            !sAppTask.mPwmRgbBlueLed.InitiateAction(action, actor, NULL)))
-    {
-        LOG_INF("Action is in progress or active");
-    }
-#endif // CONFIG_WS2812_STRIP
-}
-
-void AppTask::ActionInitiated(PWMDevice::Action_t aAction, int32_t aActor)
-{
-    if (aAction == PWMDevice::ON_ACTION)
-    {
-        LOG_DBG("ON_ACTION initiated");
-    }
-    else if (aAction == PWMDevice::OFF_ACTION)
-    {
-        LOG_DBG("OFF_ACTION initiated");
-    }
-    else if (aAction == PWMDevice::LEVEL_ACTION)
-    {
-        LOG_DBG("LEVEL_ACTION initiated");
-    }
-}
+        sfixture_on = !sfixture_on;
 
-void AppTask::ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor)
-{
-    if (aAction == PWMDevice::ON_ACTION)
-    {
-        LOG_DBG("ON_ACTION completed");
-    }
-    else if (aAction == PWMDevice::OFF_ACTION)
-    {
-        LOG_DBG("OFF_ACTION completed");
-    }
-    else if (aAction == PWMDevice::LEVEL_ACTION)
-    {
-        LOG_DBG("LEVEL_ACTION completed");
-    }
-
-    if (aActor == AppEvent::kEventType_Button)
-    {
         sAppTask.UpdateClusterState();
     }
 }
@@ -205,38 +104,8 @@ void AppTask::ActionCompleted(PWMDevice::Action_t aAction, int32_t aActor)
 void AppTask::UpdateClusterState(void)
 {
     Protocols::InteractionModel::Status status;
-    bool isTurnedOn;
-    uint8_t setLevel;
-
-#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
-#ifdef CONFIG_WS2812_STRIP
-    isTurnedOn = sAppTask.mWS2812Device.IsTurnedOn();
-#else
-    isTurnedOn =
-        sAppTask.mPwmRgbRedLed.IsTurnedOn() || sAppTask.mPwmRgbGreenLed.IsTurnedOn() || sAppTask.mPwmRgbBlueLed.IsTurnedOn();
-#endif // CONFIG_WS2812_STRIP
-
-    if (sColorAction == PWMDevice::COLOR_ACTION_XY || sColorAction == PWMDevice::COLOR_ACTION_HSV ||
-        sColorAction == PWMDevice::COLOR_ACTION_CT)
-    {
-        setLevel = sBrightness;
-    }
-    else
-    {
-#ifdef CONFIG_WS2812_STRIP
-        setLevel = sAppTask.mWS2812Device.GetBlueLevel();
-        if (setLevel > kDefaultMaxLevel)
-        {
-            setLevel = kDefaultMaxLevel;
-        }
-#else
-        setLevel = sAppTask.mPwmRgbBlueLed.GetLevel();
-#endif // CONFIG_WS2812_STRIP
-    }
-#else
-    isTurnedOn = sAppTask.mPwmRgbBlueLed.IsTurnedOn();
-    setLevel   = sAppTask.mPwmRgbBlueLed.GetLevel();
-#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
+    bool isTurnedOn  = sfixture_on;
+    uint8_t setLevel = sBrightness;
 
     // write the new on/off value
     status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn);
@@ -252,100 +121,86 @@ void AppTask::UpdateClusterState(void)
     }
 }
 
-void AppTask::SetInitiateAction(PWMDevice::Action_t aAction, int32_t aActor, uint8_t * value)
+void AppTask::SetInitiateAction(Fixture_Action aAction, int32_t aActor, uint8_t * value)
 {
-#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
     bool setRgbAction = false;
-    RgbColor_t rgb;
-#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
 
-    if (aAction == PWMDevice::ON_ACTION || aAction == PWMDevice::OFF_ACTION)
+    if (aAction == ON_ACTION || aAction == OFF_ACTION)
     {
-#ifdef CONFIG_WS2812_STRIP
-        if (aAction == PWMDevice::ON_ACTION)
+        if (aAction == ON_ACTION)
         {
-            sAppTask.mWS2812Device.Set(SET_RGB_TURN_ON);
+            sfixture_on = true;
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, (((uint32_t) sLedRgb.r * 1000) / UINT8_MAX));
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, (((uint32_t) sLedRgb.g * 1000) / UINT8_MAX));
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, (((uint32_t) sLedRgb.b * 1000) / UINT8_MAX));
         }
-        else if (aAction == PWMDevice::OFF_ACTION)
+        else
         {
-            sAppTask.mWS2812Device.Set(SET_RGB_TURN_OFF);
+            sfixture_on = false;
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, false);
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, false);
+            PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, false);
         }
-#else
-        sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, value);
-#if USE_RGB_PWM
-        sAppTask.mPwmRgbRedLed.InitiateAction(aAction, aActor, value);
-        sAppTask.mPwmRgbGreenLed.InitiateAction(aAction, aActor, value);
-#endif
-#endif // CONFIG_WS2812_STRIP
     }
-    else if (aAction == PWMDevice::LEVEL_ACTION)
+    else if (aAction == LEVEL_ACTION)
     {
-#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
         // Save a new brightness for ColorControl
         sBrightness = *value;
 
-        if (sColorAction == PWMDevice::COLOR_ACTION_XY)
+        if (sColorAction == COLOR_ACTION_XY)
         {
-            rgb = XYToRgb(sBrightness, sXY.x, sXY.y);
+            sLedRgb = XYToRgb(sBrightness, sXY.x, sXY.y);
         }
-        else if (sColorAction == PWMDevice::COLOR_ACTION_HSV)
+        else if (sColorAction == COLOR_ACTION_HSV)
         {
-            sHSV.v = sBrightness;
-            rgb    = HsvToRgb(sHSV);
+            sHSV.v  = sBrightness;
+            sLedRgb = HsvToRgb(sHSV);
         }
         else
         {
-            memset(&rgb, sBrightness, sizeof(RgbColor_t));
+            memset(&sLedRgb, sBrightness, sizeof(RgbColor_t));
         }
 
-        ChipLogProgress(Zcl, "New brightness: %u | R: %u, G: %u, B: %u", sBrightness, rgb.r, rgb.g, rgb.b);
+        ChipLogProgress(Zcl, "New brightness: %u | R: %u, G: %u, B: %u", sBrightness, sLedRgb.r, sLedRgb.g, sLedRgb.b);
         setRgbAction = true;
-#else
-        sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, value);
-#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
     }
-#if defined(CONFIG_WS2812_STRIP) || USE_RGB_PWM
-    else if (aAction == PWMDevice::COLOR_ACTION_XY)
+    else if (aAction == COLOR_ACTION_XY)
     {
-        sXY = *reinterpret_cast<XyColor_t *>(value);
-        rgb = XYToRgb(sBrightness, sXY.x, sXY.y);
-        ChipLogProgress(Zcl, "XY to RGB: X: %u, Y: %u, Level: %u | R: %u, G: %u, B: %u", sXY.x, sXY.y, sBrightness, rgb.r, rgb.g,
-                        rgb.b);
+        sXY     = *reinterpret_cast<XyColor_t *>(value);
+        sLedRgb = XYToRgb(sBrightness, sXY.x, sXY.y);
+        ChipLogProgress(Zcl, "XY to RGB: X: %u, Y: %u, Level: %u | R: %u, G: %u, B: %u", sXY.x, sXY.y, sBrightness, sLedRgb.r,
+                        sLedRgb.g, sLedRgb.b);
         setRgbAction = true;
-        sColorAction = PWMDevice::COLOR_ACTION_XY;
+        sColorAction = COLOR_ACTION_XY;
     }
-    else if (aAction == PWMDevice::COLOR_ACTION_HSV)
+    else if (aAction == COLOR_ACTION_HSV)
     {
-        sHSV   = *reinterpret_cast<HsvColor_t *>(value);
-        sHSV.v = sBrightness;
-        rgb    = HsvToRgb(sHSV);
-        ChipLogProgress(Zcl, "HSV to RGB: H: %u, S: %u, V: %u | R: %u, G: %u, B: %u", sHSV.h, sHSV.s, sHSV.v, rgb.r, rgb.g, rgb.b);
+        sHSV    = *reinterpret_cast<HsvColor_t *>(value);
+        sHSV.v  = sBrightness;
+        sLedRgb = HsvToRgb(sHSV);
+        ChipLogProgress(Zcl, "HSV to RGB: H: %u, S: %u, V: %u | R: %u, G: %u, B: %u", sHSV.h, sHSV.s, sHSV.v, sLedRgb.r, sLedRgb.g,
+                        sLedRgb.b);
         setRgbAction = true;
-        sColorAction = PWMDevice::COLOR_ACTION_HSV;
+        sColorAction = COLOR_ACTION_HSV;
     }
-    else if (aAction == PWMDevice::COLOR_ACTION_CT)
+    else if (aAction == COLOR_ACTION_CT)
     {
         sCT = *reinterpret_cast<CtColor_t *>(value);
         if (sCT.ctMireds)
         {
-            rgb = CTToRgb(sCT);
-            ChipLogProgress(Zcl, "ColorTemp to RGB: CT: %u | R: %u, G: %u, B: %u", sCT.ctMireds, rgb.r, rgb.g, rgb.b);
+            sLedRgb = CTToRgb(sCT);
+            ChipLogProgress(Zcl, "ColorTemp to RGB: CT: %u | R: %u, G: %u, B: %u", sCT.ctMireds, sLedRgb.r, sLedRgb.g, sLedRgb.b);
             setRgbAction = true;
-            sColorAction = PWMDevice::COLOR_ACTION_CT;
+            sColorAction = COLOR_ACTION_CT;
         }
     }
 
     if (setRgbAction)
     {
-#ifdef CONFIG_WS2812_STRIP
-        sAppTask.mWS2812Device.SetLevel(&rgb);
-#else
-        sAppTask.mPwmRgbRedLed.InitiateAction(aAction, aActor, &rgb.r);
-        sAppTask.mPwmRgbGreenLed.InitiateAction(aAction, aActor, &rgb.g);
-        sAppTask.mPwmRgbBlueLed.InitiateAction(aAction, aActor, &rgb.b);
-#endif // CONFIG_WS2812_STRIP
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, (((uint32_t) sLedRgb.r * 1000) / UINT8_MAX));
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, (((uint32_t) sLedRgb.g * 1000) / UINT8_MAX));
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, (((uint32_t) sLedRgb.b * 1000) / UINT8_MAX));
     }
-#endif // CONFIG_WS2812_STRIP || USE_RGB_PWM
 }
 
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
@@ -359,15 +214,9 @@ void AppTask::PowerOnFactoryResetEventHandler(AppEvent * aEvent)
 {
     LOG_INF("Lighting App Power On Factory Reset Handler");
     sPowerOnFactoryResetTimerCnt = 1;
-#ifdef CONFIG_WS2812_STRIP
-    sAppTask.mWS2812Device.Set(sPowerOnFactoryResetTimerCnt % 2);
-#else
-    sAppTask.mPwmRgbBlueLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-#if USE_RGB_PWM
-    sAppTask.mPwmRgbRedLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-    sAppTask.mPwmRgbGreenLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-#endif
-#endif // CONFIG_WS2812_STRIP
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, (bool) (sPowerOnFactoryResetTimerCnt % 2));
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, (bool) (sPowerOnFactoryResetTimerCnt % 2));
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, (bool) (sPowerOnFactoryResetTimerCnt % 2));
     k_timer_init(&sPowerOnFactoryResetTimer, PowerOnFactoryResetTimerEvent, nullptr);
     k_timer_start(&sPowerOnFactoryResetTimer, K_MSEC(kPowerOnFactoryResetIndicationTimeMs),
                   K_MSEC(kPowerOnFactoryResetIndicationTimeMs));
@@ -377,15 +226,9 @@ void AppTask::PowerOnFactoryResetTimerEvent(struct k_timer * timer)
 {
     sPowerOnFactoryResetTimerCnt++;
     LOG_INF("Lighting App Power On Factory Reset Handler %u", sPowerOnFactoryResetTimerCnt);
-#ifdef CONFIG_WS2812_STRIP
-    sAppTask.mWS2812Device.Set(sPowerOnFactoryResetTimerCnt % 2);
-#else
-    sAppTask.mPwmRgbBlueLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-#if USE_RGB_PWM
-    sAppTask.mPwmRgbRedLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-    sAppTask.mPwmRgbGreenLed.Set(sPowerOnFactoryResetTimerCnt % 2);
-#endif
-#endif // CONFIG_WS2812_STRIP
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, (bool) (sPowerOnFactoryResetTimerCnt % 2));
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, (bool) (sPowerOnFactoryResetTimerCnt % 2));
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, (bool) (sPowerOnFactoryResetTimerCnt % 2));
     if (sPowerOnFactoryResetTimerCnt > kPowerOnFactoryResetIndicationMax)
     {
         k_timer_stop(timer);
diff --git a/examples/lighting-app/telink/src/ZclCallbacks.cpp b/examples/lighting-app/telink/src/ZclCallbacks.cpp
index 7aebb1ba69bae1..75b43f7c39eee1 100644
--- a/examples/lighting-app/telink/src/ZclCallbacks.cpp
+++ b/examples/lighting-app/telink/src/ZclCallbacks.cpp
@@ -18,7 +18,6 @@
 
 #include "AppTask.h"
 #include "ColorFormat.h"
-#include "PWMDevice.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Attributes.h>
@@ -30,7 +29,6 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 using namespace chip;
 using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::OnOff;
 
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
@@ -43,15 +41,15 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
     if (clusterId == OnOff::Id && attributeId == OnOff::Attributes::OnOff::Id)
     {
         ChipLogDetail(Zcl, "Cluster OnOff: attribute OnOff set to %u", *value);
-        GetAppTask().SetInitiateAction(*value ? PWMDevice::ON_ACTION : PWMDevice::OFF_ACTION,
+        GetAppTask().SetInitiateAction(*value ? AppTask::ON_ACTION : AppTask::OFF_ACTION,
                                        static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
     }
     else if (clusterId == LevelControl::Id && attributeId == LevelControl::Attributes::CurrentLevel::Id)
     {
-        if (GetAppTask().GetLightingDevice().IsTurnedOn())
+        if (GetAppTask().IsTurnedOn())
         {
             ChipLogDetail(Zcl, "Cluster LevelControl: attribute CurrentLevel set to %u", *value);
-            GetAppTask().SetInitiateAction(PWMDevice::LEVEL_ACTION, static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
+            GetAppTask().SetInitiateAction(AppTask::LEVEL_ACTION, static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
         }
         else
         {
@@ -81,7 +79,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
             }
 
             ChipLogDetail(Zcl, "New XY color: %u|%u", xy.x, xy.y);
-            GetAppTask().SetInitiateAction(PWMDevice::COLOR_ACTION_XY, static_cast<int32_t>(AppEvent::kEventType_Lighting),
+            GetAppTask().SetInitiateAction(AppTask::COLOR_ACTION_XY, static_cast<int32_t>(AppEvent::kEventType_Lighting),
                                            (uint8_t *) &xy);
         }
         /* HSV color space */
@@ -103,14 +101,14 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
                 hsv.s = *value;
             }
             ChipLogDetail(Zcl, "New HSV color: hue = %u| saturation = %u", hsv.h, hsv.s);
-            GetAppTask().SetInitiateAction(PWMDevice::COLOR_ACTION_HSV, static_cast<int32_t>(AppEvent::kEventType_Lighting),
+            GetAppTask().SetInitiateAction(AppTask::COLOR_ACTION_HSV, static_cast<int32_t>(AppEvent::kEventType_Lighting),
                                            (uint8_t *) &hsv);
         }
         /* Temperature Mireds color space */
         else if (attributeId == ColorControl::Attributes::ColorTemperatureMireds::Id)
         {
             ChipLogDetail(Zcl, "New Temperature Mireds color = %u", *(uint16_t *) value);
-            GetAppTask().SetInitiateAction(PWMDevice::COLOR_ACTION_CT, static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
+            GetAppTask().SetInitiateAction(AppTask::COLOR_ACTION_CT, static_cast<int32_t>(AppEvent::kEventType_Lighting), value);
         }
         else
         {
@@ -118,28 +116,3 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
         }
     }
 }
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    Protocols::InteractionModel::Status status;
-    bool storedValue;
-
-    // Read storedValue on/off value
-    status = Attributes::OnOff::Get(1, &storedValue);
-    if (status == Protocols::InteractionModel::Status::Success)
-    {
-        // Set actual state to stored before reboot
-        GetAppTask().GetLightingDevice().Set(storedValue);
-    }
-
-    GetAppTask().UpdateClusterState();
-}
diff --git a/examples/lit-icd-app/silabs/build_for_wifi_args.gni b/examples/lit-icd-app/silabs/build_for_wifi_args.gni
index 3531a31ffde406..56cd70b217e81e 100644
--- a/examples/lit-icd-app/silabs/build_for_wifi_args.gni
+++ b/examples/lit-icd-app/silabs/build_for_wifi_args.gni
@@ -23,10 +23,12 @@ import("${chip_root}/src/platform/silabs/wifi_args.gni")
 chip_enable_ota_requestor = true
 app_data_model = "${chip_root}/examples/lit-icd-app/lit-icd-common"
 
+sl_enable_test_event_trigger = true
+
 # ICD Default configurations
 chip_enable_icd_server = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 icd_enforce_sit_slow_poll_limit = true
 chip_enable_icd_lit = true
 
diff --git a/examples/lit-icd-app/silabs/openthread.gni b/examples/lit-icd-app/silabs/openthread.gni
index 9d06737d622a2d..b12529c2cab39a 100644
--- a/examples/lit-icd-app/silabs/openthread.gni
+++ b/examples/lit-icd-app/silabs/openthread.gni
@@ -26,10 +26,12 @@ chip_enable_openthread = true
 openthread_external_platform =
     "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
 
+sl_enable_test_event_trigger = true
+
 # ICD Default configurations
 chip_enable_icd_server = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 icd_enforce_sit_slow_poll_limit = true
 chip_icd_report_on_active_mode = true
 chip_enable_icd_lit = true
diff --git a/examples/lock-app/asr/src/AppTask.cpp b/examples/lock-app/asr/src/AppTask.cpp
index a90d0013761324..4d359a4bc6eab3 100644
--- a/examples/lock-app/asr/src/AppTask.cpp
+++ b/examples/lock-app/asr/src/AppTask.cpp
@@ -32,6 +32,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
diff --git a/examples/lock-app/asr/src/DeviceCallbacks.cpp b/examples/lock-app/asr/src/DeviceCallbacks.cpp
index 8782f038f29677..c4670d59ea0125 100644
--- a/examples/lock-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/lock-app/asr/src/DeviceCallbacks.cpp
@@ -33,7 +33,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/lock-app/cc13x2x7_26x2x7/.gn b/examples/lock-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  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/BUILD.gn b/examples/lock-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 8cf4f38dc771f2..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/lock-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-  public_configs = [ ":lock_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("lock_app") {
-  output_name = "chip-${ti_simplelink_board}-lock-example.out"
-
-  sources = [
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/src/AppTask.cpp",
-    "${project_dir}/src/LockManager.cpp",
-    "${project_dir}/src/ZclCallbacks.cpp",
-    "${project_dir}/src/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/lock-app/lock-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":lock_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 7b056d2cab29b5..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,326 +0,0 @@
-# Matter Lock Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Lock Example Application](#matter-lock-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX lock example application provides a working demonstration of a
-connected door lock device. This uses the open-source Matter implementation and
-the Texas Instruments SimpleLink™ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The lock example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                            |
-| ------------------------------------------------ | ---------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | Change state to unlocked                 |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Change state to locked                   |
-| Left Button (`BTN-1`) Press (more than 1000 ms)  | Factory Reset                            |
-| Right Button (`BTN-2`) Press (more than 1000 ms) | BLE Advertisement (Enable/Disable)       |
-| Red & Green LED Blinking State                   | Lock state transition to locked/unlocked |
-| Red LED On State                                 | Lock state locked                        |
-| Red & Green LED Off State                        | Lock state unlocked                      |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-2`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** The example Doorlock cluster operations have the following format:
-
-```
-./chip-tool doorlock   <attribute-name> <attribute-values> <destination-id> <endpoint-id-ignored-for-group-commands>
-./chip-tool doorlock set-user <OperationType> <UserIndex> <UserName> <UserUniqueId> <UserStatus> <UserType> <CredentialRule> <destination-id> <endpoint-id-ignored-for-group-commands>
-./chip-tool <doorlock set-credential> <OperationType> <Credential> <CredentialData> <UserIndex> <UserStatus> <UserType> <destination-id> <endpoint-id-ignored-for-group-commands>
-```
-
-Send commands to the lock-app. Here are some example commands:
-
-Set a new user "`TST`" with user index of 1 with a default pin of 123456
-
-```
-./chip-tool doorlock set-user 0 1 `TST` 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
-./chip-tool doorlock set-credential 0 '{ "credentialType" : 1 , "credentialIndex" : 1 }' 123456 1 null null 1 1 --timedInteractionTimeoutMs 1000
-```
-
-Require a pin mode for lock operations:
-
-```
-./chip-tool doorlock write require-pinfor-remote-operation 1 1 1
-```
-
-Lock the Door
-
-```
-./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
-```
-
-Unlock the door
-
-```
-./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-2` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index b10e4def1a1a7c..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-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_detail_logging = false
-#chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/lock-app/cc13x2x7_26x2x7/build_overrides b/examples/lock-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg b/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 6e6a2562178da4..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h
deleted file mode 100644
index a818b21d641875..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#define ACTUATOR_MOVEMENT_PERIOD_MS 1000
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h
deleted file mode 100644
index dc4ce143338e1e..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } BoltLockEvent;
-
-        struct
-        {
-            uint8_t Action;
-            int32_t Actor;
-        } LockEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp
deleted file mode 100644
index 380b05e32ca668..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-
-#include <app/clusters/door-lock-server/door-lock-server.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-#include <app/util/attribute-storage.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-using namespace ::chip::app::Clusters::DoorLock;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-::Identify stIdentify = { 0, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (1)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (1)
-            ;
-    }
-    return ret;
-}
-
-void uiLocking(void)
-{
-    PLAT_LOG("Lock initiated");
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void uiLocked(void)
-{
-    PLAT_LOG("Lock completed");
-    LED_stopBlinking(sAppGreenHandle);
-    LED_setOff(sAppGreenHandle);
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-}
-
-void uiUnlocking(void)
-{
-    PLAT_LOG("Unlock initiated");
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void uiUnlocked(void)
-{
-    PLAT_LOG("Unlock completed");
-    LED_stopBlinking(sAppGreenHandle);
-    LED_setOff(sAppGreenHandle);
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOff(sAppRedHandle);
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (1)
-            ;
-    }
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (1)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (1)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    PlatformMgr().LockChipStack();
-    {
-        uint8_t numberOfCredentialsPerUser      = 0;
-        uint16_t numberOfUsers                  = 0;
-        uint8_t numberOfWeekdaySchedulesPerUser = 0;
-        uint8_t numberOfYeardaySchedulesPerUser = 0;
-        uint8_t numberOfHolidaySchedules        = 0;
-        chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;
-        EndpointId endpointId{ 1 };
-
-        if (!DoorLockServer::Instance().GetNumberOfCredentialsSupportedPerUser(endpointId, numberOfCredentialsPerUser))
-        {
-            numberOfCredentialsPerUser = 5;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfUserSupported(endpointId, numberOfUsers))
-        {
-            numberOfUsers = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfWeekDaySchedulesPerUserSupported(endpointId, numberOfWeekdaySchedulesPerUser))
-        {
-            numberOfWeekdaySchedulesPerUser = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfYearDaySchedulesPerUserSupported(endpointId, numberOfYeardaySchedulesPerUser))
-        {
-            numberOfYeardaySchedulesPerUser = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfHolidaySchedulesSupported(endpointId, numberOfHolidaySchedules))
-        {
-            numberOfHolidaySchedules = 10;
-        }
-
-        Attributes::LockState::Get(endpointId, state);
-        ret = LockMgr().Init(state,
-                             CC13X2_26X2DoorLock::LockInitParams::ParamBuilder()
-                                 .SetNumberOfUsers(numberOfUsers)
-                                 .SetNumberOfCredentialsPerUser(numberOfCredentialsPerUser)
-                                 .SetNumberOfWeekdaySchedulesPerUser(numberOfWeekdaySchedulesPerUser)
-                                 .SetNumberOfYeardaySchedulesPerUser(numberOfYeardaySchedulesPerUser)
-                                 .SetNumberOfHolidaySchedules(numberOfHolidaySchedules)
-                                 .GetLockParam());
-
-        if (state.Value() == DlLockState::kLocked)
-        {
-            uiLocked();
-        }
-        else
-        {
-            uiUnlocked();
-        }
-    }
-
-    PlatformMgr().UnlockChipStack();
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("LockMgr().Init() failed");
-        while (1)
-            ;
-    }
-
-    LockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    LockMgr().ReadConfigValues();
-
-    while (1)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(LockManager::Action_t aAction)
-{
-    if (aAction == LockManager::LOCK_ACTION)
-    {
-        uiLocking();
-    }
-    else if (aAction == LockManager::UNLOCK_ACTION)
-    {
-        uiUnlocking();
-    }
-}
-
-void AppTask::ActionCompleted(LockManager::Action_t aAction)
-{
-    if (aAction == LockManager::LOCK_ACTION)
-    {
-        uiLocked();
-    }
-    else if (aAction == LockManager::UNLOCK_ACTION)
-    {
-        uiUnlocked();
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (sAppEventQueue != NULL)
-    {
-        BaseType_t status;
-        if (xPortIsInsideInterrupt())
-        {
-            BaseType_t higherPrioTaskWoken = pdFALSE;
-            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
-
-#ifdef portYIELD_FROM_ISR
-            portYIELD_FROM_ISR(higherPrioTaskWoken);
-#elif portEND_SWITCHING_ISR // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-            portEND_SWITCHING_ISR(higherPrioTaskWoken);
-#else                       // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-#error "Must have portYIELD_FROM_ISR or portEND_SWITCHING_ISR"
-#endif // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-        }
-        else
-        {
-            status = xQueueSend(sAppEventQueue, aEvent, 1);
-        }
-
-        if (status != pdTRUE)
-        {
-            PLAT_LOG("Failed to post event to app task event queue");
-        }
-    }
-    else
-    {
-        PLAT_LOG("Event Queue is NULL should never happen");
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            LockMgr().InitiateAction(LockManager::UNLOCK_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            LockMgr().InitiateAction(LockManager::LOCK_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, 500, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        LED_setOff(sAppGreenHandle);
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h
deleted file mode 100644
index 7778fd5f2a5e1f..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "LockManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-// Application-defined error codes in the CHIP_ERROR space.
-#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
-#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
-#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
-#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
-#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
-#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
-#define APP_ERROR_ALLOCATION_FAILED CHIP_APPLICATION_ERROR(0x07)
-
-struct Identify;
-
-class AppTask
-{
-
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostLockActionRequest(int32_t aActor, LockManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    // should this be done by BoltLock Manager? I don't want to unravel this spaghetti quite yet
-    static void ActionInitiated(LockManager::Action_t aAction);
-    static void ActionCompleted(LockManager::Action_t aAction);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-    bool mSyncClusterToButtonAction;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp
deleted file mode 100644
index babc79cfc5b5f7..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "LockManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "platform/KeyValueStoreManager.h"
-#include <FreeRTOS.h>
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <cstring>
-#include <lib/support/logging/CHIPLogging.h>
-
-LockManager LockManager::sLock;
-
-TimerHandle_t sLockTimer;
-
-using namespace CC13X2_26X2DoorLock::LockInitParams;
-using namespace chip::DeviceLayer::PersistedStorage;
-
-// persisted storage keys
-const char LockUser[]         = "a/lu";
-const char Credential[]       = "a/c";
-const char LockUserName[]     = "a/lun";
-const char CredentialData[]   = "a/cd";
-const char UserCredentials[]  = "a/uc";
-const char WeekDaySchedules[] = "a/wds";
-const char YearDaySchedules[] = "a/yds";
-const char HolidaySchedules[] = "a/hs";
-
-CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state, LockParam lockParam)
-{
-
-    LockParams = lockParam;
-
-    if (LockParams.numberOfUsers > kMaxUsers)
-    {
-        PLAT_LOG("Max number of users is greater than %d, the maximum amount of users currently supported on this platform",
-                 kMaxUsers);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfCredentialsPerUser > kMaxCredentialsPerUser)
-    {
-        PLAT_LOG("Max number of credentials per user is greater than %d, the maximum amount of users currently supported on this "
-                 "platform",
-                 kMaxCredentialsPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfWeekdaySchedulesPerUser > kMaxWeekdaySchedulesPerUser)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxWeekdaySchedulesPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfYeardaySchedulesPerUser > kMaxYeardaySchedulesPerUser)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxYeardaySchedulesPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfHolidaySchedules > kMaxHolidaySchedules)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxHolidaySchedules);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    // Create FreeRTOS sw timer for lock timer.
-    sLockTimer = xTimerCreate("lockTmr",        // Just a text name, not used by the RTOS kernel
-                              1,                // == default timer period (mS)
-                              false,            // no timer reload (==one-shot)
-                              (void *) this,    // init timer id = lock obj context
-                              TimerEventHandler // timer callback handler
-    );
-
-    if (sLockTimer == NULL)
-    {
-        PLAT_LOG("sLockTimer timer create failed");
-        return APP_ERROR_CREATE_TIMER_FAILED;
-    }
-
-    if (state.Value() == DlLockState::kUnlocked)
-    {
-        mState = kState_UnlockCompleted;
-    }
-    else
-    {
-        mState = kState_LockCompleted;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-bool LockManager::IsValidUserIndex(uint16_t userIndex)
-{
-    return (userIndex < kMaxUsers);
-}
-
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
-{
-    if (CredentialTypeEnum::kProgrammingPIN == type)
-    {
-        return (0 == credentialIndex); // 0 is required index for Programming PIN
-    }
-    return (credentialIndex < kMaxCredentialsPerUser);
-}
-
-bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
-}
-
-bool LockManager::IsValidYeardayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxYeardaySchedulesPerUser);
-}
-
-bool LockManager::IsValidHolidayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxHolidaySchedules);
-}
-
-bool LockManager::ReadConfigValues()
-{
-    size_t outLen;
-    KeyValueStoreMgr().Get(LockUser, reinterpret_cast<void *>(&mLockUsers),
-                           sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), &outLen);
-
-    KeyValueStoreMgr().Get(Credential, reinterpret_cast<void *>(&mLockCredentials),
-                           sizeof(EmberAfPluginDoorLockCredentialInfo) * ArraySize(mLockCredentials), &outLen);
-
-    KeyValueStoreMgr().Get(LockUserName, reinterpret_cast<void *>(mUserNames), sizeof(mUserNames), &outLen);
-
-    KeyValueStoreMgr().Get(CredentialData, reinterpret_cast<void *>(mCredentialData), sizeof(mCredentialData), &outLen);
-
-    KeyValueStoreMgr().Get(UserCredentials, reinterpret_cast<void *>(mCredentials),
-                           sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, &outLen);
-
-    KeyValueStoreMgr().Get(WeekDaySchedules, reinterpret_cast<void *>(mWeekdaySchedule),
-                           sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
-                               LockParams.numberOfUsers,
-                           &outLen);
-
-    KeyValueStoreMgr().Get(YearDaySchedules, reinterpret_cast<void *>(mYeardaySchedule),
-                           sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser *
-                               LockParams.numberOfUsers,
-                           &outLen);
-
-    KeyValueStoreMgr().Get(HolidaySchedules, reinterpret_cast<void *>(&(mHolidaySchedule)),
-                           sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules, &outLen);
-
-    return true;
-}
-
-void LockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool LockManager::InitiateAction(Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Turn Lock/Unlock Action only when the previous one is complete.
-    if (mState == kState_LockCompleted && aAction == UNLOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_UnlockInitiated;
-    }
-    else if (mState == kState_UnlockCompleted && aAction == LOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_LockInitiated;
-    }
-
-    if (action_initiated)
-    {
-
-        StartTimer(ACTUATOR_MOVEMENT_PERIOD_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction);
-        }
-    }
-
-    return action_initiated;
-}
-
-void LockManager::StartTimer(uint32_t aTimeoutMs)
-{
-    if (xTimerIsTimerActive(sLockTimer))
-    {
-        PLAT_LOG("app timer already started!");
-        CancelTimer();
-    }
-
-    // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
-    // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLockTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
-    {
-        PLAT_LOG("sLockTimer timer start() failed");
-    }
-}
-
-void LockManager::CancelTimer(void)
-{
-    if (xTimerStop(sLockTimer, 0) == pdFAIL)
-    {
-        PLAT_LOG("sLockTimer stop() failed");
-    }
-}
-
-void LockManager::TimerEventHandler(TimerHandle_t xTimer)
-{
-    // Get lock obj context from timer id.
-    LockManager * lock = static_cast<LockManager *>(pvTimerGetTimerID(xTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sLockTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                  = AppEvent::kEventType_AppEvent;
-    event.BoltLockEvent.Context = lock;
-    event.Handler               = ActuatorMovementTimerEventHandler;
-    GetAppTask().PostEvent(&event);
-}
-
-void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    LockManager * lock = static_cast<LockManager *>(aEvent->BoltLockEvent.Context);
-
-    if (lock->mState == kState_LockInitiated)
-    {
-        lock->mState    = kState_LockCompleted;
-        actionCompleted = LOCK_ACTION;
-        DoorLockServer::Instance().SetLockState(1, DlLockState::kLocked);
-    }
-    else if (lock->mState == kState_UnlockInitiated)
-    {
-        lock->mState    = kState_UnlockCompleted;
-        actionCompleted = UNLOCK_ACTION;
-        DoorLockServer::Instance().SetLockState(1, DlLockState::kUnlocked);
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (lock->mActionCompleted_CB)
-        {
-            lock->mActionCompleted_CB(actionCompleted);
-        }
-    }
-}
-
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
-{
-    return checkPin(endpointId, DlLockState::kLocked, pin, err);
-}
-
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
-{
-    return checkPin(endpointId, DlLockState::kUnlocked, pin, err);
-}
-
-bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
-{
-    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
-
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
-
-    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", endpointId, userIndex);
-
-    const auto & userInDb = mLockUsers[userIndex];
-
-    user.userStatus = userInDb.userStatus;
-    if (UserStatusEnum::kAvailable == user.userStatus)
-    {
-        ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
-        return true;
-    }
-
-    user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
-    user.userUniqueId   = userInDb.userUniqueId;
-    user.userType       = userInDb.userType;
-    user.credentialRule = userInDb.credentialRule;
-    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
-    // source to Matter
-    user.creationSource     = DlAssetSource::kMatterIM;
-    user.createdBy          = userInDb.createdBy;
-    user.modificationSource = DlAssetSource::kMatterIM;
-    user.lastModifiedBy     = userInDb.lastModifiedBy;
-
-    ChipLogDetail(Zcl,
-                  "Found occupied user "
-                  "[endpoint=%d,name=\"%.*s\",credentialsCount=%u,uniqueId=%lx,type=%u,credentialRule=%u,"
-                  "createdBy=%d,lastModifiedBy=%d]",
-                  endpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
-                  user.userUniqueId, to_underlying(user.userType), to_underlying(user.credentialRule), user.createdBy,
-                  user.lastModifiedBy);
-
-    return true;
-}
-
-bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
-                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
-{
-    ChipLogProgress(Zcl,
-                    "Door Lock App: LockManager::SetUser "
-                    "[endpoint=%d,userIndex=%d,creator=%d,modifier=%d,userName=%s,uniqueId=%ld "
-                    "userStatus=%u,userType=%u,credentialRule=%u,credentials=%p,totalCredentials=%u]",
-                    endpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
-                    to_underlying(usertype), to_underlying(credentialRule), credentials, totalCredentials);
-
-    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
-
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
-
-    auto & userInStorage = mLockUsers[userIndex];
-
-    if (userName.size() > DOOR_LOCK_MAX_USER_NAME_SIZE)
-    {
-        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", endpointId, userIndex);
-        return false;
-    }
-
-    if (totalCredentials > LockParams.numberOfCredentialsPerUser)
-    {
-        ChipLogError(Zcl, "Cannot set user - total number of credentials is too big [endpoint=%d,index=%d,totalCredentials=%u]",
-                     endpointId, userIndex, totalCredentials);
-        return false;
-    }
-
-    chip::Platform::CopyString(mUserNames[userIndex], userName);
-    userInStorage.userName       = chip::CharSpan(mUserNames[userIndex], userName.size());
-    userInStorage.userUniqueId   = uniqueId;
-    userInStorage.userStatus     = userStatus;
-    userInStorage.userType       = usertype;
-    userInStorage.credentialRule = credentialRule;
-    userInStorage.lastModifiedBy = modifier;
-    userInStorage.createdBy      = creator;
-
-    for (size_t i = 0; i < totalCredentials; ++i)
-    {
-        mCredentials[userIndex][i]                 = credentials[i];
-        mCredentials[userIndex][i].credentialType  = CredentialTypeEnum::kPin;
-        mCredentials[userIndex][i].credentialIndex = i + 1;
-    }
-
-    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
-
-    // Save user information in NVM flash
-    KeyValueStoreMgr().Put(LockUser, reinterpret_cast<const void *>(&mLockUsers),
-                           sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
-
-    KeyValueStoreMgr().Put(UserCredentials, reinterpret_cast<const void *>(mCredentials),
-                           sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
-
-    KeyValueStoreMgr().Put(LockUserName, reinterpret_cast<const void *>(mUserNames), sizeof(mUserNames));
-
-    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", endpointId, userIndex);
-
-    return true;
-}
-
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                                EmberAfPluginDoorLockCredentialInfo & credential)
-{
-
-    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
-                            false); // programming pin index is only index allowed to contain 0
-    }
-    else
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
-    }
-
-    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
-                    to_underlying(credentialType), credentialIndex);
-
-    const auto & credentialInStorage = mLockCredentials[credentialIndex];
-
-    credential.status = credentialInStorage.status;
-    ChipLogDetail(Zcl, "CredentialStatus: %d, CredentialIndex: %d ", (int) credential.status, credentialIndex);
-
-    if (DlCredentialStatus::kAvailable == credential.status)
-    {
-        ChipLogDetail(Zcl, "Found unoccupied credential ");
-        return true;
-    }
-    credential.credentialType = credentialInStorage.credentialType;
-    credential.credentialData = credentialInStorage.credentialData;
-    credential.createdBy      = credentialInStorage.createdBy;
-    credential.lastModifiedBy = credentialInStorage.lastModifiedBy;
-    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
-    // source to Matter
-    credential.creationSource     = DlAssetSource::kMatterIM;
-    credential.modificationSource = DlAssetSource::kMatterIM;
-
-    ChipLogDetail(Zcl, "Found occupied credential [type=%u,dataSize=%u]", to_underlying(credential.credentialType),
-                  credential.credentialData.size());
-
-    return true;
-}
-
-bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                                const chip::ByteSpan & credentialData)
-{
-
-    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
-                            false); // programming pin index is only index allowed to contain 0
-    }
-    else
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
-    }
-
-    ChipLogProgress(Zcl,
-                    "Door Lock App: LockManager::SetCredential "
-                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%d,modifier=%d]",
-                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size(), creator, modifier);
-
-    auto & credentialInStorage = mLockCredentials[credentialIndex];
-
-    credentialInStorage.status         = credentialStatus;
-    credentialInStorage.credentialType = credentialType;
-    credentialInStorage.createdBy      = creator;
-    credentialInStorage.lastModifiedBy = modifier;
-
-    memcpy(mCredentialData[credentialIndex], credentialData.data(), credentialData.size());
-    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData[credentialIndex], credentialData.size() };
-
-    // Save credential information in NVM flash
-    KeyValueStoreMgr().Put(Credential, reinterpret_cast<const void *>(&mLockCredentials),
-                           sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser);
-
-    KeyValueStoreMgr().Put(CredentialData, reinterpret_cast<const void *>(&mCredentialData), sizeof(mCredentialData));
-
-    ChipLogProgress(Zcl, "Successfully set the credential [credentialType=%u]", to_underlying(credentialType));
-
-    return true;
-}
-
-DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         EmberAfPluginDoorLockWeekDaySchedule & schedule)
-{
-
-    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    weekdayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
-                                         uint8_t endHour, uint8_t endMinute)
-{
-
-    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    weekdayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
-
-    scheduleInStorage.schedule.daysMask    = daysMask;
-    scheduleInStorage.schedule.startHour   = startHour;
-    scheduleInStorage.schedule.startMinute = startMinute;
-    scheduleInStorage.schedule.endHour     = endHour;
-    scheduleInStorage.schedule.endMinute   = endMinute;
-    scheduleInStorage.status               = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(WeekDaySchedules, reinterpret_cast<const void *>(mWeekdaySchedule),
-                           sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
-                               LockParams.numberOfUsers);
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                         EmberAfPluginDoorLockYearDaySchedule & schedule)
-{
-    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    yearDayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
-{
-    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    yearDayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
-
-    scheduleInStorage.schedule.localStartTime = localStartTime;
-    scheduleInStorage.schedule.localEndTime   = localEndTime;
-    scheduleInStorage.status                  = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(YearDaySchedules, reinterpret_cast<const void *>(mYeardaySchedule),
-                           sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser *
-                               LockParams.numberOfUsers);
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
-                                         EmberAfPluginDoorLockHolidaySchedule & schedule)
-{
-    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-
-    holidayIndex--;
-
-    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
-{
-    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-
-    holidayIndex--;
-
-    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
-
-    scheduleInStorage.schedule.localStartTime = localStartTime;
-    scheduleInStorage.schedule.localEndTime   = localEndTime;
-    scheduleInStorage.schedule.operatingMode  = operatingMode;
-    scheduleInStorage.status                  = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(HolidaySchedules, reinterpret_cast<const void *>(&(mHolidaySchedule)),
-                           sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules);
-
-    return DlStatus::kSuccess;
-}
-
-const char * LockManager::lockStateToString(DlLockState lockState) const
-{
-    switch (lockState)
-    {
-    case DlLockState::kNotFullyLocked:
-        return "Not Fully Locked";
-    case DlLockState::kLocked:
-        return "Locked";
-    case DlLockState::kUnlocked:
-        return "Unlocked";
-    case DlLockState::kUnlatched:
-        return "Unlatched";
-    case DlLockState::kUnknownEnumValue:
-        break;
-    default:
-        break;
-    }
-
-    return "Unknown";
-}
-
-bool LockManager::checkPin(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                           OperationErrorEnum & err)
-{
-    // Assume pin is required until told otherwise
-    bool requirePin = true;
-    chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::Get(endpointId, &requirePin);
-
-    // If a pin code is not given
-    if (!pin.HasValue())
-    {
-        ChipLogDetail(Zcl, "Door Lock App: PIN code is not specified [endpointId=%d]", endpointId);
-
-        // If a pin code is not required
-        if (!requirePin)
-        {
-            ChipLogDetail(Zcl, "Door Lock App: setting door lock state to \"%s\" [endpointId=%d]", lockStateToString(lockState),
-                          endpointId);
-
-            return true;
-        }
-
-        ChipLogError(Zcl, "Door Lock App: PIN code is not specified, but it is required [endpointId=%d]", endpointId);
-
-        err = OperationErrorEnum::kInvalidCredential;
-        DoorLockServer::Instance().HandleWrongCodeEntry(endpointId);
-        return false;
-    }
-
-    // Check the PIN code
-    for (uint8_t i = 0; i < kMaxCredentials; i++)
-    {
-        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
-            mLockCredentials[i].status == DlCredentialStatus::kAvailable)
-        {
-            continue;
-        }
-
-        if (mLockCredentials[i].credentialData.data_equal(pin.Value()))
-        {
-            ChipLogDetail(Zcl,
-                          "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
-                          lockStateToString(lockState), endpointId);
-
-            return true;
-        }
-    }
-
-    ChipLogDetail(Zcl,
-                  "Door Lock App: specified PIN code was not found in the database, ignoring command to set lock state to \"%s\" "
-                  "[endpointId=%d]",
-                  lockStateToString(lockState), endpointId);
-
-    err = OperationErrorEnum::kInvalidCredential;
-    DoorLockServer::Instance().HandleWrongCodeEntry(endpointId);
-    return false;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h b/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h
deleted file mode 100644
index 74129260bd9172..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <app/clusters/door-lock-server/door-lock-server.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-#include "timers.h" // provides FreeRTOS timer support
-
-#include <lib/core/CHIPError.h>
-
-struct WeekDaysScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockWeekDaySchedule schedule;
-};
-
-struct YearDayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockYearDaySchedule schedule;
-};
-
-struct HolidayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockHolidaySchedule schedule;
-};
-
-namespace CC13X2_26X2DoorLock {
-namespace ResourceRanges {
-// Used to size arrays
-static constexpr uint16_t kMaxUsers                  = 10;
-static constexpr uint8_t kMaxCredentialsPerUser      = 10;
-static constexpr uint8_t kMaxWeekdaySchedulesPerUser = 10;
-static constexpr uint8_t kMaxYeardaySchedulesPerUser = 10;
-static constexpr uint8_t kMaxHolidaySchedules        = 10;
-static constexpr uint8_t kMaxCredentialSize          = 8;
-
-// Indices received for user/credential/schedules are 1-indexed
-static constexpr uint8_t kStartIndexValue = 1;
-
-static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
-} // namespace ResourceRanges
-
-namespace LockInitParams {
-
-struct LockParam
-{
-    // Read from zap attributes
-    uint16_t numberOfUsers                  = 0;
-    uint8_t numberOfCredentialsPerUser      = 0;
-    uint8_t numberOfWeekdaySchedulesPerUser = 0;
-    uint8_t numberOfYeardaySchedulesPerUser = 0;
-    uint8_t numberOfHolidaySchedules        = 0;
-};
-
-class ParamBuilder
-{
-public:
-    ParamBuilder & SetNumberOfUsers(uint16_t numberOfUsers)
-    {
-        lockParam_.numberOfUsers = numberOfUsers;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfCredentialsPerUser(uint8_t numberOfCredentialsPerUser)
-    {
-        lockParam_.numberOfCredentialsPerUser = numberOfCredentialsPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfWeekdaySchedulesPerUser(uint8_t numberOfWeekdaySchedulesPerUser)
-    {
-        lockParam_.numberOfWeekdaySchedulesPerUser = numberOfWeekdaySchedulesPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfYeardaySchedulesPerUser(uint8_t numberOfYeardaySchedulesPerUser)
-    {
-        lockParam_.numberOfYeardaySchedulesPerUser = numberOfYeardaySchedulesPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfHolidaySchedules(uint8_t numberOfHolidaySchedules)
-    {
-        lockParam_.numberOfHolidaySchedules = numberOfHolidaySchedules;
-        return *this;
-    }
-    LockParam GetLockParam() { return lockParam_; }
-
-private:
-    LockParam lockParam_;
-};
-
-} // namespace LockInitParams
-} // namespace CC13X2_26X2DoorLock
-
-using namespace ::chip;
-using namespace CC13X2_26X2DoorLock::ResourceRanges;
-
-class LockManager
-{
-public:
-    enum Action_t
-    {
-        LOCK_ACTION = 0,
-        UNLOCK_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_LockInitiated = 0,
-        kState_LockCompleted,
-        kState_UnlockInitiated,
-        kState_UnlockCompleted,
-    } State;
-
-    CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                    CC13X2_26X2DoorLock::LockInitParams::LockParam lockParam);
-    bool InitiateAction(Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
-
-    bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
-    bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
-                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
-
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                       EmberAfPluginDoorLockCredentialInfo & credential);
-
-    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                       const chip::ByteSpan & credentialData);
-
-    DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                EmberAfPluginDoorLockWeekDaySchedule & schedule);
-
-    DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
-
-    DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                EmberAfPluginDoorLockYearDaySchedule & schedule);
-
-    DlStatus SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                uint32_t localStartTime, uint32_t localEndTime);
-
-    DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
-
-    DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, OperatingModeEnum operatingMode);
-
-    bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
-    bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
-    bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
-    bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
-
-    bool checkPin(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                  OperationErrorEnum & err);
-    const char * lockStateToString(DlLockState lockState) const;
-
-    bool ReadConfigValues();
-
-private:
-    friend LockManager & LockMgr();
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    void CancelTimer(void);
-    void StartTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t xTimer);
-    static void AutoLockTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    EmberAfPluginDoorLockUserInfo mLockUsers[kMaxUsers];
-    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kMaxCredentials];
-    WeekDaysScheduleInfo mWeekdaySchedule[kMaxUsers][kMaxWeekdaySchedulesPerUser];
-    YearDayScheduleInfo mYeardaySchedule[kMaxUsers][kMaxYeardaySchedulesPerUser];
-    HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
-
-    char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
-    uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
-
-    static LockManager sLock;
-    CC13X2_26X2DoorLock::LockInitParams::LockParam LockParams;
-};
-
-inline LockManager & LockMgr()
-{
-    return LockManager::sLock;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
deleted file mode 100644
index 1777326dc4d017..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "LockManager.h"
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/data-model/Nullable.h>
-#include <lib/core/DataModelTypes.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip::app::Clusters;
-using namespace ::chip::DeviceLayer::Internal;
-using ::chip::app::DataModel::Nullable;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-
-    if (clusterId == DoorLock::Id && attributeId == DoorLock::Attributes::LockState::Id)
-    {
-        ChipLogProgress(Zcl, "Door lock cluster: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-    }
-}
-
-/** @brief DoorLock Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfDoorLockClusterInitCallback(EndpointId endpoint) {}
-
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                            const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                            OperationErrorEnum & err)
-{
-    ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
-    bool status = LockMgr().Lock(endpointId, pinCode, err);
-    if (status == true)
-    {
-        LockMgr().InitiateAction(LockManager::LOCK_ACTION);
-    }
-    return status;
-}
-
-bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                              const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                              OperationErrorEnum & err)
-{
-    ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
-    bool status = LockMgr().Unlock(endpointId, pinCode, err);
-    if (status == true)
-    {
-        LockMgr().InitiateAction(LockManager::UNLOCK_ACTION);
-    }
-
-    return status;
-}
-
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                                        EmberAfPluginDoorLockCredentialInfo & credential)
-{
-    return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
-}
-
-bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                        chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
-{
-    return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
-                                   credentialData);
-}
-
-bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
-{
-    return LockMgr().GetUser(endpointId, userIndex, user);
-}
-
-bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
-                                  chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
-                                  const CredentialStruct * credentials, size_t totalCredentials)
-{
-
-    return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
-                             credentials, totalCredentials);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          EmberAfPluginDoorLockWeekDaySchedule & schedule)
-{
-    return LockMgr().GetWeekdaySchedule(endpointId, weekdayIndex, userIndex, schedule);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                          EmberAfPluginDoorLockYearDaySchedule & schedule)
-{
-    return LockMgr().GetYeardaySchedule(endpointId, yearDayIndex, userIndex, schedule);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
-                                          EmberAfPluginDoorLockHolidaySchedule & holidaySchedule)
-{
-    return LockMgr().GetHolidaySchedule(endpointId, holidayIndex, holidaySchedule);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
-                                          uint8_t endHour, uint8_t endMinute)
-{
-    return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
-                                        endMinute);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
-{
-    return LockMgr().SetYeardaySchedule(endpointId, yearDayIndex, userIndex, status, localStartTime, localEndTime);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
-{
-    return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp
deleted file mode 100644
index 4fdb88703acab6..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc600)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (1)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (1)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (1)
-        ;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
index 535a414e588178..b8b43d6ec6a218 100644
--- a/examples/lock-app/cc13x4_26x4/README.md
+++ b/examples/lock-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
index 1b65334c47f886..ec6a1d048c0276 100644
--- a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
+++ b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
@@ -267,7 +267,7 @@ int AppTask::Init()
 
         Attributes::LockState::Get(endpointId, state);
         ret = LockMgr().Init(state,
-                             CC13X2_26X2DoorLock::LockInitParams::ParamBuilder()
+                             CC13X4_26X4DoorLock::LockInitParams::ParamBuilder()
                                  .SetNumberOfUsers(numberOfUsers)
                                  .SetNumberOfCredentialsPerUser(numberOfCredentialsPerUser)
                                  .SetNumberOfWeekdaySchedulesPerUser(numberOfWeekdaySchedulesPerUser)
diff --git a/examples/lock-app/cc13x4_26x4/src/LockManager.cpp b/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
index 57cd1964dd92a1..5f4d6e2ff1c578 100644
--- a/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
+++ b/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
@@ -31,7 +31,7 @@ LockManager LockManager::sLock;
 
 TimerHandle_t sLockTimer;
 
-using namespace CC13X2_26X2DoorLock::LockInitParams;
+using namespace CC13X4_26X4DoorLock::LockInitParams;
 using namespace chip::DeviceLayer::PersistedStorage;
 
 // persisted storage keys
diff --git a/examples/lock-app/cc13x4_26x4/src/LockManager.h b/examples/lock-app/cc13x4_26x4/src/LockManager.h
index 74129260bd9172..13b30b2eccadb0 100644
--- a/examples/lock-app/cc13x4_26x4/src/LockManager.h
+++ b/examples/lock-app/cc13x4_26x4/src/LockManager.h
@@ -48,7 +48,7 @@ struct HolidayScheduleInfo
     EmberAfPluginDoorLockHolidaySchedule schedule;
 };
 
-namespace CC13X2_26X2DoorLock {
+namespace CC13X4_26X4DoorLock {
 namespace ResourceRanges {
 // Used to size arrays
 static constexpr uint16_t kMaxUsers                  = 10;
@@ -111,10 +111,10 @@ class ParamBuilder
 };
 
 } // namespace LockInitParams
-} // namespace CC13X2_26X2DoorLock
+} // namespace CC13X4_26X4DoorLock
 
 using namespace ::chip;
-using namespace CC13X2_26X2DoorLock::ResourceRanges;
+using namespace CC13X4_26X4DoorLock::ResourceRanges;
 
 class LockManager
 {
@@ -136,7 +136,7 @@ class LockManager
     } State;
 
     CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                    CC13X2_26X2DoorLock::LockInitParams::LockParam lockParam);
+                    CC13X4_26X4DoorLock::LockInitParams::LockParam lockParam);
     bool InitiateAction(Action_t aAction);
 
     typedef void (*Callback_fn_initiated)(Action_t);
@@ -212,7 +212,7 @@ class LockManager
     CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
-    CC13X2_26X2DoorLock::LockInitParams::LockParam LockParams;
+    CC13X4_26X4DoorLock::LockInitParams::LockParam LockParams;
 };
 
 inline LockManager & LockMgr()
diff --git a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
index 356888b992fde2..7f2a1c87ec6d9f 100644
--- a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
+++ b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
@@ -21,6 +21,7 @@
 #include <platform/PlatformManager.h>
 
 #include <LockManager.h>
+#include <string>
 #include <utility>
 
 using chip::to_underlying;
diff --git a/examples/lock-app/lock-common/include/LockManager.h b/examples/lock-app/lock-common/include/LockManager.h
index eea60d568ef06b..71dcf6f02dc072 100644
--- a/examples/lock-app/lock-common/include/LockManager.h
+++ b/examples/lock-app/lock-common/include/LockManager.h
@@ -22,8 +22,6 @@
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <cstdint>
 
-#include <app/util/af.h>
-
 class LockManager
 {
 public:
diff --git a/examples/lock-app/lock-common/src/ZCLDoorLockCallbacks.cpp b/examples/lock-app/lock-common/src/ZCLDoorLockCallbacks.cpp
index 2b0b8810f4ff6e..a67c51bfc90428 100644
--- a/examples/lock-app/lock-common/src/ZCLDoorLockCallbacks.cpp
+++ b/examples/lock-app/lock-common/src/ZCLDoorLockCallbacks.cpp
@@ -18,7 +18,6 @@
 
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/data-model/Nullable.h>
-#include <app/util/af.h>
 #include <lib/core/DataModelTypes.h>
 
 #include "LockManager.h"
diff --git a/examples/lock-app/silabs/build_for_wifi_args.gni b/examples/lock-app/silabs/build_for_wifi_args.gni
index 25c5a2435d332f..84596e9258fbcc 100644
--- a/examples/lock-app/silabs/build_for_wifi_args.gni
+++ b/examples/lock-app/silabs/build_for_wifi_args.gni
@@ -24,7 +24,7 @@ app_data_model = "${chip_root}/examples/lock-app/lock-common"
 # ICD Default configurations
 chip_enable_icd_server = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 600  # 10min Idle Mode Duration
diff --git a/examples/lock-app/silabs/openthread.gni b/examples/lock-app/silabs/openthread.gni
index 3bfa566596aeaf..8d1c75d267238c 100644
--- a/examples/lock-app/silabs/openthread.gni
+++ b/examples/lock-app/silabs/openthread.gni
@@ -28,7 +28,7 @@ openthread_external_platform =
 # ICD Default configurations
 chip_enable_icd_server = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
 sl_ot_idle_interval_ms = 5000  # 5s Idle Intervals
diff --git a/examples/lock-app/telink/CMakeLists.txt b/examples/lock-app/telink/CMakeLists.txt
index 58a9e4fb5bab8f..ee3b67b82eb15d 100755
--- a/examples/lock-app/telink/CMakeLists.txt
+++ b/examples/lock-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-lock-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-lock-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,7 +32,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/lock-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -76,10 +42,15 @@ target_sources(app PRIVATE
                src/LockSettingsStorage.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/lock-app/telink/include/AppConfig.h b/examples/lock-app/telink/include/AppConfig.h
index cb4b0c2b488d86..756ff5b3bfa15f 100644
--- a/examples/lock-app/telink/include/AppConfig.h
+++ b/examples/lock-app/telink/include/AppConfig.h
@@ -37,11 +37,5 @@
 #define APP_DEFAULT_YEARDAY_SCHEDULE_PER_USER_COUNT 5
 #define APP_DEFAULT_HOLYDAY_SCHEDULE_PER_USER_COUNT 5
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/lock-app/telink/include/AppTask.h b/examples/lock-app/telink/include/AppTask.h
index fb0f4113d4af9f..cec70dd8bb6c8f 100644
--- a/examples/lock-app/telink/include/AppTask.h
+++ b/examples/lock-app/telink/include/AppTask.h
@@ -37,6 +37,8 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkButtons(ButtonManager & buttonManager);
+    void LinkLeds(LedManager & ledManager);
 
     static void LockActionEventHandler(AppEvent * event);
     static void LockStateChanged(LockManager::State_t state);
diff --git a/examples/lock-app/telink/prj.conf b/examples/lock-app/telink/prj.conf
index 738b4090c8be80..2ec882cd327251 100755
--- a/examples/lock-app/telink/prj.conf
+++ b/examples/lock-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
 
diff --git a/examples/lock-app/telink/src/AppTask.cpp b/examples/lock-app/telink/src/AppTask.cpp
index 19748544f8d15d..46e34db66710e5 100644
--- a/examples/lock-app/telink/src/AppTask.cpp
+++ b/examples/lock-app/telink/src/AppTask.cpp
@@ -18,6 +18,7 @@
 
 #include "AppTask.h"
 #include "ButtonManager.h"
+#include "LEDManager.h"
 #include <LockManager.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/data-model/Nullable.h>
@@ -33,33 +34,14 @@ using namespace ::chip::DeviceLayer;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace TelinkDoorLock::LockInitParams;
 
-namespace {
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-LEDWidget sLockLED;
-#endif
-} // namespace
-
 AppTask AppTask::sAppTask;
-static const struct gpio_dt_spec sLockJammedInputDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_5), gpios);
-static const struct gpio_dt_spec sLockStatusInputDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_6), gpios);
-Button sLockJammedAction;
-Button sLockStatusChangedAction;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(LockActionEventHandler);
-#endif
-    sLockJammedAction.Configure(&sLockJammedInputDt, LockJammedEventHandler);
-    sLockStatusChangedAction.Configure(&sLockStatusInputDt, LockStateEventHandler);
-    ButtonManagerInst().AddButton(sLockJammedAction);
-    ButtonManagerInst().AddButton(sLockStatusChangedAction);
     InitCommonParts();
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sLockLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios));
-    sLockLED.Set(LockMgr().IsLocked());
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, LockMgr().IsLocked());
 
     chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;
     chip::EndpointId endpointId{ kExampleEndpointId };
@@ -167,45 +149,31 @@ void AppTask::LockStateChanged(LockManager::State_t state)
     {
     case LockManager::State_t::kState_LockInitiated:
         LOG_INF("Callback: Lock action initiated");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Blink(50, 50);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, 50, 50);
         break;
     case LockManager::State_t::kState_LockCompleted:
         LOG_INF("Callback: Lock action completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Set(true);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, true);
         break;
     case LockManager::State_t::kState_UnlockInitiated:
         LOG_INF("Callback: Unlock action initiated");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Blink(50, 50);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, 50, 50);
         break;
     case LockManager::State_t::kState_UnlockCompleted:
         LOG_INF("Callback: Unlock action completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Set(false);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, false);
         break;
     case LockManager::State_t::kState_UnlatchInitiated:
         LOG_INF("Callback: Unbolt action initiated");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Blink(75, 25);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, 75, 25);
         break;
     case LockManager::State_t::kState_UnlatchCompleted:
         LOG_INF("Callback: Unbolt action completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Blink(25, 75);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, 25, 75);
         break;
     case LockManager::State_t::kState_NotFulyLocked:
         LOG_INF("Callback: Lock not fully locked. Unexpected state");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sLockLED.Blink(10, 90);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, 10, 90);
         break;
     }
 }
@@ -257,3 +225,21 @@ void AppTask::LockStateActionHandler(AppEvent * aEvent)
     /* Generating Door Lock Status event */
     DoorLockServer::Instance().SetDoorState(kExampleEndpointId, mDoorState);
 }
+
+void AppTask::LinkButtons(ButtonManager & buttonManager)
+{
+    buttonManager.addCallback(FactoryResetButtonEventHandler, 0, true);
+    buttonManager.addCallback(ExampleActionButtonEventHandler, 1, true);
+    buttonManager.addCallback(LockJammedEventHandler, 2, true);
+    buttonManager.addCallback(LockStateEventHandler, 3, true);
+}
+
+void AppTask::LinkLeds(LedManager & ledManager)
+{
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+    ledManager.linkLed(LedManager::EAppLed_Status, 0);
+    ledManager.linkLed(LedManager::EAppLed_App0, 1);
+#else
+    ledManager.linkLed(LedManager::EAppLed_App0, 0);
+#endif // CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+}
diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
index 234ee940b6d9db..381d3b43f7b763 100644
--- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
+++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/clusters/ota-provider/ota-provider-delegate.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <credentials/FabricTable.h>
 #include <crypto/RandUtils.h>
 #include <lib/core/TLV.h>
diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md
index 7c10b157e4f8db..aef1e40ab7e566 100644
--- a/examples/ota-requestor-app/ameba/README.md
+++ b/examples/ota-requestor-app/ameba/README.md
@@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities.
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:42
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
 
 -   Setup build environment:
 
diff --git a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
index bd53af45ed4f61..61223f9997d69e 100644
--- a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
+++ b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
@@ -29,7 +29,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/ota-requestor-app/ameba/main/chipinterface.cpp b/examples/ota-requestor-app/ameba/main/chipinterface.cpp
index 841e95c1720df8..dfac5c97f2ecf6 100644
--- a/examples/ota-requestor-app/ameba/main/chipinterface.cpp
+++ b/examples/ota-requestor-app/ameba/main/chipinterface.cpp
@@ -24,7 +24,7 @@
 
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 
 #include <lib/core/ErrorStr.h>
 #include <platform/Ameba/AmebaConfig.h>
diff --git a/examples/ota-requestor-app/asr/src/AppTask.cpp b/examples/ota-requestor-app/asr/src/AppTask.cpp
index 56910e92019f55..78c4ec47b8be1f 100755
--- a/examples/ota-requestor-app/asr/src/AppTask.cpp
+++ b/examples/ota-requestor-app/asr/src/AppTask.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/ASR/NetworkCommissioningDriver.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/ota-requestor-app/asr/src/DeviceCallbacks.cpp b/examples/ota-requestor-app/asr/src/DeviceCallbacks.cpp
index a1fa28e413f647..2ad405f665b671 100644
--- a/examples/ota-requestor-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/ota-requestor-app/asr/src/DeviceCallbacks.cpp
@@ -30,7 +30,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp
index c3ee1d5803b207..e375ded305e1dc 100644
--- a/examples/ota-requestor-app/esp32/main/main.cpp
+++ b/examples/ota-requestor-app/esp32/main/main.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "DeviceCallbacks.h"
-#include "app/util/af.h"
 #include "esp_heap_caps_init.h"
 #include "esp_log.h"
 #include "esp_netif.h"
@@ -26,6 +25,7 @@
 #include "freertos/task.h"
 #include "nvs_flash.h"
 #include <app/server/OnboardingCodesUtil.h>
+#include <app/util/endpoint-config-api.h>
 #include <common/CHIPDeviceManager.h>
 #include <common/Esp32AppServer.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
diff --git a/examples/ota-requestor-app/genio/src/AppTask.cpp b/examples/ota-requestor-app/genio/src/AppTask.cpp
index 50d1d080a5b7b4..ff78e703e4be81 100644
--- a/examples/ota-requestor-app/genio/src/AppTask.cpp
+++ b/examples/ota-requestor-app/genio/src/AppTask.cpp
@@ -21,6 +21,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 
 #include <assert.h>
 
diff --git a/examples/ota-requestor-app/linux/main.cpp b/examples/ota-requestor-app/linux/main.cpp
index 0cc7271618b400..80b16222c61912 100644
--- a/examples/ota-requestor-app/linux/main.cpp
+++ b/examples/ota-requestor-app/linux/main.cpp
@@ -22,7 +22,6 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorUserConsent.h>
 #include <app/clusters/ota-requestor/ExtendedOTARequestorDriver.h>
-#include <app/util/af.h>
 #include <platform/Linux/OTAImageProcessorImpl.h>
 
 using chip::BDXDownloader;
diff --git a/examples/ota-requestor-app/telink/CMakeLists.txt b/examples/ota-requestor-app/telink/CMakeLists.txt
index 31be460d8a346c..62ed3c85deb51a 100644
--- a/examples/ota-requestor-app/telink/CMakeLists.txt
+++ b/examples/ota-requestor-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-ota-requestor-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-ota-requestor-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,17 +32,23 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/ota-requestor-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/ota-requestor-app/telink/include/AppConfig.h b/examples/ota-requestor-app/telink/include/AppConfig.h
index 05e62e8b612725..70d3394a96d697 100644
--- a/examples/ota-requestor-app/telink/include/AppConfig.h
+++ b/examples/ota-requestor-app/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- OTA Requestor Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 1
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 1
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
index 9538841fbc7230..ca5d0a9cff26a0 100755
--- a/examples/ota-requestor-app/telink/prj.conf
+++ b/examples/ota-requestor-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32776 == 0x8008 (example ota-requestor-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32776
 
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/.gn b/examples/persistent-storage/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index 3d48789e30ab3d..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn b/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 0a8930dff1adb2..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/persistent-storage/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-
-  defines = []
-  if (is_debug) {
-    defines += [ "BUILD_RELEASE=0" ]
-  } else {
-    defines += [ "BUILD_RELEASE=1" ]
-  }
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "${project_dir}/chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("persistent_storage") {
-  output_name = "chip-${ti_simplelink_board}-persistent_storage.out"
-
-  sources = [
-    "${project_dir}/../KeyValueStorageTest.cpp",
-    "${project_dir}/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/src/lib",
-  ]
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/..",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":persistent_storage" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 87e4add6701eca..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,255 +0,0 @@
-# Matter Persistent Storage Example Application
-
-An example test application showing the persistent storage system for
-[Matter][matter] on the Texas Instruments CC13X2_26X2 family of Wireless MCUs.
-
----
-
--   [Matter Persistent Storage Application](#matter-persistent-storage-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-This example serves to test the key value storage implementation and API and
-offers information on proper usage of the KVS system.
-
-This example is enabled to build for CC2652R7 devices. This upcoming devices are
-currently not yet in full production. For more information on device
-availability or early access to an engineering build of our Matter-enabled SDK,
-please reach out [here][ti_cc13x2_26x2_r7_matter_request].
-
-## Device UI
-
-Over the debug UART connection you should see the output:
-
-```
-Running Tests:
-TestEmptyString(): PASSED
-TestString(): PASSED
-TestUint32(): PASSED
-TestArray(): PASSED
-TestStruct(): PASSED
-TestUpdateValue(): PASSED
-TestMultiRead(): PASSED
-```
-
-This indicates a successful run of the test suite.
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   An engineering SDK from TI is required. Please request access for it
-    [here][ti_cc13x2_26x2_r7_matter_request].
-
-    -   Follow the default installation instructions when executing the
-        installer.
-
-    -   The version of OpenThread used in this repository is newer than the one
-        packaged with the TI SDK. Check the following section for a list of
-        changes needed.
-
--   Download and install [SysConfig][sysconfig].
-
-    -   This may have already been installed with your SimpleLink SDK install.
-
--   If you have installed different versions, the build defaults will need to be
-    changed to reflect this in
-    `${chip_root}/examples/build_overrides/ti_simplelink_sdk.gni`.
-
--   Install Python 3.8 for the GN build system:
-
-    ```
-    # Linux
-    $ sudo apt-get install python3.8 python3.8-distutils python3.8-dev python3.8-venv
-    # Distutils listed due to a package manager error on Ubuntu 18.04
-
-    ```
-
-    -   You will have to ensure that the default version of Python 3 is Python
-        3.8.
-
-        -   Check python3 version:
-
-        ```
-        $ python3 --version
-        Python 3.8.0
-        ```
-
-        -   If it is not Python 3.8:
-
-        ```
-        $ sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
-        ```
-
-            -   This may affect your environment in other ways if there was a
-                specific dependency on the prior python3 version (e.g. apt).
-                After completing the build process for this example, you can
-                revert the python3 version, for instance:
-
-                ```
-                $ sudo update-alternatives --config python3
-                There are 2 choices for the alternative python3 (providing /usr/bin/python3).
-
-                  Selection    Path                Priority    Status
-                -------------------------------------------------------------
-                  0            /usr/bin/python3.8   1          auto mode
-                  1            /usr/bin/python3.6   1          manual mode
-                * 2            /usr/bin/python3.8   1          manual mode
-
-                Press <enter> to keep the current choice[*], or type selection number: 1
-                update-alternatives: using /usr/bin/python3.6 to provide /usr/bin/python3 (python3) in manual mode
-                ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2
-    $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\""
-    $ ninja -C out/debug
-
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_cc13x2_26x2_r7_matter_request]: https://ti.com/chip_sdk
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni b/examples/persistent-storage/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index ad8a3f88326649..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# use -Os instead of -Og
-#optimize_debug_level = "s"
-#lwip_debug = false
-
-# BLE options
-chip_config_network_layer_ble = true
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides b/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg b/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h
deleted file mode 100644
index 77f2cc37421d36..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13x2_26x2LogInit(void);
-void cc13x2_26x2Log(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13x2_26x2Log(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 2bcf489732b312..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-
-// Security and Authentication enabled for release build.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#else // development build
-
-// Security and Authentication disabled for development build.
-// For convenience, enable CHIP Security Test Mode and disable the requirement for
-// authentication in various protocols.
-// WARNING: These options make it possible to circumvent basic CHIP security functionality,
-// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-#endif // BUILD_RELEASE
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- *
- * 0xFFF1: Test vendor.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- *
- * 0x8009: example persistent-storage
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8009
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- *
- * A string identifying the software version running on the device.
- * CHIP currently expects the software version to be in the format
- * {MAJOR_VERSION}.0d{MINOR_VERSION}
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "1.0d1"
-#endif
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h
deleted file mode 100644
index 4079b251280ddc..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
-
-// Disable the Nordic-supplied OpenThread logging facilities and use
-// the facilities provided by the CHIP Device Layer
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 1
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp b/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp
deleted file mode 100644
index 15e439fddb667b..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "KeyValueStorageTest.h"
-#include <AppConfig.h>
-
-#include <FreeRTOS.h>
-#include <task.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/NVS.h>
-#include <ti/drivers/UART.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xf000)
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-
-static TaskHandle_t sTestTaskHandle;
-void TestTask(void * pvParameter)
-{
-    cc13x2_26x2LogInit();
-
-    chip::DeviceLayer::Internal::CC13X2_26X2Config().Init();
-
-    while (true)
-    {
-        PLAT_LOG("Running Tests:");
-        chip::RunKvsTest();
-        vTaskDelay(60 * configTICK_RATE_HZ); // Run every minute
-    }
-}
-
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    NVS_init();
-
-    UART_init();
-
-    // Run tests
-    xTaskCreate(TestTask, "Test", 2048, NULL, 1, &sTestTaskHandle);
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index c9bd9f82ce7a35..49c7de27831809 100644
--- a/examples/pigweed-app/ameba/README.md
+++ b/examples/pigweed-app/ameba/README.md
@@ -31,11 +31,11 @@ following features are available:
 
 -   Pull docker image:
 
-          $ docker pull ghcr.io/project-chip/chip-build-ameba:42
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:47
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:42
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:47
 
 -   Setup build environment:
 
diff --git a/examples/placeholder/linux/InteractiveServer.cpp b/examples/placeholder/linux/InteractiveServer.cpp
index daebcb6dfc6cfa..10d82ba5a902bc 100644
--- a/examples/placeholder/linux/InteractiveServer.cpp
+++ b/examples/placeholder/linux/InteractiveServer.cpp
@@ -19,10 +19,14 @@
 #include "InteractiveServer.h"
 
 #include <json/json.h>
+#include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/Base64.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/logging/LogV.h>
 
+#include <string>
+#include <vector>
+
 using namespace chip::DeviceLayer;
 
 namespace {
diff --git a/examples/placeholder/linux/include/static-supported-modes-manager.h b/examples/placeholder/linux/include/static-supported-modes-manager.h
index ef90de38697f4c..b4ce50b8cd49a3 100644
--- a/examples/placeholder/linux/include/static-supported-modes-manager.h
+++ b/examples/placeholder/linux/include/static-supported-modes-manager.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-select-server/supported-modes-manager.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 
diff --git a/examples/placeholder/linux/include/static-supported-temperature-levels.h b/examples/placeholder/linux/include/static-supported-temperature-levels.h
index 3fdce87e109317..9698df8c094cc8 100644
--- a/examples/placeholder/linux/include/static-supported-temperature-levels.h
+++ b/examples/placeholder/linux/include/static-supported-temperature-levels.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 
 namespace chip {
diff --git a/examples/placeholder/linux/src/bridged-actions-stub.cpp b/examples/placeholder/linux/src/bridged-actions-stub.cpp
index 5df0ba11f74011..ea6e824738a857 100644
--- a/examples/placeholder/linux/src/bridged-actions-stub.cpp
+++ b/examples/placeholder/linux/src/bridged-actions-stub.cpp
@@ -19,6 +19,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/examples/platform/cc13x2_26x2/BUILD.gn b/examples/platform/cc13x2_26x2/BUILD.gn
deleted file mode 100644
index 06beceb9d75d01..00000000000000
--- a/examples/platform/cc13x2_26x2/BUILD.gn
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-
-config("chip_examples_project_config") {
-  include_dirs = [ "project_include" ]
-}
-
-source_set("openthread_core_config_cc13x2_26x2_chip_examples") {
-  sources = [ "project_include/OpenThreadConfig.h" ]
-  public_configs = [ ":chip_examples_project_config" ]
-}
-
-config("attestation-credentials-config") {
-  include_dirs = [ "${chip_root}" ]
-
-  defines = [ "CC13X2_26X2_ATTESTATION_CREDENTIALS" ]
-}
-
-source_set("cc13x2_26x2-attestation-credentials") {
-  sources = [
-    "CC13X2_26X2DeviceAttestationCreds.cpp",
-    "CC13X2_26X2DeviceAttestationCreds.h",
-  ]
-
-  public_deps = [
-    "${chip_root}/src/credentials",
-    "${chip_root}/src/platform:platform_base",
-  ]
-
-  public_configs = [ ":attestation-credentials-config" ]
-}
diff --git a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp b/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp
deleted file mode 100644
index aa3469b030f4c7..00000000000000
--- a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#include "CC13X2_26X2DeviceAttestationCreds.h"
-#include <crypto/CHIPCryptoPAL.h>
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/Span.h>
-
-extern uint32_t __attestation_credentials_base;
-
-namespace chip {
-namespace Credentials {
-namespace CC13X2_26X2 {
-
-namespace {
-typedef struct
-{
-    const uint32_t len;
-    uint8_t const * data;
-} data_ptr;
-
-typedef struct
-{
-    data_ptr dac_priv_key;
-    data_ptr dac_pub_key;
-    data_ptr dac_cert;
-    data_ptr pai_cert;
-} factoryData;
-
-const uint8_t gDacPrivKey[] = {
-    0x50, 0x5a, 0x21, 0x1d, 0xbd, 0xa8, 0x71, 0x33, 0x0d, 0x63, 0x5d, 0xa3, 0xb0, 0x7e, 0xb1, 0xc5,
-    0x08, 0x8a, 0x8f, 0xc7, 0x01, 0x24, 0xfb, 0xb3, 0x3e, 0x93, 0xd5, 0x06, 0x05, 0x82, 0xc7, 0xc5,
-};
-
-const uint8_t gDacPubKey[] = {
-    0x04, 0xc5, 0x65, 0xfd, 0xad, 0xfd, 0x16, 0xdd, 0x62, 0xe4, 0x3f, 0x19, 0x60, 0xb9, 0x93, 0xbb, 0x57,
-    0x2c, 0xfd, 0xd8, 0x1f, 0x6d, 0x71, 0x67, 0x67, 0x1b, 0x77, 0x45, 0xdc, 0xbe, 0x6f, 0x65, 0xaf, 0x66,
-    0x5a, 0x1d, 0x93, 0x1c, 0x05, 0xb9, 0xf9, 0xa3, 0xe9, 0x45, 0x66, 0x85, 0x60, 0x2c, 0x05, 0xc6, 0x96,
-    0x46, 0xb8, 0xf7, 0x59, 0x98, 0xdb, 0xaa, 0x68, 0x7a, 0x5c, 0x56, 0x49, 0x02, 0xda,
-};
-
-const uint8_t gDacCert[] = {
-    0x30, 0x82, 0x01, 0xf7, 0x30, 0x82, 0x01, 0x9d, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x46, 0x88, 0xeb, 0x94, 0xad, 0x32,
-    0xb2, 0xe4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x4d, 0x31, 0x1f, 0x30, 0x1d, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x16, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d,
-    0x65, 0x6e, 0x74, 0x20, 0x50, 0x41, 0x49, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c,
-    0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2,
-    0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x36, 0x32, 0x38, 0x31, 0x34,
-    0x32, 0x33, 0x34, 0x33, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39,
-    0x5a, 0x30, 0x52, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1b, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20,
-    0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x30, 0x30, 0x30, 0x31,
-    0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31,
-    0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30,
-    0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-    0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xc5, 0x65, 0xfd, 0xad, 0xfd, 0x16, 0xdd, 0x62, 0xe4, 0x3f, 0x19, 0x60, 0xb9, 0x93,
-    0xbb, 0x57, 0x2c, 0xfd, 0xd8, 0x1f, 0x6d, 0x71, 0x67, 0x67, 0x1b, 0x77, 0x45, 0xdc, 0xbe, 0x6f, 0x65, 0xaf, 0x66, 0x5a, 0x1d,
-    0x93, 0x1c, 0x05, 0xb9, 0xf9, 0xa3, 0xe9, 0x45, 0x66, 0x85, 0x60, 0x2c, 0x05, 0xc6, 0x96, 0x46, 0xb8, 0xf7, 0x59, 0x98, 0xdb,
-    0xaa, 0x68, 0x7a, 0x5c, 0x56, 0x49, 0x02, 0xda, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01,
-    0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x07, 0x80,
-    0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x9b, 0x40, 0x60, 0x6f, 0x9e, 0x04, 0x7f, 0xb8, 0x60, 0x78,
-    0x8e, 0x3d, 0xc1, 0x12, 0xd7, 0x5e, 0x87, 0x95, 0x77, 0x68, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16,
-    0x80, 0x14, 0x43, 0x34, 0x57, 0x12, 0xba, 0x2c, 0x87, 0xef, 0x25, 0x49, 0x7b, 0x11, 0xd7, 0x98, 0x58, 0x9b, 0x84, 0x35, 0x7f,
-    0x88, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x21, 0x00,
-    0xb9, 0x28, 0xf9, 0x3e, 0xe3, 0x87, 0xef, 0x3e, 0x00, 0x72, 0x88, 0x22, 0x84, 0xbd, 0x8a, 0xdd, 0x5c, 0xd6, 0xd0, 0x55, 0x81,
-    0xbf, 0xcc, 0x55, 0x17, 0xcf, 0x9e, 0x9b, 0xcd, 0xd4, 0x37, 0xda, 0x02, 0x20, 0x10, 0x07, 0x9c, 0xcf, 0x7f, 0x1f, 0x2d, 0xda,
-    0x46, 0xac, 0xe9, 0x67, 0xae, 0x5b, 0xe9, 0x66, 0xe7, 0xf2, 0x8a, 0xdf, 0xa0, 0x28, 0xb8, 0xf8, 0x7f, 0x93, 0x9e, 0xd4, 0x15,
-    0x8d, 0xc0, 0xf8,
-};
-
-const uint8_t gPaiCert[] = {
-    0x30, 0x82, 0x01, 0xdc, 0x30, 0x82, 0x01, 0x81, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7f, 0x7e, 0xf3, 0xdb, 0x08, 0xa3,
-    0x8f, 0x68, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x30, 0x31, 0x18, 0x30, 0x16, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50, 0x41, 0x41,
-    0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46,
-    0x31, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x36, 0x32, 0x38, 0x31, 0x34, 0x32, 0x33, 0x34, 0x33, 0x5a, 0x18, 0x0f, 0x39,
-    0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x4d, 0x31, 0x1f, 0x30, 0x1d, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x16, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d,
-    0x65, 0x6e, 0x74, 0x20, 0x50, 0x41, 0x49, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c,
-    0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2,
-    0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02,
-    0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x42, 0x93, 0x55, 0x77, 0x35, 0x35,
-    0x15, 0xce, 0xfa, 0x8f, 0x0e, 0x30, 0xe2, 0x34, 0x7e, 0x90, 0xee, 0xd6, 0xfd, 0x51, 0x5b, 0xe8, 0x82, 0xd1, 0xbc, 0xba, 0x74,
-    0x83, 0xd7, 0xff, 0x6e, 0xf4, 0xde, 0xdf, 0x98, 0xf7, 0xf7, 0x4f, 0x17, 0x42, 0x1d, 0xe5, 0x45, 0x0c, 0xff, 0xfb, 0x3e, 0x7f,
-    0x6d, 0x4f, 0x62, 0x28, 0x53, 0x41, 0x14, 0xfb, 0xb8, 0x5c, 0x2d, 0x52, 0xd1, 0x82, 0xb6, 0x6a, 0xa3, 0x66, 0x30, 0x64, 0x30,
-    0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x00, 0x30, 0x0e,
-    0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e,
-    0x04, 0x16, 0x04, 0x14, 0x43, 0x34, 0x57, 0x12, 0xba, 0x2c, 0x87, 0xef, 0x25, 0x49, 0x7b, 0x11, 0xd7, 0x98, 0x58, 0x9b, 0x84,
-    0x35, 0x7f, 0x88, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x6a, 0xfd, 0x22, 0x77, 0x1f,
-    0x51, 0x1f, 0xec, 0xbf, 0x16, 0x41, 0x97, 0x67, 0x10, 0xdc, 0xdc, 0x31, 0xa1, 0x71, 0x7e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86,
-    0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49, 0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xff, 0x25, 0xf1, 0xd1, 0x54, 0xc3, 0x13,
-    0x7e, 0x0e, 0x08, 0x6d, 0x82, 0xab, 0x0b, 0x11, 0xb5, 0x66, 0x18, 0x39, 0xb7, 0x12, 0xb1, 0x34, 0x2c, 0x6c, 0xde, 0x94, 0xfb,
-    0xe3, 0x18, 0xa9, 0x2b, 0x02, 0x21, 0x00, 0x92, 0xe2, 0x81, 0xf9, 0x8a, 0x2f, 0xcc, 0x14, 0xcd, 0xf4, 0x07, 0x50, 0xd2, 0x80,
-    0xd7, 0xdf, 0xea, 0x3f, 0x4d, 0xa4, 0x6f, 0x35, 0x7a, 0xfe, 0xac, 0xb8, 0x9b, 0x26, 0x77, 0x06, 0xd2, 0x8a,
-};
-
-const factoryData gFactoryData =
-{
-    .dac_priv_key = {
-        .len = sizeof(gDacPrivKey),
-        .data = gDacPrivKey,
-    },
-    .dac_pub_key = {
-        .len = sizeof(gDacPubKey),
-        .data = gDacPubKey,
-    },
-    .dac_cert = {
-        .len = sizeof(gDacCert),
-        .data = gDacCert,
-    },
-    .pai_cert = {
-        .len = sizeof(gPaiCert),
-        .data = gPaiCert,
-    },
-};
-
-CHIP_ERROR LoadKeypairFromRaw(ByteSpan private_key, ByteSpan public_key, Crypto::P256Keypair & keypair)
-{
-    Crypto::P256SerializedKeypair serialized_keypair;
-    ReturnErrorOnFailure(serialized_keypair.SetLength(private_key.size() + public_key.size()));
-    memcpy(serialized_keypair.Bytes(), public_key.data(), public_key.size());
-    memcpy(serialized_keypair.Bytes() + public_key.size(), private_key.data(), private_key.size());
-    return keypair.Deserialize(serialized_keypair);
-}
-
-class DeviceAttestationCredsCC13X2_26X2 : public DeviceAttestationCredentialsProvider
-{
-
-public:
-    CHIP_ERROR GetCertificationDeclaration(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer) override;
-    CHIP_ERROR GetDeviceAttestationCert(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR GetProductAttestationIntermediateCert(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR SignWithDeviceAttestationKey(const ByteSpan & message_to_sign, MutableByteSpan & out_buffer) override;
-
-private:
-    factoryData const * mFactoryData = &gFactoryData;
-};
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetCertificationDeclaration(MutableByteSpan & out_buffer)
-{
-    //-> format_version = 1
-    //-> vendor_id = 0xFFF1
-    //-> product_id_array = [ 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007, 0x8008, 0x8009, 0x800A, 0x800B,
-    // 0x800C, 0x800D, 0x800E, 0x800F, 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017, 0x8018, 0x8019, 0x801A,
-    // 0x801B, 0x801C, 0x801D, 0x801E, 0x801F, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 0x8026, 0x8027, 0x8028, 0x8029,
-    // 0x802A, 0x802B, 0x802C, 0x802D, 0x802E, 0x802F, 0x8030, 0x8031, 0x8032, 0x8033, 0x8034, 0x8035, 0x8036, 0x8037, 0x8038,
-    // 0x8039, 0x803A, 0x803B, 0x803C, 0x803D, 0x803E, 0x803F, 0x8040, 0x8041, 0x8042, 0x8043, 0x8044, 0x8045, 0x8046, 0x8047,
-    // 0x8048, 0x8049, 0x804A, 0x804B, 0x804C, 0x804D, 0x804E, 0x804F, 0x8050, 0x8051, 0x8052, 0x8053, 0x8054, 0x8055, 0x8056,
-    // 0x8057, 0x8058, 0x8059, 0x805A, 0x805B, 0x805C, 0x805D, 0x805E, 0x805F, 0x8060, 0x8061, 0x8062, 0x8063 ]
-    //-> device_type_id = 0x0016
-    //-> certificate_id = "ZIG20142ZB330003-24"
-    //-> security_level = 0
-    //-> security_information = 0
-    //-> version_number = 0x2694
-    //-> certification_type = 0
-    //-> dac_origin_vendor_id is not present
-    //-> dac_origin_product_id is not present
-    static const uint8_t kCdForAllExamples[] = {
-        0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
-        0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
-        0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x62,
-        0x04, 0x82, 0x01, 0x5e, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf1, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80,
-        0x05, 0x02, 0x80, 0x05, 0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08,
-        0x80, 0x05, 0x09, 0x80, 0x05, 0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05,
-        0x0f, 0x80, 0x05, 0x10, 0x80, 0x05, 0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80,
-        0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05, 0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c,
-        0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05, 0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05,
-        0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05, 0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80,
-        0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05, 0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30,
-        0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05, 0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05,
-        0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05, 0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80,
-        0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05, 0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44,
-        0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05, 0x49, 0x80, 0x05, 0x4a, 0x80, 0x05,
-        0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05, 0x50, 0x80, 0x05, 0x51, 0x80,
-        0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05, 0x57, 0x80, 0x05, 0x58,
-        0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05, 0x5e, 0x80, 0x05,
-        0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16, 0x2c, 0x04,
-        0x13, 0x5a, 0x49, 0x47, 0x32, 0x30, 0x31, 0x34, 0x32, 0x5a, 0x42, 0x33, 0x33, 0x30, 0x30, 0x30, 0x33, 0x2d, 0x32, 0x34,
-        0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x25, 0x07, 0x94, 0x26, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7d, 0x30, 0x7b, 0x02, 0x01,
-        0x03, 0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04,
-        0xf3, 0x71, 0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08,
-        0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x47, 0x30, 0x45, 0x02, 0x20, 0x24, 0xe5, 0xd1, 0xf4, 0x7a, 0x7d,
-        0x7b, 0x0d, 0x20, 0x6a, 0x26, 0xef, 0x69, 0x9b, 0x7c, 0x97, 0x57, 0xb7, 0x2d, 0x46, 0x90, 0x89, 0xde, 0x31, 0x92, 0xe6,
-        0x78, 0xc7, 0x45, 0xe7, 0xf6, 0x0c, 0x02, 0x21, 0x00, 0xf8, 0xaa, 0x2f, 0xa7, 0x11, 0xfc, 0xb7, 0x9b, 0x97, 0xe3, 0x97,
-        0xce, 0xda, 0x66, 0x7b, 0xae, 0x46, 0x4e, 0x2b, 0xd3, 0xff, 0xdf, 0xc3, 0xcc, 0xed, 0x7a, 0xa8, 0xca, 0x5f, 0x4c, 0x1a,
-        0x7c,
-    };
-
-    return CopySpanToMutableSpan(ByteSpan{ kCdForAllExamples }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer)
-{
-    out_firmware_info_buffer.reduce_size(0);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetDeviceAttestationCert(MutableByteSpan & out_buffer)
-{
-    ReturnErrorCodeIf(out_buffer.size() < mFactoryData->dac_cert.len, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(!mFactoryData->dac_cert.data, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
-
-    return CopySpanToMutableSpan(ByteSpan{ mFactoryData->dac_cert.data, mFactoryData->dac_cert.len }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetProductAttestationIntermediateCert(MutableByteSpan & out_buffer)
-{
-    ReturnErrorCodeIf(out_buffer.size() < mFactoryData->pai_cert.len, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(!mFactoryData->pai_cert.data, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
-
-    return CopySpanToMutableSpan(ByteSpan{ mFactoryData->pai_cert.data, mFactoryData->pai_cert.len }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::SignWithDeviceAttestationKey(const ByteSpan & message_to_sign,
-                                                                           MutableByteSpan & out_buffer)
-{
-    Crypto::P256ECDSASignature signature;
-    Crypto::P256Keypair keypair;
-
-    VerifyOrReturnError(!out_buffer.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(!message_to_sign.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_buffer.size() >= signature.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    // In a non-exemplary implementation, the public key is not needed here. It is used here merely because
-    // Crypto::P256Keypair is only (currently) constructable from raw keys if both private/public keys are present.
-    ReturnErrorOnFailure(LoadKeypairFromRaw(ByteSpan(mFactoryData->dac_priv_key.data, mFactoryData->dac_priv_key.len),
-                                            ByteSpan(mFactoryData->dac_pub_key.data, mFactoryData->dac_pub_key.len), keypair));
-    ReturnErrorOnFailure(keypair.ECDSA_sign_msg(message_to_sign.data(), message_to_sign.size(), signature));
-
-    return CopySpanToMutableSpan(ByteSpan{ signature.ConstBytes(), signature.Length() }, out_buffer);
-}
-
-} // namespace
-
-DeviceAttestationCredentialsProvider * GetCC13X2_26X2DacProvider()
-{
-    static DeviceAttestationCredsCC13X2_26X2 dac_provider;
-    return &dac_provider;
-}
-
-} // namespace CC13X2_26X2
-} // namespace Credentials
-} // namespace chip
diff --git a/examples/platform/cc13x2_26x2/args.gni b/examples/platform/cc13x2_26x2/args.gni
deleted file mode 100644
index ff1f8159857fc6..00000000000000
--- a/examples/platform/cc13x2_26x2/args.gni
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni")
-
-openthread_config_file = "<OpenThreadConfig.h>"
-openthread_core_config_deps = [ "${chip_root}/examples/platform/cc13x2_26x2:openthread_core_config_cc13x2_26x2_chip_examples" ]
-
-chip_ble_project_config_include = "<CHIPProjectConfig.h>"
-chip_device_project_config_include = "<CHIPProjectConfig.h>"
-chip_project_config_include = "<CHIPProjectConfig.h>"
-chip_inet_project_config_include = "<CHIPProjectConfig.h>"
-chip_system_project_config_include = "<CHIPProjectConfig.h>"
diff --git a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
deleted file mode 100644
index dea83922096149..00000000000000
--- a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-#ifdef DeviceFamily_CC13X2_CC26X2
-
-/* Number of message buffers reduced to fit into CC26x2x3 RAM */
-#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22
-
-#endif // DeviceFamily_CC13X2_CC26X2
-
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
-// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_SERVICE_DISCOVERY_ENABLE 1
-
-#define OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE 0
-#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 0
-#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
-
-#define OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS 0
-// TCP disabled until OpenThread has a GN/Ninja build for the tcplp library
-#define OPENTHREAD_CONFIG_TCP_ENABLE 0
-
-#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3
-
-// #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1
-// #define OPENTHREAD_CONFIG_COAP_API_ENABLE 1
-#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
-#define OPENTHREAD_CONFIG_COAP_API_ENABLE 0
-#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
-#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_DIAG_ENABLE 0
-#define OPENTHREAD_CONFIG_DNSSD_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_DUA_ENABLE 1
-#define OPENTHREAD_CONFIG_LINK_RAW_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_FILTER_ENABLE 0
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_ACK_TIMEOUT_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_CSMA_BACKOFF_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_RETRANSMIT_ENABLE 1
-#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE 1
-#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE 1
-#define OPENTHREAD_CONFIG_MLR_ENABLE 1
-#define OPENTHREAD_CONFIG_NETDATA_PUBLISHER_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_AUTO_START_DEFAULT_MODE 1
-#define OPENTHREAD_CONFIG_SRP_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/platform/esp32/mode-support/static-supported-modes-manager.h b/examples/platform/esp32/mode-support/static-supported-modes-manager.h
index cdd79688c5212c..8d6bb3c665ff0c 100644
--- a/examples/platform/esp32/mode-support/static-supported-modes-manager.h
+++ b/examples/platform/esp32/mode-support/static-supported-modes-manager.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-select-server/supported-modes-manager.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
index c5591a1f129762..5991b9c6e27674 100644
--- a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
+++ b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
@@ -29,6 +29,7 @@
 #include <cinttypes>
 #include <stdio.h>
 #include <string.h>
+#include <string>
 
 #define ECHO_TEST_TXD (CONFIG_EXAMPLE_UART_TXD)
 #define ECHO_TEST_RXD (CONFIG_EXAMPLE_UART_RXD)
diff --git a/examples/platform/linux/ControllerShellCommands.cpp b/examples/platform/linux/ControllerShellCommands.cpp
index 49b1e20dc97eb8..aefbb3fafa4353 100644
--- a/examples/platform/linux/ControllerShellCommands.cpp
+++ b/examples/platform/linux/ControllerShellCommands.cpp
@@ -124,8 +124,8 @@ static CHIP_ERROR display(bool printHeader)
         else
         {
             streamer_printf(sout, "  Entry %d instanceName=%s host=%s longDiscriminator=%d vendorId=%d productId=%d\r\n", i,
-                            next->commissionData.instanceName, next->resolutionData.hostName,
-                            next->commissionData.longDiscriminator, next->commissionData.vendorId, next->commissionData.productId);
+                            next->nodeData.instanceName, next->resolutionData.hostName, next->nodeData.longDiscriminator,
+                            next->nodeData.vendorId, next->nodeData.productId);
         }
     }
 
diff --git a/examples/platform/linux/NamedPipeCommands.cpp b/examples/platform/linux/NamedPipeCommands.cpp
index 9ec28b012188c3..c77165e9000cf8 100644
--- a/examples/platform/linux/NamedPipeCommands.cpp
+++ b/examples/platform/linux/NamedPipeCommands.cpp
@@ -26,6 +26,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <string>
+
 static constexpr const size_t kChipEventCmdBufSize = 256;
 
 CHIP_ERROR NamedPipeCommands::Start(std::string & path, NamedPipeCommandDelegate * delegate)
diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp
index 8bf5c0b7f4e4b4..083b8ddf8dd420 100644
--- a/examples/platform/linux/Options.cpp
+++ b/examples/platform/linux/Options.cpp
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 
 #include "Options.h"
 
diff --git a/examples/platform/linux/system_rpc_server.cc b/examples/platform/linux/system_rpc_server.cc
index c4e45be56360a6..6323ad597d0cfe 100644
--- a/examples/platform/linux/system_rpc_server.cc
+++ b/examples/platform/linux/system_rpc_server.cc
@@ -32,6 +32,8 @@
 #include "pw_rpc_system_server/rpc_server.h"
 #include "pw_stream/socket_stream.h"
 
+#include <string>
+
 namespace pw::rpc::system_server {
 namespace {
 
diff --git a/examples/platform/openiotsdk/app/openiotsdk_platform.cpp b/examples/platform/openiotsdk/app/openiotsdk_platform.cpp
index 29662d6e8df4e9..761b5488eeab9b 100644
--- a/examples/platform/openiotsdk/app/openiotsdk_platform.cpp
+++ b/examples/platform/openiotsdk/app/openiotsdk_platform.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <DeviceInfoProviderImpl.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/openiotsdk/Logging.h>
@@ -43,7 +44,6 @@
 #ifdef USE_CHIP_DATA_MODEL
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #endif // USE_CHIP_DATA_MODEL
diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index d8df720686ca4b..a6986db57d2b3e 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -45,6 +45,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
+#include <sl_cmsis_os2_common.h>
 
 #if CHIP_ENABLE_OPENTHREAD
 #include <platform/OpenThread/OpenThreadUtils.h>
@@ -78,7 +79,6 @@
 #ifndef APP_TASK_STACK_SIZE
 #define APP_TASK_STACK_SIZE (4096)
 #endif
-#define APP_TASK_PRIORITY 2
 #ifndef APP_EVENT_QUEUE_SIZE // Allow apps to define a different app queue size
 #define APP_EVENT_QUEUE_SIZE 10
 #endif
@@ -123,18 +123,18 @@ bool sHaveBLEConnections = false;
 constexpr uint32_t kLightTimerPeriod = static_cast<uint32_t>(pdMS_TO_TICKS(10));
 
 uint8_t sAppEventQueueBuffer[APP_EVENT_QUEUE_SIZE * sizeof(AppEvent)];
-StaticQueue_t sAppEventQueueStruct; // TODO abstract type for static controlblock
+osMessageQueue_t sAppEventQueueStruct;
 constexpr osMessageQueueAttr_t appEventQueueAttr = { .cb_mem  = &sAppEventQueueStruct,
-                                                     .cb_size = sizeof(sAppEventQueueBuffer),
+                                                     .cb_size = osMessageQueueCbSize,
                                                      .mq_mem  = sAppEventQueueBuffer,
                                                      .mq_size = sizeof(sAppEventQueueBuffer) };
 
 uint8_t appStack[APP_TASK_STACK_SIZE];
-StaticTask_t appTaskStruct; // TODO abstract type for static controlblock
+osThread_t appTaskControlBlock;
 constexpr osThreadAttr_t appTaskAttr = { .name       = APP_TASK_NAME,
                                          .attr_bits  = osThreadDetached,
-                                         .cb_mem     = &appTaskStruct,
-                                         .cb_size    = sizeof(appTaskStruct),
+                                         .cb_mem     = &appTaskControlBlock,
+                                         .cb_size    = osThreadCbSize,
                                          .stack_mem  = appStack,
                                          .stack_size = APP_TASK_STACK_SIZE,
                                          .priority   = osPriorityNormal };
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
index d41a4154697716..d85f10d0612ea1 100644
--- a/examples/platform/silabs/MatterConfig.cpp
+++ b/examples/platform/silabs/MatterConfig.cpp
@@ -21,8 +21,7 @@
 #include "BaseApplication.h"
 #include "OTAConfig.h"
 #include <MatterConfig.h>
-
-#include <FreeRTOS.h>
+#include <cmsis_os2.h>
 
 #include <mbedtls/platform.h>
 
@@ -55,10 +54,13 @@ static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeys
 #endif
 
 #include "SilabsDeviceDataProvider.h"
-#include "SilabsTestEventTriggerDelegate.h"
 #include <app/InteractionModelEngine.h>
 #include <app/TimerDelegates.h>
 
+#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+#include "SilabsTestEventTriggerDelegate.h" // nogncheck
+#endif
+
 #if CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED
 #include <app/reporting/SynchronizedReportSchedulerImpl.h>
 #else
@@ -80,27 +82,16 @@ static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeys
 
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 
-#include "FreeRTOSConfig.h"
-#include "event_groups.h"
-#include "task.h"
-
 /**********************************************************
  * Defines
  *********************************************************/
 
-#define MAIN_TASK_STACK_SIZE (1024 * 5)
-#define MAIN_TASK_PRIORITY (configMAX_PRIORITIES - 1)
-
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::Credentials::Silabs;
 using namespace chip::DeviceLayer::Silabs;
 
-TaskHandle_t main_Task;
-volatile int apperror_cnt;
-static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
-
 #if CHIP_ENABLE_OPENTHREAD
 #include <inet/EndPointStateOpenThread.h>
 #include <openthread/cli.h>
@@ -156,7 +147,20 @@ CHIP_ERROR SilabsMatterConfig::InitOpenThread(void)
 #endif // CHIP_ENABLE_OPENTHREAD
 
 namespace {
-void application_start(void * unused)
+
+constexpr uint32_t kMainTaskStackSize = (1024 * 5);
+// Task is dynamically allocated with max priority. This task gets deleted once the inits are completed.
+constexpr osThreadAttr_t kMainTaskAttr = { .name       = "main",
+                                           .attr_bits  = osThreadDetached,
+                                           .cb_mem     = NULL,
+                                           .cb_size    = 0U,
+                                           .stack_mem  = NULL,
+                                           .stack_size = kMainTaskStackSize,
+                                           .priority   = osPriorityRealtime7 };
+osThreadId_t sMainTaskHandle;
+static chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
+void ApplicationStart(void * unused)
 {
     CHIP_ERROR err = SilabsMatterConfig::InitMatter(BLE_DEV_NAME);
     if (err != CHIP_NO_ERROR)
@@ -175,7 +179,8 @@ void application_start(void * unused)
     if (err != CHIP_NO_ERROR)
         appError(err);
 
-    vTaskDelete(main_Task);
+    VerifyOrDie(osThreadTerminate(sMainTaskHandle) == osOK); // Deleting the main task should never fail.
+    sMainTaskHandle = nullptr;
 }
 } // namespace
 
@@ -183,8 +188,9 @@ void SilabsMatterConfig::AppInit()
 {
     GetPlatform().Init();
 
-    xTaskCreate(application_start, "main_task", MAIN_TASK_STACK_SIZE, NULL, MAIN_TASK_PRIORITY, &main_Task);
+    sMainTaskHandle = osThreadNew(ApplicationStart, nullptr, &kMainTaskAttr);
     SILABS_LOG("Starting scheduler");
+    VerifyOrDie(sMainTaskHandle); // We can't proceed if the Main Task creation failed.
     GetPlatform().StartScheduler();
 
     // Should never get here.
@@ -216,12 +222,6 @@ void SilabsMatterConfig::ConnectivityEventCallback(const ChipDeviceEvent * event
     }
 }
 
-#if SILABS_TEST_EVENT_TRIGGER_ENABLED
-static uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
-                                                                                          0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb,
-                                                                                          0xcc, 0xdd, 0xee, 0xff };
-#endif // SILABS_TEST_EVENT_TRIGGER_ENABLED
-
 CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 {
     CHIP_ERROR err;
@@ -280,18 +280,10 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 
     initParams.reportScheduler = &sReportScheduler;
 
-#if SILABS_TEST_EVENT_TRIGGER_ENABLED
-    if (Encoding::HexToBytes(SILABS_TEST_EVENT_TRIGGER_ENABLE_KEY, strlen(SILABS_TEST_EVENT_TRIGGER_ENABLE_KEY),
-                             sTestEventTriggerEnableKey,
-                             TestEventTriggerDelegate::kEnableKeyLength) != TestEventTriggerDelegate::kEnableKeyLength)
-    {
-        SILABS_LOG("Failed to convert the EnableKey string to octstr type value");
-        memset(sTestEventTriggerEnableKey, 0, sizeof(sTestEventTriggerEnableKey));
-    }
-    // TODO(#31723): Show to customers that they can do `Server::GetInstance().GetTestEventTriggerDelegate().AddHandler()`
-    static SilabsTestEventTriggerDelegate sTestEventTriggerDelegate{ ByteSpan(sTestEventTriggerEnableKey) };
+#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+    static SilabsTestEventTriggerDelegate sTestEventTriggerDelegate;
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
-#endif // SILABS_TEST_EVENT_TRIGGER_ENABLED
+#endif // SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
 
 #if CHIP_CRYPTO_PLATFORM && !(defined(SLI_SI91X_MCU_INTERFACE))
     // When building with EFR32 crypto, use the opaque key store
@@ -300,13 +292,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     initParams.operationalKeystore = &gOperationalKeystore;
 #endif
 
-#ifdef PERFORMANCE_TEST_ENABLED
-    // Set up Test Event Trigger command of the General Diagnostics cluster. Used only in performance testing
-    // TODO(#31723): Show to customers that they can do `Server::GetInstance().GetTestEventTriggerDelegate().AddHandler()`
-    static SilabsTestEventTriggerDelegate sTestEventTriggerDelegate{ ByteSpan(kTestEventTriggerEnableKey) };
-    initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
-#endif
-
     // Initialize the remaining (not overridden) providers to the SDK example defaults
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
 
diff --git a/examples/platform/silabs/PigweedLogger.cpp b/examples/platform/silabs/PigweedLogger.cpp
index 280b232374ffcb..d136f663e9405e 100644
--- a/examples/platform/silabs/PigweedLogger.cpp
+++ b/examples/platform/silabs/PigweedLogger.cpp
@@ -24,16 +24,13 @@
  * needs to use HDLC/UART for another purpose like the RPC server.
  */
 
-#include <FreeRTOS.h>
-
-#include "semphr.h"
-#include <pw_hdlc/encoder.h>
-#include <pw_stream/sys_io_stream.h>
-#include <pw_sys_io_efr32/init.h>
-
+#include "PigweedLogger.h"
 #include "pw_span/span.h"
 #include <cassert>
 #include <cstdint>
+#include <pw_hdlc/encoder.h>
+#include <pw_stream/sys_io_stream.h>
+#include <pw_sys_io_efr32/init.h>
 #include <string_view>
 
 namespace PigweedLogger {
@@ -44,7 +41,7 @@ constexpr size_t kWriteBufferSize = 128; // Buffer for constructing HDLC frames
 
 // Exclusive access to the backend is needed to make sure that log messages coming
 // from different threads are not interwoven.
-SemaphoreHandle_t sLoggerLock;
+osMutexId_t sLoggerLock;
 
 static pw::stream::SysIoWriter sWriter;
 static size_t sWriteBufferPos;
@@ -60,7 +57,7 @@ static void send(void)
 
 void init(void)
 {
-    sLoggerLock = xSemaphoreCreateMutex();
+    sLoggerLock = osMutexNew(nullptr);
     assert(sLoggerLock != NULL);
 
     pw_sys_io_Init();
@@ -68,7 +65,7 @@ void init(void)
 
 int putString(const char * buffer, size_t size)
 {
-    xSemaphoreTake(sLoggerLock, portMAX_DELAY);
+    osMutexAcquire(sLoggerLock, osWaitForever);
     assert(sWriteBufferPos < kWriteBufferSize);
 
     for (size_t i = 0; i < size; ++i)
@@ -90,11 +87,11 @@ int putString(const char * buffer, size_t size)
             send();
     }
 
-    xSemaphoreGive(sLoggerLock);
+    osMutexRelease(sLoggerLock);
     return size;
 }
 
-SemaphoreHandle_t * GetSemaphore()
+osMutexId_t * GetMutex()
 {
     return &sLoggerLock;
 }
diff --git a/examples/platform/silabs/PigweedLogger.h b/examples/platform/silabs/PigweedLogger.h
index 9907ade58772da..746724d02c46ea 100644
--- a/examples/platform/silabs/PigweedLogger.h
+++ b/examples/platform/silabs/PigweedLogger.h
@@ -17,15 +17,13 @@
 
 #pragma once
 
-#include <FreeRTOS.h>
-
-#include "semphr.h"
+#include <cmsis_os2.h>
 #include <cstdint>
 
 namespace PigweedLogger {
 
 void init(void);
 int putString(const char * buffer, size_t size);
-SemaphoreHandle_t * GetSemaphore();
+osMutexId_t * GetMutex();
 
 } // namespace PigweedLogger
diff --git a/examples/platform/silabs/Rpc.cpp b/examples/platform/silabs/Rpc.cpp
index c78426847c1a42..d265e65af7848c 100644
--- a/examples/platform/silabs/Rpc.cpp
+++ b/examples/platform/silabs/Rpc.cpp
@@ -17,11 +17,11 @@
  */
 
 #include "AppTask.h"
-#include "FreeRTOS.h"
 #include "PigweedLoggerMutex.h"
 #include "pigweed/RpcService.h"
 #include "pw_sys_io_efr32/init.h"
-#include "task.h"
+#include <cmsis_os2.h>
+#include <sl_cmsis_os2_common.h>
 
 #if defined(PW_RPC_ATTRIBUTE_SERVICE) && PW_RPC_ATTRIBUTE_SERVICE
 #include "pigweed/rpc_services/Attributes.h"
@@ -94,7 +94,7 @@ class Efr32Device final : public Device
 public:
     pw::Status Reboot(const chip_rpc_RebootRequest & request, pw_protobuf_Empty & response) override
     {
-        TickType_t delayMs = kRebootTimerPeriodMs;
+        uint32_t delayMs = kRebootTimerPeriodMs;
         if (request.delay_ms != 0)
         {
             delayMs = request.delay_ms;
@@ -104,27 +104,36 @@ class Efr32Device final : public Device
             ChipLogProgress(NotSpecified, "Did not receive a reboot delay. Defaulting to %d ms",
                             static_cast<int>(kRebootTimerPeriodMs));
         }
-        mRebootTimer = xTimerCreateStatic("Reboot", pdMS_TO_TICKS(delayMs), false, nullptr, RebootHandler, &mRebootTimerBuffer);
-        xTimerStart(mRebootTimer, 0);
+
+        mRebootTimer        = osTimerNew(RebootHandler, osTimerOnce, nullptr, &mRebootTimerAttr);
+        uint32_t delayTicks = ((uint64_t) osKernelGetTickFreq() * delayMs) / 1000;
+        osTimerStart(mRebootTimer, delayTicks);
         return pw::OkStatus();
     }
 
 private:
     static constexpr uint32_t kRebootTimerPeriodMs = 1000;
-    TimerHandle_t mRebootTimer;
-    StaticTimer_t mRebootTimerBuffer;
+    osTimerId_t mRebootTimer;
+    osTimer_t mRebootTimerBuffer;
+    osTimerAttr_t mRebootTimerAttr = { .name = "Reboot", .cb_mem = &mRebootTimerBuffer, .cb_size = osTimerCbSize };
 
-    static void RebootHandler(TimerHandle_t) { NVIC_SystemReset(); }
+    static void RebootHandler(void * timerCbArg) { NVIC_SystemReset(); }
 };
 #endif // defined(PW_RPC_DEVICE_SERVICE) && PW_RPC_DEVICE_SERVICE
 
 namespace {
 
-#define RPC_TASK_STACK_SIZE 4096
-#define RPC_TASK_PRIORITY 1
-static TaskHandle_t sRpcTaskHandle;
-StaticTask_t sRpcTaskBuffer;
-StackType_t sRpcTaskStack[RPC_TASK_STACK_SIZE];
+static osThreadId_t sRpcTaskHandle;
+osThread_t sRpcTaskControlBlock;
+constexpr uint32_t kRpcTaskSize = 4096;
+uint8_t sRpcTaskStack[kRpcTaskSize];
+constexpr osThreadAttr_t kRpcTaskAttr = { .name       = "RPC",
+                                          .attr_bits  = osThreadDetached,
+                                          .cb_mem     = &sRpcTaskControlBlock,
+                                          .cb_size    = osThreadCbSize,
+                                          .stack_mem  = sRpcTaskStack,
+                                          .stack_size = kRpcTaskSize,
+                                          .priority   = osPriorityLow };
 
 #if defined(PW_RPC_ATTRIBUTE_SERVICE) && PW_RPC_ATTRIBUTE_SERVICE
 Attributes attributes_service;
@@ -214,8 +223,7 @@ void Init()
     pw_sys_io_Init();
 
     // Start App task.
-    sRpcTaskHandle = xTaskCreateStatic(RunRpcService, "RPC_TASK", ArraySize(sRpcTaskStack), nullptr, RPC_TASK_PRIORITY,
-                                       sRpcTaskStack, &sRpcTaskBuffer);
+    sRpcTaskHandle = osThreadNew(RunRpcService, nullptr, &kRpcTaskAttr);
 }
 
 } // namespace rpc
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index 73e70c18e1d7f8..e8fce7e11279f6 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -34,9 +34,6 @@ declare_args() {
   # Argument to force enable WPA3 security on rs91x
   rs91x_wpa3_transition = true
 
-  # use commissionable data for SiWx917
-  siwx917_commissionable_data = false
-
   #default WiFi SSID
   chip_default_wifi_ssid = ""
 
@@ -44,11 +41,11 @@ declare_args() {
   chip_default_wifi_psk = ""
 
   # Enable TestEventTrigger in GeneralDiagnostics cluster
-  silabs_test_event_trigger_enabled = false
+  sl_enable_test_event_trigger = false
 
   # The EnableKey in hex string format used by TestEventTrigger command in
-  # GeneralDiagnostics cluster. The length of the string should be 32.
-  silabs_test_event_trigger_enable_key = "00112233445566778899aabbccddeeff"
+  # GeneralDiagnostics cluster. The length of the string should be 16 bytes.
+  sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
 }
 
 # Sanity check
@@ -80,6 +77,30 @@ config("chip_examples_project_config") {
   ]
 }
 
+config("test-event-trigger-config") {
+  defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
+
+  if (is_debug) {
+    defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
+  }
+}
+
+source_set("test-event-trigger") {
+  sources = [
+    "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp",
+    "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
+  ]
+
+  public_configs = [ ":test-event-trigger-config" ]
+
+  public_deps = [
+    ":silabs-factory-data-provider",
+    "${chip_root}/src/app:test-event-trigger",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+  ]
+}
+
 source_set("siwx917-matter-shell") {
   if (chip_build_libshell) {
     defines = [ "ENABLE_CHIP_SHELL" ]
@@ -124,11 +145,16 @@ source_set("silabs-factory-data-provider") {
 
   public_deps = [
     "${chip_root}/src/credentials",
+    "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_base",
     "${chip_root}/src/setup_payload",
   ]
 
   public_configs = [ ":siwx917-common-config" ]
+
+  if (sl_enable_test_event_trigger) {
+    public_configs += [ ":test-event-trigger-config" ]
+  }
 }
 
 config("siwx917-common-config") {
@@ -152,10 +178,6 @@ config("siwx917-common-config") {
     defines += [ "HEAP_MONITORING" ]
   }
 
-  if (siwx917_commissionable_data) {
-    defines += [ "SIWX917_USE_COMISSIONABLE_DATA=1" ]
-  }
-
   ldflags = [ "-Wl,--no-warn-rwx-segment" ]
 }
 
@@ -274,18 +296,16 @@ source_set("siwx917-common") {
     public_deps += [ ":silabs-factory-data-provider" ]
   }
 
-  if (silabs_test_event_trigger_enabled) {
-    sources +=
-        [ "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp" ]
-    defines += [ "SILABS_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${silabs_test_event_trigger_enable_key}\"" ]
-  }
-
   public_deps += [
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
     "${chip_root}/src/setup_payload",
   ]
 
+  if (sl_enable_test_event_trigger) {
+    public_deps += [ ":test-event-trigger" ]
+  }
+
   if (app_data_model != "") {
     public_deps += [ app_data_model ]
   }
diff --git a/examples/platform/silabs/SiWx917/uart.cpp b/examples/platform/silabs/SiWx917/uart.cpp
index 91df5d51e71795..863beef67f7f04 100644
--- a/examples/platform/silabs/SiWx917/uart.cpp
+++ b/examples/platform/silabs/SiWx917/uart.cpp
@@ -49,7 +49,7 @@ void callback_event(uint32_t event)
         break;
     case SL_USART_EVENT_RECEIVE_COMPLETE:
 #ifdef ENABLE_CHIP_SHELL
-        chip::NotifyShellProcessFromISR();
+        chip::NotifyShellProcess();
 #endif
     case SL_USART_EVENT_TRANSFER_COMPLETE:
         break;
diff --git a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
index bc69573c13286b..810529c26399ab 100644
--- a/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
+++ b/examples/platform/silabs/SilabsDeviceAttestationCreds.cpp
@@ -21,6 +21,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <platform/silabs/MigrationManager.h>
 #include <platform/silabs/SilabsConfig.h>
 #include <psa/crypto.h>
 
@@ -171,18 +172,6 @@ DeviceAttestationCredentialsProvider * GetSilabsDacProvider()
 
 namespace DeviceLayer {
 namespace Silabs {
-namespace {
-
-void MigrateUint32(uint32_t old_key, uint32_t new_key)
-{
-    uint32_t value = 0;
-    if (SilabsConfig::ConfigValueExists(old_key) && (CHIP_NO_ERROR == SilabsConfig::ReadConfigValue(old_key, value)))
-    {
-        SilabsConfig::WriteConfigValue(new_key, value);
-    }
-}
-
-} // namespace
 
 void MigrateDacProvider(void)
 {
@@ -195,14 +184,14 @@ void MigrateDacProvider(void)
     constexpr uint32_t kOldKey_Creds_CD_Offset  = SilabsConfigKey(SilabsConfig::kMatterConfig_KeyBase, 0x27);
     constexpr uint32_t kOldKey_Creds_CD_Size    = SilabsConfigKey(SilabsConfig::kMatterConfig_KeyBase, 0x28);
 
-    MigrateUint32(kOldKey_Creds_KeyId, SilabsConfig::kConfigKey_Creds_KeyId);
-    MigrateUint32(kOldKey_Creds_Base_Addr, SilabsConfig::kConfigKey_Creds_Base_Addr);
-    MigrateUint32(kOldKey_Creds_DAC_Offset, SilabsConfig::kConfigKey_Creds_DAC_Offset);
-    MigrateUint32(kOldKey_Creds_DAC_Size, SilabsConfig::kConfigKey_Creds_DAC_Size);
-    MigrateUint32(kOldKey_Creds_PAI_Offset, SilabsConfig::kConfigKey_Creds_PAI_Offset);
-    MigrateUint32(kOldKey_Creds_PAI_Size, SilabsConfig::kConfigKey_Creds_PAI_Size);
-    MigrateUint32(kOldKey_Creds_CD_Offset, SilabsConfig::kConfigKey_Creds_CD_Offset);
-    MigrateUint32(kOldKey_Creds_CD_Size, SilabsConfig::kConfigKey_Creds_CD_Size);
+    MigrationManager::MigrateUint32(kOldKey_Creds_KeyId, SilabsConfig::kConfigKey_Creds_KeyId);
+    MigrationManager::MigrateUint32(kOldKey_Creds_Base_Addr, SilabsConfig::kConfigKey_Creds_Base_Addr);
+    MigrationManager::MigrateUint32(kOldKey_Creds_DAC_Offset, SilabsConfig::kConfigKey_Creds_DAC_Offset);
+    MigrationManager::MigrateUint32(kOldKey_Creds_DAC_Size, SilabsConfig::kConfigKey_Creds_DAC_Size);
+    MigrationManager::MigrateUint32(kOldKey_Creds_PAI_Offset, SilabsConfig::kConfigKey_Creds_PAI_Offset);
+    MigrationManager::MigrateUint32(kOldKey_Creds_PAI_Size, SilabsConfig::kConfigKey_Creds_PAI_Size);
+    MigrationManager::MigrateUint32(kOldKey_Creds_CD_Offset, SilabsConfig::kConfigKey_Creds_CD_Offset);
+    MigrationManager::MigrateUint32(kOldKey_Creds_CD_Size, SilabsConfig::kConfigKey_Creds_CD_Size);
 }
 
 } // namespace Silabs
diff --git a/examples/platform/silabs/SilabsDeviceDataProvider.cpp b/examples/platform/silabs/SilabsDeviceDataProvider.cpp
index eb0f8fee82ff1c..7d80eaaafda2bd 100644
--- a/examples/platform/silabs/SilabsDeviceDataProvider.cpp
+++ b/examples/platform/silabs/SilabsDeviceDataProvider.cpp
@@ -18,17 +18,13 @@
 #include "SilabsDeviceDataProvider.h"
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/support/Base64.h>
+#include <lib/support/BytesToHex.h>
 #include <lib/support/CHIPMemString.h>
 #include <platform/silabs/SilabsConfig.h>
 #include <setup_payload/Base38Encode.h>
 #include <setup_payload/SetupPayload.h>
 
-#ifdef SIWX917_USE_COMISSIONABLE_DATA
-#include "DeviceConfig.h"
-#include "silabs_utils.h"
-#include <setup_payload/Base38Decode.h>
-#include <setup_payload/QRCodeSetupPayloadGenerator.h>
-#endif // SIWX917_USE_COMISSIONABLE_DATA
+#include <string>
 
 namespace chip {
 namespace DeviceLayer {
@@ -37,142 +33,6 @@ namespace Silabs {
 // using namespace chip::Credentials;
 using namespace chip::DeviceLayer::Internal;
 
-// TODO Remove once Commander supports (doesn't erase) NVM3 for 917
-#ifdef SIWX917_USE_COMISSIONABLE_DATA
-void SilabsDeviceDataProvider::setupPayload(uint8_t * outBuf)
-{
-    SetupPayload payload;
-    std::string result;
-    ChipError err   = CHIP_NO_ERROR;
-    payload.version = 0;
-    payload.discriminator.SetLongValue(discriminatorValue);
-    payload.setUpPINCode = passcode;
-    payload.rendezvousInformation.SetValue(static_cast<RendezvousInformationFlags>(rendezvousFlag));
-    payload.commissioningFlow = static_cast<CommissioningFlow>(commissionableFlow);
-    payload.vendorID          = vendorId;
-    payload.productID         = productId;
-
-    QRCodeSetupPayloadGenerator generator(payload);
-    err = generator.payloadBase38Representation(result);
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("Failed to get the payload: %d", err);
-    }
-    SILABS_LOG("Payload value in string format : %s", result.c_str());
-    std::vector<uint8_t> result1;
-    // skipping the MT: from the payload during decoding
-    err = base38Decode(result.substr(3), result1);
-    if (err == CHIP_NO_ERROR)
-    {
-        for (uint8_t i = 0; i < result1.size(); i++)
-        {
-            outBuf[i] = result1.at(i);
-        }
-    }
-}
-
-// writing to the flash based on the value given in the DeviceConfig.h
-CHIP_ERROR SilabsDeviceDataProvider::FlashFactoryData()
-{
-    // flashing the value to the nvm3 section of the flash
-    // TODO: remove this once it is removed SiWx917 have the nvm3 simiplicity commander support
-    CHIP_ERROR err;
-    // Checking for the value of CM and flag
-    if ((commissionableFlow > 3) || (rendezvousFlag > 7))
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-    if (discriminatorValue != 0)
-    {
-        err = SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_SetupDiscriminator, discriminatorValue);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    uint8_t payload[kTotalPayloadDataSizeInBytes];
-    setupPayload(payload);
-    err = SilabsConfig::WriteConfigValueBin(SilabsConfig::kConfigKey_SetupPayloadBitSet, payload, kTotalPayloadDataSizeInBytes);
-    if (err != CHIP_NO_ERROR)
-    {
-        return err;
-    }
-    if (spake2Interation != 0)
-    {
-        err = SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_Spake2pIterationCount, spake2Interation);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (spake2Salt != NULL)
-    {
-        err = SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_Spake2pSalt, spake2Salt);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (spake2Verifier != NULL)
-    {
-        err = SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_Spake2pVerifier, spake2Verifier);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (productId != 0)
-    {
-        err = SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_ProductId, productId);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (vendorId != 0)
-    {
-        err = SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_VendorId, vendorId);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (strlen(productName) != 0)
-    {
-        err = SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_ProductName, productName);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (strlen(vendorName) != 0)
-    {
-        err = SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_VendorName, vendorName);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (strlen(hwVersionString) != 0)
-    {
-        err = SilabsConfig::WriteConfigValueStr(SilabsConfig::kConfigKey_HardwareVersionString, hwVersionString);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    if (rotatingId != 0)
-    {
-        err = SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_UniqueId, rotatingId);
-        if (err != CHIP_NO_ERROR)
-        {
-            return err;
-        }
-    }
-    return CHIP_NO_ERROR;
-}
-#endif
-
 CHIP_ERROR SilabsDeviceDataProvider::GetSetupDiscriminator(uint16_t & setupDiscriminator)
 {
     CHIP_ERROR err;
@@ -508,6 +368,43 @@ CHIP_ERROR SilabsDeviceDataProvider::GetProductLabel(char * buf, size_t bufSize)
     return SilabsConfig::ReadConfigValueStr(SilabsConfig::KConfigKey_ProductLabel, buf, bufSize, productLabelLen);
 }
 
+#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+/**
+ * @brief Reads the test event trigger key from NVM. If the key isn't present, returns default value if defined.
+ *
+ * @param[out] keySpan output buffer. Must be at least large enough for 16 bytes (ken length)
+ * @return CHIP_ERROR
+ */
+CHIP_ERROR SilabsDeviceDataProvider::GetTestEventTriggerKey(MutableByteSpan & keySpan)
+{
+    constexpr size_t kEnableKeyLength = 16; // Expected byte size of the EnableKey
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    size_t keyLength                  = 0;
+
+    VerifyOrReturnError(keySpan.size() >= kEnableKeyLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    err = SilabsConfig::ReadConfigValueBin(SilabsConfig::kConfigKey_Test_Event_Trigger_Key, keySpan.data(), kEnableKeyLength,
+                                           keyLength);
+#ifndef NDEBUG
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+
+        constexpr char enableKey[] = SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY;
+        if (Encoding::HexToBytes(enableKey, strlen(enableKey), keySpan.data(), kEnableKeyLength) != kEnableKeyLength)
+        {
+            // enableKey Hex String doesn't have the correct length
+            memset(keySpan.data(), 0, keySpan.size());
+            return CHIP_ERROR_INTERNAL;
+        }
+        err = CHIP_NO_ERROR;
+    }
+#endif // NDEBUG
+
+    keySpan.reduce_size(kEnableKeyLength);
+    return err;
+}
+#endif // SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+
 SilabsDeviceDataProvider & SilabsDeviceDataProvider::GetDeviceDataProvider()
 {
     static SilabsDeviceDataProvider sDataProvider;
diff --git a/examples/platform/silabs/SilabsDeviceDataProvider.h b/examples/platform/silabs/SilabsDeviceDataProvider.h
index f29e6be24d9d72..76caac04bd60b8 100644
--- a/examples/platform/silabs/SilabsDeviceDataProvider.h
+++ b/examples/platform/silabs/SilabsDeviceDataProvider.h
@@ -37,12 +37,6 @@ class SilabsDeviceDataProvider : public CommissionableDataProvider,
         Internal::GenericDeviceInstanceInfoProvider<Internal::SilabsConfig>(ConfigurationManagerImpl::GetDefaultInstance())
     {}
 
-// TODO Remove once Commander supports (doesn't erase) NVM3 for 917
-#ifdef SIWX917_USE_COMISSIONABLE_DATA
-    void setupPayload(uint8_t * outBuf);
-    CHIP_ERROR FlashFactoryData();
-#endif /* SIWX917_USE_COMISSIONABLE_DATA */
-
     static SilabsDeviceDataProvider & GetDeviceDataProvider();
     CHIP_ERROR GetSetupPayload(MutableCharSpan & payloadBuf);
     // ===== Members functions that implement the CommissionableDataProvider
@@ -68,6 +62,9 @@ class SilabsDeviceDataProvider : public CommissionableDataProvider,
     CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
     CHIP_ERROR GetProductURL(char * buf, size_t bufSzie) override;
     CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
+
+    // ===== Member functions that are Silabs Specific
+    CHIP_ERROR GetTestEventTriggerKey(MutableByteSpan & keySpan);
 };
 
 } // namespace Silabs
diff --git a/examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp b/examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp
index f9a11df74d7ae9..ef42c0d3a9dfd2 100644
--- a/examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp
+++ b/examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "SilabsTestEventTriggerDelegate.h"
+#include "SilabsDeviceDataProvider.h"
 
 using namespace ::chip::DeviceLayer;
 
@@ -24,7 +25,14 @@ namespace chip {
 
 bool SilabsTestEventTriggerDelegate::DoesEnableKeyMatch(const ByteSpan & enableKey) const
 {
-    return !mEnableKey.empty() && mEnableKey.data_equal(enableKey);
+    uint8_t storedEnableKey[TestEventTriggerDelegate::kEnableKeyLength];
+    MutableByteSpan enableKeySpan(storedEnableKey);
+
+    // Return false if we were not able to get the enableKey
+    VerifyOrReturnValue(
+        Silabs::SilabsDeviceDataProvider::GetDeviceDataProvider().GetTestEventTriggerKey(enableKeySpan) == CHIP_NO_ERROR, false);
+
+    return (!enableKeySpan.empty() && enableKeySpan.data_equal(enableKey));
 }
 
 } // namespace chip
diff --git a/examples/platform/silabs/SilabsTestEventTriggerDelegate.h b/examples/platform/silabs/SilabsTestEventTriggerDelegate.h
index 03ceabd69a7898..c691c0eff9759b 100644
--- a/examples/platform/silabs/SilabsTestEventTriggerDelegate.h
+++ b/examples/platform/silabs/SilabsTestEventTriggerDelegate.h
@@ -25,31 +25,12 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
 
-/**
- * @brief User handler for handling the test event trigger
- *
- * @note If TestEventTrigger is enabled, it needs to be implemented in the app
- *
- * @param eventTrigger Event trigger to handle
- *
- * @warning *** DO NOT USE FOR STANDARD CLUSTER EVENT TRIGGERS ***
- *
- * TODO(#31723): Rename `emberAfHandleEventTrigger` to `SilabsHandleGlobalTestEventTrigger`
- *
- * @retval true on success
- * @retval false if error happened
- */
-bool emberAfHandleEventTrigger(uint64_t eventTrigger);
-
 namespace chip {
 
-class SilabsTestEventTriggerDelegate : public TestEventTriggerDelegate, TestEventTriggerHandler
+class SilabsTestEventTriggerDelegate : public TestEventTriggerDelegate
 {
 public:
-    explicit SilabsTestEventTriggerDelegate(const ByteSpan & enableKey) : mEnableKey(enableKey)
-    {
-        VerifyOrDie(AddHandler(this) == CHIP_NO_ERROR);
-    }
+    explicit SilabsTestEventTriggerDelegate() = default;
 
     /**
      * @brief Checks to see if `enableKey` provided matches value chosen by the manufacturer.
@@ -57,21 +38,6 @@ class SilabsTestEventTriggerDelegate : public TestEventTriggerDelegate, TestEven
      * @return True or False.
      */
     bool DoesEnableKeyMatch(const ByteSpan & enableKey) const override;
-
-    /**
-     * @brief Delegates handling to global `emberAfHandleEventTrigger` function. DO NOT EXTEND.
-     *
-     * @param eventTrigger - trigger to process.
-     * @return CHIP_NO_ERROR if properly handled, else another CHIP_ERROR.
-     */
-    CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override
-    {
-        // WARNING: LEGACY SUPPORT ONLY, DO NOT EXTEND FOR STANDARD CLUSTERS
-        return (emberAfHandleEventTrigger(eventTrigger)) ? CHIP_NO_ERROR : CHIP_ERROR_INVALID_ARGUMENT;
-    }
-
-private:
-    ByteSpan mEnableKey;
 };
 
 } // namespace chip
diff --git a/examples/platform/silabs/SoftwareFaultReports.cpp b/examples/platform/silabs/SoftwareFaultReports.cpp
index eab4278e1246cb..813a66037fbe84 100644
--- a/examples/platform/silabs/SoftwareFaultReports.cpp
+++ b/examples/platform/silabs/SoftwareFaultReports.cpp
@@ -20,7 +20,7 @@
 #include "FreeRTOS.h"
 #include "silabs_utils.h"
 #include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
index 8b7b1ebf86e264..aa6c72a98c24b2 100644
--- a/examples/platform/silabs/efr32/BUILD.gn
+++ b/examples/platform/silabs/efr32/BUILD.gn
@@ -41,11 +41,11 @@ declare_args() {
   chip_default_wifi_psk = ""
 
   # Enable TestEventTrigger in GeneralDiagnostics cluster
-  silabs_test_event_trigger_enabled = false
+  sl_enable_test_event_trigger = false
 
   # The EnableKey in hex string format used by TestEventTrigger command in
-  # GeneralDiagnostics cluster. The length of the string should be 32.
-  silabs_test_event_trigger_enable_key = "00112233445566778899aabbccddeeff"
+  # GeneralDiagnostics cluster. The length of the string should be 16 bytes.
+  sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
 }
 
 silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
@@ -94,6 +94,30 @@ config("chip_examples_project_config") {
   ]
 }
 
+config("test-event-trigger-config") {
+  defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
+
+  if (is_debug) {
+    defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
+  }
+}
+
+source_set("test-event-trigger") {
+  sources = [
+    "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp",
+    "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
+  ]
+
+  public_configs = [ ":test-event-trigger-config" ]
+
+  public_deps = [
+    ":silabs-factory-data-provider",
+    "${chip_root}/src/app:test-event-trigger",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+  ]
+}
+
 source_set("openthread_core_config_efr32_chip_examples") {
   if (chip_enable_openthread) {
     sources = [ "project_include/OpenThreadConfig.h" ]
@@ -154,9 +178,14 @@ source_set("silabs-factory-data-provider") {
 
   public_deps = [
     "${chip_root}/src/credentials",
+    "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_base",
     "${chip_root}/src/setup_payload",
   ]
+
+  if (sl_enable_test_event_trigger) {
+    public_configs = [ ":test-event-trigger-config" ]
+  }
 }
 
 config("efr32-common-config") {
@@ -206,6 +235,7 @@ config("silabs-wifi-config") {
   if (sl_wfx_config_softap) {
     defines += [ "SL_WFX_CONFIG_SOFTAP" ]
   }
+
   if (sl_wfx_config_scan) {
     defines += [ "SL_WFX_CONFIG_SCAN" ]
   }
@@ -213,6 +243,7 @@ config("silabs-wifi-config") {
   if (chip_enable_wifi_ipv4) {
     defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
   }
+
   if (rs91x_wpa3_transition) {
     # TODO: Change this macro once WF200 support is provided
     defines += [ "WIFI_ENABLE_SECURITY_WPA3_TRANSITION=1" ]
@@ -322,15 +353,6 @@ source_set("efr32-common") {
     public_deps += [ ":silabs-factory-data-provider" ]
   }
 
-  if (silabs_test_event_trigger_enabled) {
-    sources +=
-        [ "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.cpp" ]
-    defines += [
-      "SILABS_TEST_EVENT_TRIGGER_ENABLED=true",
-      "SILABS_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${silabs_test_event_trigger_enable_key}\"",
-    ]
-  }
-
   public_deps += [
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/app/server",
@@ -338,6 +360,10 @@ source_set("efr32-common") {
     "${chip_root}/src/setup_payload",
   ]
 
+  if (sl_enable_test_event_trigger) {
+    public_deps += [ ":test-event-trigger" ]
+  }
+
   if (app_data_model != "") {
     public_deps += [ app_data_model ]
   }
diff --git a/examples/platform/silabs/efr32/uart.cpp b/examples/platform/silabs/efr32/uart.cpp
index 3941114218a664..2b29cca0db0a92 100644
--- a/examples/platform/silabs/efr32/uart.cpp
+++ b/examples/platform/silabs/efr32/uart.cpp
@@ -16,11 +16,9 @@
  *    limitations under the License.
  */
 #include "AppConfig.h"
-#include "FreeRTOS.h"
-#include "event_groups.h"
 #include "matter_shell.h"
-#include "semphr.h"
-#include "task.h"
+#include <cmsis_os2.h>
+#include <sl_cmsis_os2_common.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -108,8 +106,6 @@ static uint16_t lastCount; // Nb of bytes already processed from the active dmaB
 #else
 #define UART_MAX_QUEUE_SIZE 25
 #endif
-#define UART_TASK_SIZE 256
-#define UART_TASK_NAME "UART"
 
 #ifdef CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE
 #define UART_TX_MAX_BUF_LEN (CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE + 2) // \r\n
@@ -117,9 +113,18 @@ static uint16_t lastCount; // Nb of bytes already processed from the active dmaB
 #define UART_TX_MAX_BUF_LEN (258)
 #endif
 
-static TaskHandle_t sUartTaskHandle;
-static StackType_t uartStack[UART_TASK_SIZE * sizeof(StackType_t)];
-static StaticTask_t uartTaskStruct;
+static constexpr uint32_t kUartTxCompleteFlag = 1;
+static osThreadId_t sUartTaskHandle;
+constexpr uint32_t kUartTaskSize = 1024;
+static uint8_t uartStack[kUartTaskSize];
+static osThread_t sUartTaskControlBlock;
+constexpr osThreadAttr_t kUartTaskAttr = { .name       = "UART",
+                                           .attr_bits  = osThreadDetached,
+                                           .cb_mem     = &sUartTaskControlBlock,
+                                           .cb_size    = osThreadCbSize,
+                                           .stack_mem  = uartStack,
+                                           .stack_size = kUartTaskSize,
+                                           .priority   = osPriorityRealtime };
 
 typedef struct
 {
@@ -127,9 +132,13 @@ typedef struct
     uint16_t length = 0;
 } UartTxStruct_t;
 
+static osMessageQueueId_t sUartTxQueue;
+static osMessageQueue_t sUartTxQueueStruct;
 uint8_t sUartTxQueueBuffer[UART_MAX_QUEUE_SIZE * sizeof(UartTxStruct_t)];
-static StaticQueue_t sUartTxQueueStruct;
-static QueueHandle_t sUartTxQueue;
+constexpr osMessageQueueAttr_t kUartTxQueueAttr = { .cb_mem  = &sUartTxQueueStruct,
+                                                    .cb_size = osMessageQueueCbSize,
+                                                    .mq_mem  = sUartTxQueueBuffer,
+                                                    .mq_size = sizeof(sUartTxQueueBuffer) };
 
 // Rx buffer for the receive Fifo
 static uint8_t sRxFifoBuffer[MAX_BUFFER_SIZE];
@@ -264,8 +273,8 @@ void uartConsoleInit(void)
     UARTDRV_Receive(vcom_handle, sRxDmaBuffer, MAX_DMA_BUFFER_SIZE, UART_rx_callback);
     UARTDRV_Receive(vcom_handle, sRxDmaBuffer2, MAX_DMA_BUFFER_SIZE, UART_rx_callback);
 
-    sUartTxQueue    = xQueueCreateStatic(UART_MAX_QUEUE_SIZE, sizeof(UartTxStruct_t), sUartTxQueueBuffer, &sUartTxQueueStruct);
-    sUartTaskHandle = xTaskCreateStatic(uartMainLoop, UART_TASK_NAME, UART_TASK_SIZE, nullptr, 30, uartStack, &uartTaskStruct);
+    sUartTxQueue    = osMessageQueueNew(UART_MAX_QUEUE_SIZE, sizeof(UartTxStruct_t), &kUartTxQueueAttr);
+    sUartTaskHandle = osThreadNew(uartMainLoop, nullptr, &kUartTaskAttr);
 
     assert(sUartTaskHandle);
     assert(sUartTxQueue);
@@ -291,7 +300,7 @@ void uartConsoleInit(void)
 void USART_IRQHandler(void)
 {
 #ifdef ENABLE_CHIP_SHELL
-    chip::NotifyShellProcessFromISR();
+    chip::NotifyShellProcess();
 #elif !defined(PW_RPC_ENABLED)
     otSysEventSignalPending();
 #endif
@@ -311,9 +320,8 @@ void USART_IRQHandler(void)
  */
 void UART_tx_callback(struct UARTDRV_HandleData * handle, Ecode_t transferStatus, uint8_t * data, UARTDRV_Count_t transferCount)
 {
-    BaseType_t xHigherPriorityTaskWoken;
-
-    vTaskNotifyGiveFromISR(sUartTaskHandle, &xHigherPriorityTaskWoken) portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    // This function may be called from Interrupt Service Routines.
+    osThreadFlagsSet(sUartTaskHandle, kUartTxCompleteFlag);
 }
 
 /*
@@ -333,7 +341,7 @@ static void UART_rx_callback(UARTDRV_Handle_t handle, Ecode_t transferStatus, ui
     UARTDRV_Receive(vcom_handle, data, transferCount, UART_rx_callback);
 
 #ifdef ENABLE_CHIP_SHELL
-    chip::NotifyShellProcessFromISR();
+    chip::NotifyShellProcess();
 #elif !defined(PW_RPC_ENABLED)
     otSysEventSignalPending();
 #endif
@@ -363,20 +371,10 @@ int16_t uartConsoleWrite(const char * Buf, uint16_t BufLength)
     memcpy(workBuffer.data, Buf, BufLength);
     workBuffer.length = BufLength;
 
-    if (xPortIsInsideInterrupt())
+    if (osMessageQueuePut(sUartTxQueue, &workBuffer, osPriorityNormal, 0) == osOK)
     {
-        BaseType_t xHigherPriorityTaskWoken;
-        xQueueSendFromISR(sUartTxQueue, &workBuffer, &xHigherPriorityTaskWoken);
-        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
         return BufLength;
     }
-    else
-    {
-        if (pdTRUE == xQueueSend(sUartTxQueue, &workBuffer, portMAX_DELAY))
-        {
-            return BufLength;
-        }
-    }
 
     return UART_CONSOLE_ERR;
 }
@@ -400,20 +398,10 @@ int16_t uartLogWrite(const char * log, uint16_t length)
     memcpy(workBuffer.data + length, "\r\n", 2);
     workBuffer.length = length + 2;
 
-    if (xPortIsInsideInterrupt())
+    if (osMessageQueuePut(sUartTxQueue, &workBuffer, osPriorityNormal, 0) == osOK)
     {
-        BaseType_t xHigherPriorityTaskWoken;
-        xQueueSendFromISR(sUartTxQueue, &workBuffer, &xHigherPriorityTaskWoken);
-        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
         return length;
     }
-    else
-    {
-        if (pdTRUE == xQueueSend(sUartTxQueue, &workBuffer, 0))
-        {
-            return length;
-        }
-    }
 
     return UART_CONSOLE_ERR;
 }
@@ -453,11 +441,11 @@ void uartMainLoop(void * args)
     while (1)
     {
 
-        BaseType_t eventReceived = xQueueReceive(sUartTxQueue, &workBuffer, portMAX_DELAY);
+        osStatus_t eventReceived = osMessageQueueGet(sUartTxQueue, &workBuffer, nullptr, osWaitForever);
         while (eventReceived == pdTRUE)
         {
             uartSendBytes(workBuffer.data, workBuffer.length);
-            eventReceived = xQueueReceive(sUartTxQueue, &workBuffer, 0);
+            eventReceived = osMessageQueueGet(sUartTxQueue, &workBuffer, nullptr, 0);
         }
     }
 }
@@ -470,13 +458,14 @@ void uartMainLoop(void * args)
  */
 void uartSendBytes(uint8_t * buffer, uint16_t nbOfBytes)
 {
-
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
     sl_power_manager_add_em_requirement(SL_POWER_MANAGER_EM1);
-#endif
+#endif // SL_CATALOG_POWER_MANAGER_PRESENT
+
 #if SL_UARTCTRL_MUX
     sl_wfx_host_pre_uart_transfer();
 #endif // SL_UARTCTRL_MUX
+
 #if (defined(EFR32MG24) && defined(WF200_WIFI))
     // Blocking transmit for the MG24 + WF200 since UART TX is multiplexed with
     // WF200 SPI IRQ
@@ -484,15 +473,16 @@ void uartSendBytes(uint8_t * buffer, uint16_t nbOfBytes)
 #else
     // Non Blocking Transmit
     UARTDRV_Transmit(vcom_handle, (uint8_t *) buffer, nbOfBytes, UART_tx_callback);
-    ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+    osThreadFlagsWait(kUartTxCompleteFlag, osFlagsWaitAny, osWaitForever);
 #endif /* EFR32MG24 && WF200_WIFI */
+
 #if SL_UARTCTRL_MUX
     sl_wfx_host_post_uart_transfer();
 #endif // SL_UARTCTRL_MUX
 
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
     sl_power_manager_remove_em_requirement(SL_POWER_MANAGER_EM1);
-#endif
+#endif // SL_CATALOG_POWER_MANAGER_PRESENT
 }
 
 #ifdef __cplusplus
diff --git a/examples/platform/silabs/matter-platform.slcp b/examples/platform/silabs/matter-platform.slcp
index bc30556be60fe5..3e1c52a6ec66f5 100644
--- a/examples/platform/silabs/matter-platform.slcp
+++ b/examples/platform/silabs/matter-platform.slcp
@@ -31,22 +31,19 @@ sdk: {id: gecko_sdk, version: 4.3.1}
 toolchain_settings: []
 
 component:
-- {id: bluetooth_feature_nvm}
+#bluetooth components
+- {id: gatt_configuration}
 - {id: bluetooth_feature_gatt_server}
-- {id: nvm3_lib}
-- {id: bluetooth_feature_sm}
-- {id: bluetooth_feature_gap}
 - {id: bluetooth_feature_legacy_advertiser}
-- {id: gatt_configuration}
-- {id: freertos}
+- {id: bluetooth_feature_connection}
+- {id: bluetooth_feature_system}
 - {id: bluetooth_stack}
+# Other components
+- {id: nvm3_lib}
+- {id: freertos}
 - {id: brd4002a}
 - {id: rail_util_pti}
-- {id: bluetooth_feature_gatt}
-- {id: bluetooth_feature_connection}
 - {id: rail_lib_multiprotocol}
-- {id: bluetooth_feature_system}
-- {id: bluetooth_feature_scanner}
 - {id: rail_util_power_manager_init}
 - {id: psa_crypto}
 - {id: psa_crypto_aes}
@@ -62,7 +59,6 @@ component:
 - {id: mbedtls_platform_dynamic_memory_allocation_config_init_runtime }
 - {id: mbedtls_base64}
 - {id: ot_psa_crypto}
-- {id: bluetooth_crypto}
 - {id: iostream_rtt}
 # Necessary componenets for ot coap cert lib
 # - {id: mbedtls_dtls} # Requried by COAP lib
diff --git a/examples/platform/silabs/matter_shell.cpp b/examples/platform/silabs/matter_shell.cpp
index 9a59adb4306dc6..03a50ea7f708cf 100644
--- a/examples/platform/silabs/matter_shell.cpp
+++ b/examples/platform/silabs/matter_shell.cpp
@@ -17,21 +17,28 @@
 
 #include "matter_shell.h"
 #include <ChipShellCollection.h>
-#include <FreeRTOS.h>
+#include <cmsis_os2.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/shell/Engine.h>
-#include <task.h>
+#include <sl_cmsis_os2_common.h>
 
 using namespace ::chip;
 using chip::Shell::Engine;
 
 namespace {
 
-#define SHELL_TASK_STACK_SIZE 2048
-#define SHELL_TASK_PRIORITY 5
-TaskHandle_t shellTaskHandle;
-StackType_t shellStack[SHELL_TASK_STACK_SIZE / sizeof(StackType_t)];
-StaticTask_t shellTaskStruct;
+constexpr uint32_t kShellProcessFlag   = 1;
+constexpr uint32_t kShellTaskStackSize = 2048;
+uint8_t shellTaskStack[kShellTaskStackSize];
+osThread_t shellTaskControlBlock;
+constexpr osThreadAttr_t kShellTaskAttr = { .name       = "shell",
+                                            .attr_bits  = osThreadDetached,
+                                            .cb_mem     = &shellTaskControlBlock,
+                                            .cb_size    = osThreadCbSize,
+                                            .stack_mem  = shellTaskStack,
+                                            .stack_size = kShellTaskStackSize,
+                                            .priority   = osPriorityBelowNormal };
+osThreadId_t shellTaskHandle;
 
 void MatterShellTask(void * args)
 {
@@ -40,33 +47,17 @@ void MatterShellTask(void * args)
 
 } // namespace
 
-extern "C" unsigned int sleep(unsigned int seconds)
-{
-    const TickType_t xDelay = pdMS_TO_TICKS(1000 * seconds);
-    vTaskDelay(xDelay);
-    return 0;
-}
-
 namespace chip {
 
 void NotifyShellProcess()
 {
-    xTaskNotifyGive(shellTaskHandle);
-}
-
-void NotifyShellProcessFromISR()
-{
-    BaseType_t yieldRequired = pdFALSE;
-    if (shellTaskHandle != NULL)
-    {
-        vTaskNotifyGiveFromISR(shellTaskHandle, &yieldRequired);
-    }
-    portYIELD_FROM_ISR(yieldRequired);
+    // This function may be called from Interrupt Service Routines.
+    osThreadFlagsSet(shellTaskHandle, kShellProcessFlag);
 }
 
 void WaitForShellActivity()
 {
-    ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+    osThreadFlagsWait(kShellProcessFlag, osFlagsWaitAny, osWaitForever);
 }
 
 void startShellTask()
@@ -79,8 +70,8 @@ void startShellTask()
     cmd_misc_init();
     cmd_otcli_init();
 
-    shellTaskHandle = xTaskCreateStatic(MatterShellTask, "matter_cli", ArraySize(shellStack), NULL, SHELL_TASK_PRIORITY, shellStack,
-                                        &shellTaskStruct);
+    shellTaskHandle = osThreadNew(MatterShellTask, nullptr, &kShellTaskAttr);
+    VerifyOrDie(shellTaskHandle);
 }
 
 } // namespace chip
diff --git a/examples/platform/silabs/matter_shell.h b/examples/platform/silabs/matter_shell.h
index 9b818bfe8a412b..d32ee62ded5591 100644
--- a/examples/platform/silabs/matter_shell.h
+++ b/examples/platform/silabs/matter_shell.h
@@ -20,7 +20,6 @@
 namespace chip {
 
 void NotifyShellProcess();
-void NotifyShellProcessFromISR();
 void WaitForShellActivity();
 void startShellTask();
 
diff --git a/examples/platform/telink/Rpc.cmake b/examples/platform/telink/Rpc.cmake
new file mode 100644
index 00000000000000..e4ae124144475e
--- /dev/null
+++ b/examples/platform/telink/Rpc.cmake
@@ -0,0 +1,163 @@
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70
+add_compile_options(-Wno-error=unused-parameter)
+
+# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
+link_libraries($<BUILD_INTERFACE:zephyr_interface>)
+
+set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
+include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
+include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
+
+include($ENV{PW_ROOT}/pw_assert/backend.cmake)
+include($ENV{PW_ROOT}/pw_log/backend.cmake)
+include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
+
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert.check pw_assert_log.check_backend)
+pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
+pw_set_backend(pw_sys_io pw_sys_io.telink)
+
+set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
+
+add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
+add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
+add_subdirectory(third_party/connectedhomeip/examples/platform/telink/pw_sys_io)
+
+pw_proto_library(attributes_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
+  PREFIX
+    attributes_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(button_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
+  PREFIX
+    button_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(descriptor_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
+  PREFIX
+    descriptor_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(device_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
+  PREFIX
+    device_service
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(lighting_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  PREFIX
+    lighting_service
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(ot_cli_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  PREFIX
+    ot_cli_service
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(thread_service
+  SOURCES
+    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
+  INPUTS
+    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
+  STRIP_PREFIX
+    ${CHIP_ROOT}/examples/common/pigweed/protos
+  PREFIX
+    thread_service
+  DEPS
+    pw_protobuf.common_proto
+)
+
+target_sources(app PRIVATE
+  ../../common/pigweed/RpcService.cpp
+  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
+  ${TELINK_COMMON}/Rpc.cpp
+  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
+)
+
+target_include_directories(app PRIVATE
+  ${PIGWEED_ROOT}/pw_sys_io/public
+  ${CHIP_ROOT}/src/lib/support
+  ${CHIP_ROOT}/src/system
+  ${TELINK_COMMON}
+  ../../common
+  ../../common/pigweed
+  ../../common/pigweed/telink)
+
+target_compile_options(app PRIVATE
+                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
+                       "-DPW_RPC_BUTTON_SERVICE=1"
+                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
+                       "-DPW_RPC_DEVICE_SERVICE=1"
+                       "-DPW_RPC_LIGHTING_SERVICE=1"
+                       "-DPW_RPC_THREAD_SERVICE=1")
+
+target_link_libraries(app PRIVATE
+  attributes_service.nanopb_rpc
+  button_service.nanopb_rpc
+  descriptor_service.nanopb_rpc
+  device_service.nanopb_rpc
+  lighting_service.nanopb_rpc
+  thread_service.nanopb_rpc
+  pw_checksum
+  pw_hdlc
+  pw_log
+  pw_rpc.server
+  pw_sys_io
+)
diff --git a/examples/platform/telink/common.cmake b/examples/platform/telink/common.cmake
new file mode 100644
index 00000000000000..314e74063be605
--- /dev/null
+++ b/examples/platform/telink/common.cmake
@@ -0,0 +1,104 @@
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+string(REPLACE "_retention" "" BASE_BOARD ${BOARD})
+
+if(FLASH_SIZE)
+  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
+else()
+  set(FLASH_SIZE "2m")
+  message(STATUS "Flash memory size is set to: 2mb (default)")
+endif()
+
+if(${TLNK_MARS_BOARD} MATCHES y)
+  set(MARS_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_mars_boot.overlay")
+  if(NOT EXISTS "${MARS_BOOT_DTC_OVERLAY_FILE}")
+    message(FATAL_ERROR "${MARS_BOOT_DTC_OVERLAY_FILE} doesn't exist")
+  endif()
+  set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
+  if(NOT EXISTS "${MARS_DTC_OVERLAY_FILE}")
+    message(FATAL_ERROR "${MARS_DTC_OVERLAY_FILE} doesn't exist")
+  endif()
+  set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
+  if(NOT EXISTS "${MARS_CONF_OVERLAY_FILE}")
+    message(FATAL_ERROR "${MARS_CONF_OVERLAY_FILE} doesn't exist")
+  endif()
+else()
+  unset(MARS_BOOT_DTC_OVERLAY_FILE)
+  unset(MARS_DTC_OVERLAY_FILE)
+  unset(MARS_CONF_OVERLAY_FILE)
+endif()
+
+if(${TLNK_USB_DONGLE} MATCHES y)
+  set(USB_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_usb_boot.overlay")
+  if(NOT EXISTS "${USB_BOOT_DTC_OVERLAY_FILE}")
+    message(FATAL_ERROR "${USB_BOOT_DTC_OVERLAY_FILE} doesn't exist")
+  endif()
+  set(USB_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.overlay")
+  if(NOT EXISTS "${USB_DTC_OVERLAY_FILE}")
+    message(FATAL_ERROR "${USB_DTC_OVERLAY_FILE} doesn't exist")
+  endif()
+  set(USB_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_usb.conf")
+  if(NOT EXISTS "${USB_CONF_OVERLAY_FILE}")
+    message(FATAL_ERROR "${USB_CONF_OVERLAY_FILE} doesn't exist")
+  endif()
+else()
+  unset(USB_BOOT_DTC_OVERLAY_FILE)
+  unset(USB_DTC_OVERLAY_FILE)
+  unset(USB_CONF_OVERLAY_FILE)
+endif()
+
+set(GLOBAL_BOOT_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
+if(NOT EXISTS "${GLOBAL_BOOT_CONF_OVERLAY_FILE}")
+  message(FATAL_ERROR "${GLOBAL_BOOT_CONF_OVERLAY_FILE} doesn't exist")
+endif()
+
+set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BASE_BOARD}.overlay")
+if(NOT EXISTS "${LOCAL_DTC_OVERLAY_FILE}")
+  message(STATUS "${LOCAL_DTC_OVERLAY_FILE} doesn't exist")
+  unset(LOCAL_DTC_OVERLAY_FILE)
+endif()
+
+set(GLOBAL_BOOT_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}.overlay")
+if(NOT EXISTS "${GLOBAL_BOOT_DTC_OVERLAY_FILE}")
+  message(FATAL_ERROR "${GLOBAL_BOOT_DTC_OVERLAY_FILE} doesn't exist")
+endif()
+
+set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
+if(NOT EXISTS "${GLOBAL_DTC_OVERLAY_FILE}")
+  message(FATAL_ERROR "${GLOBAL_DTC_OVERLAY_FILE} doesn't exist")
+endif()
+
+set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BASE_BOARD}_${FLASH_SIZE}_flash.overlay")
+if(NOT EXISTS "${FLASH_DTC_OVERLAY_FILE}")
+  message(FATAL_ERROR "${FLASH_DTC_OVERLAY_FILE} doesn't exist")
+endif()
+
+if(DTC_OVERLAY_FILE)
+  set(DTC_OVERLAY_FILE
+    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
+    CACHE STRING "" FORCE
+  )
+else()
+  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${USB_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
+endif()
+
+if(NOT CONF_FILE)
+  set(CONF_FILE ${USB_CONF_OVERLAY_FILE} ${MARS_CONF_OVERLAY_FILE} prj.conf)
+endif()
+
+# Load NCS/Zephyr build system
+list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
diff --git a/examples/platform/telink/common/include/AppTaskCommon.h b/examples/platform/telink/common/include/AppTaskCommon.h
index 7bacaeb4377ee4..6218427e963a51 100644
--- a/examples/platform/telink/common/include/AppTaskCommon.h
+++ b/examples/platform/telink/common/include/AppTaskCommon.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    Copyright (c) 2022-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,18 +21,6 @@
 #include "AppConfig.h"
 #include "AppEventCommon.h"
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-#include "LEDWidget.h"
-#endif
-
-#ifdef APP_USE_IDENTIFY_PWM
-#include "PWMDevice.h"
-#endif
-
-#ifdef CONFIG_WS2812_STRIP
-#include "WS2812Device.h"
-#endif
-
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
@@ -64,6 +52,10 @@ inline constexpr uint8_t kButtonPushEvent      = 1;
 inline constexpr uint8_t kButtonReleaseEvent   = 0;
 } // namespace
 
+class LedManager;
+class PwmManager;
+class ButtonManager;
+
 class AppTaskCommon
 {
 public:
@@ -80,12 +72,8 @@ class AppTaskCommon
     {
         kButtonId_ExampleAction = 1,
         kButtonId_FactoryReset,
-#if APP_USE_THREAD_START_BUTTON
         kButtonId_StartThread,
-#endif
-#if APP_USE_BLE_START_BUTTON
         kButtonId_StartBleAdv
-#endif
     } ButtonId;
 #endif
 
@@ -95,44 +83,34 @@ class AppTaskCommon
     void DispatchEvent(AppEvent * event);
     void GetEvent(AppEvent * aEvent);
 
+    void InitLeds();
+    virtual void LinkLeds(LedManager & ledManager);
+    void InitPwms();
+    virtual void LinkPwms(PwmManager & pwmManager);
     void InitButtons(void);
+    virtual void LinkButtons(ButtonManager & buttonManager);
 
     static void FactoryResetTimerTimeoutCallback(k_timer * timer);
     static void FactoryResetTimerEventHandler(AppEvent * aEvent);
     static void FactoryResetButtonEventHandler(void);
     static void FactoryResetHandler(AppEvent * aEvent);
 
-#if APP_USE_BLE_START_BUTTON
     static void StartBleAdvButtonEventHandler(void);
     static void StartBleAdvHandler(AppEvent * aEvent);
-#endif
 
-#if APP_USE_THREAD_START_BUTTON || !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
     static void StartThreadButtonEventHandler(void);
     static void StartThreadHandler(AppEvent * aEvent);
 #endif
 
-#if APP_USE_EXAMPLE_START_BUTTON
     static void ExampleActionButtonEventHandler(void);
 
     void SetExampleButtonCallbacks(EventHandler aAction_CB);
     EventHandler ExampleActionEventHandler;
-#endif
 
     static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
 
-#ifdef APP_USE_IDENTIFY_PWM
-    PWMDevice mPwmIdentifyLed;
-
-    static void ActionIdentifyStateUpdateHandler(k_timer * timer);
-    static void UpdateIdentifyStateEventHandler(AppEvent * aEvent);
-#endif
-
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    static void UpdateLedStateEventHandler(AppEvent * aEvent);
-    static void LEDStateUpdateHandler(LEDWidget * ledWidget);
     static void UpdateStatusLED(void);
-#endif
 
 #if CONFIG_CHIP_FACTORY_DATA
     chip::DeviceLayer::FactoryDataProvider<chip::DeviceLayer::ExternalFlashFactoryData> mFactoryDataProvider;
diff --git a/examples/platform/telink/common/include/SensorManagerCommon.h b/examples/platform/telink/common/include/SensorManagerCommon.h
index 7181f8212a944c..25e800b078e021 100644
--- a/examples/platform/telink/common/include/SensorManagerCommon.h
+++ b/examples/platform/telink/common/include/SensorManagerCommon.h
@@ -46,7 +46,6 @@ class SensorManager
     static void SensorBanForNextMeasurTimerTimeoutCallback(k_timer * timer);
 
 #ifdef USE_COLOR_TEMPERATURE_LIGHT
-    WS2812Device mWS2812Device;
     void SetColorTemperatureLight(int8_t temp);
 #endif // USE_COLOR_TEMPERATURE_LIGHT
 
diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
index a77f4363df65f5..9f268b74da3e55 100644
--- a/examples/platform/telink/common/src/AppTaskCommon.cpp
+++ b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    Copyright (c) 2022-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
 
 #include "BLEManagerImpl.h"
 #include "ButtonManager.h"
+#include "LEDManager.h"
+#include "PWMManager.h"
 
 #include "ThreadUtil.h"
 
@@ -29,6 +31,7 @@
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 
 #if CONFIG_BOOTLOADER_MCUBOOT
 #include <OTAUtil.h>
@@ -50,25 +53,6 @@ constexpr int kFactoryResetCalcTimeout = 3000;
 constexpr int kFactoryResetTriggerCntr = 3;
 constexpr int kAppEventQueueSize       = 10;
 
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-const struct gpio_dt_spec sFactoryResetButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_1), gpios);
-#if APP_USE_BLE_START_BUTTON
-const struct gpio_dt_spec sBleStartButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_2), gpios);
-#endif
-#if APP_USE_THREAD_START_BUTTON
-const struct gpio_dt_spec sThreadStartButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_3), gpios);
-#endif
-#if APP_USE_EXAMPLE_START_BUTTON
-const struct gpio_dt_spec sExampleActionButtonDt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_4), gpios);
-#endif
-#else
-const struct gpio_dt_spec sButtonCol1Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_col1), gpios);
-const struct gpio_dt_spec sButtonCol2Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_col2), gpios);
-const struct gpio_dt_spec sButtonRow1Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_row1), gpios);
-const struct gpio_dt_spec sButtonRow2Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_row2), gpios);
-#endif
-
-#ifdef APP_USE_IDENTIFY_PWM
 constexpr uint32_t kIdentifyBlinkRateMs         = 200;
 constexpr uint32_t kIdentifyOkayOnRateMs        = 50;
 constexpr uint32_t kIdentifyOkayOffRateMs       = 950;
@@ -77,36 +61,18 @@ constexpr uint32_t kIdentifyFinishOffRateMs     = 50;
 constexpr uint32_t kIdentifyChannelChangeRateMs = 1000;
 constexpr uint32_t kIdentifyBreatheRateMs       = 1000;
 
-const struct pwm_dt_spec sPwmIdentifySpecGreenLed = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led3));
-#endif
-
 #if APP_SET_NETWORK_COMM_ENDPOINT_SEC
 constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
 #endif
 
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), kAppEventQueueSize, alignof(AppEvent));
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-LEDWidget sStatusLED;
-#endif
-
-Button sFactoryResetButton;
-#if APP_USE_BLE_START_BUTTON
-Button sBleAdvStartButton;
-#endif
-#if APP_USE_EXAMPLE_START_BUTTON
-Button sExampleActionButton;
-#endif
-#if APP_USE_THREAD_START_BUTTON
-Button sThreadStartButton;
-#endif
-
 k_timer sFactoryResetTimer;
 uint8_t sFactoryResetCntr = 0;
 
 bool sIsCommissioningFailed = false;
-bool sIsThreadProvisioned   = false;
-bool sIsThreadEnabled       = false;
+bool sIsNetworkProvisioned  = false;
+bool sIsNetworkEnabled      = false;
 bool sIsThreadAttached      = false;
 bool sHaveBLEConnections    = false;
 
@@ -114,7 +80,8 @@ bool sHaveBLEConnections    = false;
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 #endif
 
-#ifdef APP_USE_IDENTIFY_PWM
+#ifndef IDENTIFY_CLUSTER_DISABLED
+
 void OnIdentifyTriggerEffect(Identify * identify)
 {
     AppTaskCommon::IdentifyEffectHandler(identify->mCurrentEffectIdentifier);
@@ -127,6 +94,7 @@ Identify sIdentify = {
     Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
     OnIdentifyTriggerEffect,
 };
+
 #endif
 
 #if CONFIG_CHIP_FACTORY_DATA
@@ -197,6 +165,7 @@ class AppFabricTableDelegate : public FabricTable::Delegate
 class PlatformMgrDelegate : public DeviceLayer::PlatformManagerDelegate
 {
     // Disable openthread before reset to prevent writing to NVS
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     void OnShutDown() override
     {
         if (ThreadStackManagerImpl().IsThreadEnabled())
@@ -204,6 +173,7 @@ class PlatformMgrDelegate : public DeviceLayer::PlatformManagerDelegate
             ThreadStackManagerImpl().Finalize();
         }
     }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 };
 
 #if CONFIG_CHIP_LIB_SHELL
@@ -246,7 +216,7 @@ CHIP_ERROR AppTaskCommon::StartApp(void)
 
     AppEvent event = {};
 
-#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
     StartThreadButtonEventHandler();
 #endif
 
@@ -270,13 +240,10 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     CHIP_ERROR err;
     LOG_INF("SW Version: %u, %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION, CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
 
-    // Initialize status LED
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    LEDWidget::SetStateUpdateCallback(LEDStateUpdateHandler);
-    sStatusLED.Init(GPIO_DT_SPEC_GET_OR(DT_ALIAS(system_state_led), gpios, {}));
-
+    InitLeds();
     UpdateStatusLED();
-#endif
+
+    InitPwms();
 
     InitButtons();
 
@@ -284,18 +251,6 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     k_timer_init(&sFactoryResetTimer, &AppTask::FactoryResetTimerTimeoutCallback, nullptr);
     k_timer_user_data_set(&sFactoryResetTimer, this);
 
-#ifdef APP_USE_IDENTIFY_PWM
-    // Initialize PWM Identify led
-    err = GetAppTask().mPwmIdentifyLed.Init(&sPwmIdentifySpecGreenLed, kDefaultMinLevel, kDefaultMaxLevel, kDefaultMaxLevel);
-    if (err != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Green IDENTIFY PWM Device Init fail");
-        return err;
-    }
-
-    GetAppTask().mPwmIdentifyLed.SetCallbacks(nullptr, nullptr, ActionIdentifyStateUpdateHandler);
-#endif
-
     // Initialize CHIP server
 #if CONFIG_CHIP_FACTORY_DATA
     ReturnErrorOnFailure(mFactoryDataProvider.Init());
@@ -369,179 +324,144 @@ void AppTaskCommon::ButtonEventHandler(ButtonId_t btnId, bool btnPressed)
 
     switch (btnId)
     {
-#if APP_USE_EXAMPLE_START_BUTTON
     case kButtonId_ExampleAction:
         ExampleActionButtonEventHandler();
         break;
-#endif
     case kButtonId_FactoryReset:
         FactoryResetButtonEventHandler();
         break;
-#if APP_USE_THREAD_START_BUTTON
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
     case kButtonId_StartThread:
         StartThreadButtonEventHandler();
         break;
 #endif
-#if APP_USE_BLE_START_BUTTON
     case kButtonId_StartBleAdv:
         StartBleAdvButtonEventHandler();
         break;
-#endif
     }
 }
 #endif
 
-void AppTaskCommon::InitButtons(void)
+void AppTaskCommon::InitLeds()
 {
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-    sFactoryResetButton.Configure(&sFactoryResetButtonDt, FactoryResetButtonEventHandler);
-#if APP_USE_BLE_START_BUTTON
-    sBleAdvStartButton.Configure(&sBleStartButtonDt, StartBleAdvButtonEventHandler);
-#endif
-#if APP_USE_EXAMPLE_START_BUTTON
-    if (ExampleActionEventHandler)
-    {
-        sExampleActionButton.Configure(&sExampleActionButtonDt, ExampleActionButtonEventHandler);
-    }
-#endif
-#if APP_USE_THREAD_START_BUTTON
-    sThreadStartButton.Configure(&sThreadStartButtonDt, StartThreadButtonEventHandler);
-#endif
-#else
-    sFactoryResetButton.Configure(&sButtonRow1Dt, &sButtonCol1Dt, FactoryResetButtonEventHandler);
-#if APP_USE_BLE_START_BUTTON
-    sBleAdvStartButton.Configure(&sButtonRow2Dt, &sButtonCol2Dt, StartBleAdvButtonEventHandler);
-#endif
-#if APP_USE_EXAMPLE_START_BUTTON
-    if (ExampleActionEventHandler)
-    {
-        sExampleActionButton.Configure(&sButtonRow1Dt, &sButtonCol2Dt, ExampleActionButtonEventHandler);
-    }
-#endif
-#if APP_USE_THREAD_START_BUTTON
-    sThreadStartButton.Configure(&sButtonRow2Dt, &sButtonCol1Dt, StartThreadButtonEventHandler);
-#endif
-#endif
+    LedManager & ledManager = LedManager::getInstance();
 
-    ButtonManagerInst().AddButton(sFactoryResetButton);
-#if APP_USE_BLE_START_BUTTON
-    ButtonManagerInst().AddButton(sBleAdvStartButton);
-#endif
-#if APP_USE_THREAD_START_BUTTON
-    ButtonManagerInst().AddButton(sThreadStartButton);
-#endif
-#if APP_USE_EXAMPLE_START_BUTTON
-    if (ExampleActionEventHandler)
-    {
-        ButtonManagerInst().AddButton(sExampleActionButton);
-    }
-#endif
+    LinkLeds(ledManager);
+
+    ledManager.linkBackend(LedPool::getInstance());
 }
 
+void AppTaskCommon::LinkLeds(LedManager & ledManager)
+{
 #if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-void AppTaskCommon::UpdateLedStateEventHandler(AppEvent * aEvent)
+    ledManager.linkLed(LedManager::EAppLed_Status, 0);
+#endif // CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+}
+
+void AppTaskCommon::InitPwms()
 {
-    if (aEvent->Type == AppEvent::kEventType_UpdateLedState)
-    {
-        aEvent->UpdateLedStateEvent.LedWidget->UpdateState();
-    }
+    PwmManager & pwmManager = PwmManager::getInstance();
+
+    LinkPwms(pwmManager);
+
+#if CONFIG_WS2812_STRIP
+    pwmManager.linkBackend(Ws2812Strip::getInstance());
+#else
+    pwmManager.linkBackend(PwmPool::getInstance());
+#endif // CONFIG_WS2812_STRIP
 }
 
-void AppTaskCommon::LEDStateUpdateHandler(LEDWidget * ledWidget)
+void AppTaskCommon::LinkPwms(PwmManager & pwmManager)
 {
-    AppEvent event;
-    event.Type                          = AppEvent::kEventType_UpdateLedState;
-    event.Handler                       = UpdateLedStateEventHandler;
-    event.UpdateLedStateEvent.LedWidget = ledWidget;
-    GetAppTask().PostEvent(&event);
+#if CONFIG_WS2812_STRIP
+    pwmManager.linkPwm(PwmManager::EAppPwm_Red, 0);
+    pwmManager.linkPwm(PwmManager::EAppPwm_Green, 1);
+    pwmManager.linkPwm(PwmManager::EAppPwm_Blue, 2);
+#else
+    pwmManager.linkPwm(PwmManager::EAppPwm_Indication, 0);
+    pwmManager.linkPwm(PwmManager::EAppPwm_Red, 1);
+    pwmManager.linkPwm(PwmManager::EAppPwm_Green, 2);
+    pwmManager.linkPwm(PwmManager::EAppPwm_Blue, 3);
+#endif // CONFIG_WS2812_STRIP
+}
+
+void AppTaskCommon::InitButtons(void)
+{
+    ButtonManager & buttonManager = ButtonManager::getInstance();
+
+    LinkButtons(buttonManager);
+
+#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
+    buttonManager.linkBackend(ButtonPool::getInstance());
+#else
+    buttonManager.linkBackend(ButtonMatrix::getInstance());
+#endif // CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
+}
+
+void AppTaskCommon::LinkButtons(ButtonManager & buttonManager)
+{
+    buttonManager.addCallback(FactoryResetButtonEventHandler, 0, true);
+    buttonManager.addCallback(ExampleActionButtonEventHandler, 1, true);
+    buttonManager.addCallback(StartBleAdvButtonEventHandler, 2, true);
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    buttonManager.addCallback(StartThreadButtonEventHandler, 3, true);
+#endif
 }
 
 void AppTaskCommon::UpdateStatusLED()
 {
-    if (sIsThreadProvisioned && sIsThreadEnabled)
+    if (sIsNetworkProvisioned && sIsNetworkEnabled)
     {
         if (sIsThreadAttached)
         {
-            sStatusLED.Blink(950, 50);
+            LedManager::getInstance().setLed(LedManager::EAppLed_Status, 950, 50);
         }
         else
         {
-            sStatusLED.Blink(100, 100);
+            LedManager::getInstance().setLed(LedManager::EAppLed_Status, 100, 100);
         }
     }
     else
     {
-        sStatusLED.Blink(50, 950);
+        LedManager::getInstance().setLed(LedManager::EAppLed_Status, 50, 950);
     }
 }
-#endif
-
-#ifdef APP_USE_IDENTIFY_PWM
-void AppTaskCommon::ActionIdentifyStateUpdateHandler(k_timer * timer)
-{
-    AppEvent event;
-    event.Type    = AppEvent::kEventType_UpdateLedState;
-    event.Handler = UpdateIdentifyStateEventHandler;
-    GetAppTask().PostEvent(&event);
-}
-
-void AppTaskCommon::UpdateIdentifyStateEventHandler(AppEvent * aEvent)
-{
-    GetAppTask().mPwmIdentifyLed.UpdateAction();
-}
 
 void AppTaskCommon::IdentifyEffectHandler(Clusters::Identify::EffectIdentifierEnum aEffect)
 {
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-
     switch (aEffect)
     {
     case Clusters::Identify::EffectIdentifierEnum::kBlink:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kBlink");
-        event.Handler = [](AppEvent *) {
-            GetAppTask().mPwmIdentifyLed.InitiateBlinkAction(kIdentifyBlinkRateMs, kIdentifyBlinkRateMs);
-        };
+        PwmManager::getInstance().setPwmBlink(PwmManager::EAppPwm_Indication, kIdentifyBlinkRateMs, kIdentifyBlinkRateMs);
         break;
     case Clusters::Identify::EffectIdentifierEnum::kBreathe:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kBreathe");
-        event.Handler = [](AppEvent *) {
-            GetAppTask().mPwmIdentifyLed.InitiateBreatheAction(PWMDevice::kBreatheType_Both, kIdentifyBreatheRateMs);
-        };
+        PwmManager::getInstance().setPwmBreath(PwmManager::EAppPwm_Indication, kIdentifyBreatheRateMs);
         break;
     case Clusters::Identify::EffectIdentifierEnum::kOkay:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kOkay");
-        event.Handler = [](AppEvent *) {
-            GetAppTask().mPwmIdentifyLed.InitiateBlinkAction(kIdentifyOkayOnRateMs, kIdentifyOkayOffRateMs);
-        };
+        PwmManager::getInstance().setPwmBlink(PwmManager::EAppPwm_Indication, kIdentifyOkayOnRateMs, kIdentifyOkayOffRateMs);
         break;
     case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kChannelChange");
-        event.Handler = [](AppEvent *) {
-            GetAppTask().mPwmIdentifyLed.InitiateBlinkAction(kIdentifyChannelChangeRateMs, kIdentifyChannelChangeRateMs);
-        };
+        PwmManager::getInstance().setPwmBlink(PwmManager::EAppPwm_Indication, kIdentifyChannelChangeRateMs,
+                                              kIdentifyChannelChangeRateMs);
         break;
     case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kFinishEffect");
-        event.Handler = [](AppEvent *) {
-            GetAppTask().mPwmIdentifyLed.InitiateBlinkAction(kIdentifyFinishOnRateMs, kIdentifyFinishOffRateMs);
-        };
+        PwmManager::getInstance().setPwmBlink(PwmManager::EAppPwm_Indication, kIdentifyFinishOnRateMs, kIdentifyFinishOffRateMs);
         break;
     case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
         ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kStopEffect");
-        event.Handler = [](AppEvent *) { GetAppTask().mPwmIdentifyLed.StopAction(); };
-        event.Type    = AppEvent::kEventType_IdentifyStop;
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Indication, false);
         break;
     default:
         ChipLogProgress(Zcl, "No identifier effect");
         return;
     }
-
-    GetAppTask().PostEvent(&event);
 }
-#endif
 
-#if APP_USE_BLE_START_BUTTON
 void AppTaskCommon::StartBleAdvButtonEventHandler(void)
 {
     AppEvent event;
@@ -574,7 +494,6 @@ void AppTaskCommon::StartBleAdvHandler(AppEvent * aEvent)
         LOG_ERR("OpenBasicCommissioningWindow fail");
     }
 }
-#endif
 
 void AppTaskCommon::FactoryResetButtonEventHandler(void)
 {
@@ -629,7 +548,7 @@ void AppTaskCommon::FactoryResetTimerEventHandler(AppEvent * aEvent)
     LOG_INF("Factory Reset Trigger Counter is cleared");
 }
 
-#if APP_USE_THREAD_START_BUTTON || !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
 void AppTaskCommon::StartThreadButtonEventHandler(void)
 {
     AppEvent event;
@@ -662,7 +581,6 @@ void AppTaskCommon::StartThreadHandler(AppEvent * aEvent)
 }
 #endif
 
-#if APP_USE_EXAMPLE_START_BUTTON
 void AppTaskCommon::ExampleActionButtonEventHandler(void)
 {
     AppEvent event;
@@ -682,7 +600,6 @@ void AppTaskCommon::SetExampleButtonCallbacks(EventHandler aAction_CB)
 {
     ExampleActionEventHandler = aAction_CB;
 }
-#endif
 
 void AppTaskCommon::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */)
 {
@@ -690,9 +607,7 @@ void AppTaskCommon::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /*
     {
     case DeviceEventType::kCHIPoBLEAdvertisingChange:
         sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
         UpdateStatusLED();
-#endif
 #ifdef CONFIG_CHIP_NFC_COMMISSIONING
         if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
         {
@@ -711,14 +626,7 @@ void AppTaskCommon::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /*
         }
 #endif
         break;
-    case DeviceEventType::kThreadStateChange:
-        sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned();
-        sIsThreadEnabled     = ConnectivityMgr().IsThreadEnabled();
-        sIsThreadAttached    = ConnectivityMgr().IsThreadAttached();
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        UpdateStatusLED();
-#endif
-        break;
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     case DeviceEventType::kDnssdInitialized:
 #if CONFIG_CHIP_OTA_REQUESTOR
         InitBasicOTARequestor();
@@ -730,6 +638,15 @@ void AppTaskCommon::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /*
 #endif /* CONFIG_BOOTLOADER_MCUBOOT */
 #if CONFIG_CHIP_OTA_REQUESTOR
         }
+#endif
+        break;
+    case DeviceEventType::kThreadStateChange:
+        sIsNetworkProvisioned = ConnectivityMgr().IsThreadProvisioned();
+        sIsNetworkEnabled     = ConnectivityMgr().IsThreadEnabled();
+        sIsThreadAttached     = ConnectivityMgr().IsThreadAttached();
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+        UpdateStatusLED();
 #endif
         break;
     default:
diff --git a/examples/platform/telink/common/src/SensorManagerCommon.cpp b/examples/platform/telink/common/src/SensorManagerCommon.cpp
index 1c4d5f9990a0cb..0164749ce7167b 100644
--- a/examples/platform/telink/common/src/SensorManagerCommon.cpp
+++ b/examples/platform/telink/common/src/SensorManagerCommon.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "SensorManagerCommon.h"
+#include "PWMManager.h"
 #ifdef CONFIG_CHIP_USE_MARS_SENSOR
 #include <zephyr/drivers/sensor.h>
 #endif // CONFIG_CHIP_USE_MARS_SENSOR
@@ -36,7 +37,6 @@ constexpr uint16_t kSensorBanForNextMeasurTimeout = 1000; // 1s timeout
 const struct device * const sht3xd_dev = DEVICE_DT_GET_ONE(sensirion_sht3xd);
 
 #ifdef USE_COLOR_TEMPERATURE_LIGHT
-const struct device * const ws2812_dev = DEVICE_DT_GET(DT_ALIAS(led_strip));
 
 #define TEMP_LOW_LIM 0   // °C
 #define TEMP_HIGH_LIM 40 // °C
@@ -60,16 +60,6 @@ CHIP_ERROR SensorManager::Init()
 
 #ifdef USE_COLOR_TEMPERATURE_LIGHT
     RgbColor_t rgb = { 0 };
-
-    CHIP_ERROR err = sSensorManager.mWS2812Device.Init(ws2812_dev, STRIP_NUM_PIXELS(led_strip));
-    if (err != CHIP_NO_ERROR)
-    {
-        LOG_ERR("WS2812 Device Init fail");
-        return err;
-    }
-
-    sSensorManager.mWS2812Device.SetLevel(&rgb);
-    sSensorManager.mWS2812Device.Set(SET_RGB_TURN_ON);
 #endif // USE_COLOR_TEMPERATURE_LIGHT
 
     // Initialise the timer to ban sensor measurement
@@ -245,7 +235,9 @@ void SensorManager::SetColorTemperatureLight(int8_t temp)
         LOG_ERR("Couldn't set the Color Temperature Light");
     }
 
-    sSensorManager.mWS2812Device.SetLevel(&rgb);
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, ((uint32_t) rgb.r * 1000) / 0xff);
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, ((uint32_t) rgb.g * 1000) / 0xff);
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Blue, ((uint32_t) rgb.b * 1000) / 0xff);
 }
 #endif // USE_COLOR_TEMPERATURE_LIGHT
 #endif // CONFIG_CHIP_USE_MARS_SENSOR
diff --git a/examples/platform/telink/common/src/mainCommon.cpp b/examples/platform/telink/common/src/mainCommon.cpp
index ea13dc2f51252f..c80ab4c609e971 100644
--- a/examples/platform/telink/common/src/mainCommon.cpp
+++ b/examples/platform/telink/common/src/mainCommon.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021-2023 Project CHIP Authors
+ *    Copyright (c) 2021-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -128,9 +128,12 @@ int main(void)
         LOG_ERR("StartEventLoopTask fail");
         goto exit;
     }
+
 #ifdef CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET
     FactoryResetOnBoot();
 #endif /* CONFIG_CHIP_ENABLE_POWER_ON_FACTORY_RESET */
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     err = ThreadStackMgr().InitThreadStack();
     if (err != CHIP_NO_ERROR)
     {
@@ -152,6 +155,9 @@ int main(void)
         LOG_ERR("SetThreadDeviceType fail");
         goto exit;
     }
+#else
+    return CHIP_ERROR_INTERNAL;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
 
     err = GetAppTask().StartApp();
 
diff --git a/examples/platform/telink/util/include/ButtonManager.h b/examples/platform/telink/util/include/ButtonManager.h
index e9ea1b60b17816..c61f165dbca94e 100644
--- a/examples/platform/telink/util/include/ButtonManager.h
+++ b/examples/platform/telink/util/include/ButtonManager.h
@@ -17,53 +17,125 @@
 
 #pragma once
 
-#include <vector>
-#include <zephyr/device.h>
+#include <cstddef>
+#include <set>
 
-#define STATE_HIGH 1
-#define STATE_LOW 0
+class ButtonBackend
+{
+public:
+    virtual bool linkHW(void (*on_button_change)(size_t button, bool pressed, void * context), void * context) = 0;
+};
 
-class Button
+class ButtonManager
 {
 public:
-    void Configure(const gpio_dt_spec * input_button_dt, const gpio_dt_spec * output_button_dt, void (*callback)(void));
-    void Configure(const gpio_dt_spec * input_button_dt, void (*callback)(void));
-    void Poll(Button * previous);
-    void PollIRQ(const struct device * dev, uint32_t pins);
-    void SetCallback(void (*callback)(void));
+    static ButtonManager & getInstance();
+    void addCallback(void (*callback)(void), size_t button, bool pressed);
+    void rmCallback(void (*callback)(void));
+    void rmCallback(size_t button, bool pressed);
+    void linkBackend(ButtonBackend & backend);
+
+    ButtonManager(ButtonManager const &)  = delete;
+    void operator=(ButtonManager const &) = delete;
 
 private:
-    int Init(void);
-    int Deinit(void);
-
-    const struct gpio_dt_spec * mInput_button;
-    const struct gpio_dt_spec * mOutput_matrix_pin;
-    int mPreviousState = STATE_LOW;
-    struct gpio_callback mButton_cb_data;
-    void (*mCallback)(void) = NULL;
+    struct Event
+    {
+        size_t button;
+        bool pressed;
+        void (*callback)(void);
+
+        friend bool operator<(const Event & lhs, const Event & rhs)
+        {
+            if (lhs.button < rhs.button)
+            {
+                return true;
+            }
+            else if (lhs.button > rhs.button)
+            {
+                return false;
+            }
+            else if (lhs.pressed < rhs.pressed)
+            {
+                return true;
+            }
+            else if (lhs.pressed > rhs.pressed)
+            {
+                return false;
+            }
+            else if (lhs.callback < rhs.callback)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        friend bool operator>(const Event & lhs, const Event & rhs)
+        {
+            if (lhs.button > rhs.button)
+            {
+                return true;
+            }
+            else if (lhs.button < rhs.button)
+            {
+                return false;
+            }
+            else if (lhs.pressed > rhs.pressed)
+            {
+                return true;
+            }
+            else if (lhs.pressed < rhs.pressed)
+            {
+                return false;
+            }
+            else if (lhs.callback > rhs.callback)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    };
+
+    ButtonManager();
+
+    static void onButton(size_t button, bool pressed, void * buttonMgr);
+
+    std::set<Event> m_events;
 };
 
-class ButtonManager
+#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
+
+class ButtonPool : public ButtonBackend
 {
 public:
-    void Init(void);
-    void Poll(void);
-    void PollIRQ(const struct device * dev, uint32_t pins);
-    void AddButton(Button & button);
-    void SetCallback(unsigned int index, void (*callback)(void));
+    static ButtonPool & getInstance();
+    bool linkHW(void (*on_button_change)(size_t button, bool pressed, void * context), void * context);
+
+    ButtonPool(ButtonPool const &)     = delete;
+    void operator=(ButtonPool const &) = delete;
 
 private:
-    std::vector<Button> mButtons;
+    ButtonPool(){};
+};
+
+#else
+
+class ButtonMatrix : public ButtonBackend
+{
+public:
+    static ButtonMatrix & getInstance();
+    bool linkHW(void (*on_button_change)(size_t button, bool pressed, void * context), void * context);
 
-    friend ButtonManager & ButtonManagerInst(void);
+    ButtonMatrix(ButtonMatrix const &)   = delete;
+    void operator=(ButtonMatrix const &) = delete;
 
-    static ButtonManager sInstance;
+private:
+    ButtonMatrix(){};
 };
 
-/**
- * Returns the KeyManager singleton object.
- */
-inline ButtonManager & ButtonManagerInst(void)
-{
-    return ButtonManager::sInstance;
-}
+#endif // CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
diff --git a/examples/platform/telink/util/include/LEDManager.h b/examples/platform/telink/util/include/LEDManager.h
new file mode 100644
index 00000000000000..72792fa9ba28f3
--- /dev/null
+++ b/examples/platform/telink/util/include/LEDManager.h
@@ -0,0 +1,119 @@
+/*
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <cstddef>
+#include <set>
+
+class LedBackend
+{
+public:
+    virtual bool linkHW()                                        = 0;
+    virtual void setLedHW(size_t led, bool state)                = 0;
+    virtual void setLedHW(size_t led, size_t onMs, size_t offMs) = 0;
+};
+
+class LedManager
+{
+public:
+    enum EAppLed
+    {
+        EAppLed_Status = 0,
+        EAppLed_App0,
+        EAppLed_App1,
+    };
+
+    static LedManager & getInstance();
+
+    void setLed(EAppLed appLed, bool state);
+    void setLed(EAppLed appLed, size_t onMs, size_t offMs);
+
+    void linkLed(EAppLed appLed, size_t led);
+    void unlinkLed(EAppLed appLed);
+    void unlinkLed(size_t led);
+    void linkBackend(LedBackend & backend);
+
+    LedManager(LedManager const &)     = delete;
+    void operator=(LedManager const &) = delete;
+
+private:
+    struct LedLink
+    {
+        enum EAppLed appLed;
+        size_t led;
+
+        friend bool operator<(const LedLink & lhs, const LedLink & rhs)
+        {
+            if (lhs.appLed < rhs.appLed)
+            {
+                return true;
+            }
+            else if (lhs.appLed > rhs.appLed)
+            {
+                return false;
+            }
+            else if (lhs.led < rhs.led)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        friend bool operator>(const LedLink & lhs, const LedLink & rhs)
+        {
+            if (lhs.appLed > rhs.appLed)
+            {
+                return true;
+            }
+            else if (lhs.appLed < rhs.appLed)
+            {
+                return false;
+            }
+            else if (lhs.led > rhs.led)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    };
+
+    LedManager();
+
+    std::set<LedLink> m_leds;
+    LedBackend * m_backend;
+};
+
+class LedPool : public LedBackend
+{
+public:
+    static LedPool & getInstance();
+    bool linkHW();
+    void setLedHW(size_t led, bool state);
+    void setLedHW(size_t led, size_t onMs, size_t offMs);
+
+    LedPool(LedPool const &)        = delete;
+    void operator=(LedPool const &) = delete;
+
+private:
+    LedPool(){};
+};
diff --git a/examples/platform/telink/util/include/LEDWidget.h b/examples/platform/telink/util/include/LEDWidget.h
deleted file mode 100644
index 3829e7ac5628ea..00000000000000
--- a/examples/platform/telink/util/include/LEDWidget.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
-
-class LEDWidget
-{
-public:
-    typedef void (*LEDWidgetStateUpdateHandler)(LEDWidget * ledWidget);
-
-    static void SetStateUpdateCallback(LEDWidgetStateUpdateHandler stateUpdateCb);
-    void Init(gpio_dt_spec gpio);
-    void Set(bool state);
-    void Invert(void);
-    void Blink(uint32_t changeRateMS);
-    void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
-    void UpdateState();
-
-private:
-    uint32_t mBlinkOnTimeMS;
-    uint32_t mBlinkOffTimeMS;
-    gpio_dt_spec mGPIO;
-    bool mState;
-    k_timer mLedTimer;
-
-    static void LedStateTimerHandler(k_timer * timer);
-
-    void DoSet(bool state);
-    void ScheduleStateChange();
-};
diff --git a/examples/platform/telink/util/include/PWMDevice.h b/examples/platform/telink/util/include/PWMDevice.h
deleted file mode 100644
index 9b3bc24d30d8c6..00000000000000
--- a/examples/platform/telink/util/include/PWMDevice.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <system/SystemError.h>
-
-#include <cstdint>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/pwm.h>
-
-class PWMDevice
-{
-public:
-    enum Action_t : uint8_t
-    {
-        ON_ACTION = 0,
-        OFF_ACTION,
-        LEVEL_ACTION,
-        COLOR_ACTION_XY,
-        COLOR_ACTION_HSV,
-        COLOR_ACTION_CT,
-
-        INVALID_ACTION
-    };
-
-    enum State_t : uint8_t
-    {
-        kState_On = 0,
-        kState_Off,
-    };
-
-    enum BreatheType_t : uint8_t
-    {
-        kBreatheType_Invalid = 0,
-        kBreatheType_Rising,
-        kBreatheType_Falling,
-        kBreatheType_Both,
-    };
-
-    using PWMCallback_fn      = void (*)(Action_t, int32_t);
-    using PWMTimerCallback_fn = void (*)(k_timer *);
-
-    CHIP_ERROR Init(const pwm_dt_spec * pwmDevice, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel = 0);
-    void Set(bool aOn);
-    bool IsTurnedOn(void) const { return mState == kState_On; }
-    uint8_t GetLevel(void) const { return mLevel; }
-    uint8_t GetMinLevel(void) const { return mMinLevel; }
-    uint8_t GetMaxLevel(void) const { return mMaxLevel; }
-    void SetCallbacks(PWMCallback_fn aActionInitiated_CB, PWMCallback_fn aActionCompleted_CB,
-                      PWMTimerCallback_fn aActionBlinkStateUpdate_CB);
-    bool InitiateAction(Action_t aAction, int32_t aActor, uint8_t * value);
-    void InitiateBlinkAction(uint32_t onTimeMS, uint32_t offTimeMS);
-    void InitiateBreatheAction(BreatheType_t type, uint32_t cycleTimeMS);
-    void StopAction(void);
-    void UpdateAction(void);
-
-private:
-    State_t mState;
-    uint8_t mMinLevel;
-    uint8_t mMaxLevel;
-    uint8_t mLevel;
-    uint8_t mBreatheStepLevel;
-    uint8_t mBreatheStepCntr;
-    bool mBreatheBothDirection;
-    BreatheType_t mBreatheType;
-    uint32_t mBreatheStepNumb;
-    uint32_t mBlinkOnTimeMS;
-    uint32_t mBlinkOffTimeMS;
-    k_timer mPwmLedTimer;
-    const pwm_dt_spec * mPwmDevice;
-
-    PWMCallback_fn mActionInitiated_CB;
-    PWMCallback_fn mActionCompleted_CB;
-
-    void SetLevel(uint8_t aLevel);
-    void UpdateLight(void);
-    void StartBlinkTimer(void);
-    void StartBreatheTimer(uint32_t stepTimeMS);
-    void ClearAction(void);
-    static void PwmLedTimerHandler(k_timer * timer);
-};
diff --git a/examples/platform/telink/util/include/PWMManager.h b/examples/platform/telink/util/include/PWMManager.h
new file mode 100644
index 00000000000000..852216d08b6d43
--- /dev/null
+++ b/examples/platform/telink/util/include/PWMManager.h
@@ -0,0 +1,153 @@
+/*
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <set>
+
+class PwmBackend
+{
+public:
+    virtual bool linkHW() = 0;
+
+    virtual void setPwmHW(size_t pwm, bool state)                     = 0;
+    virtual void setPwmHW(size_t pwm, uint32_t permille)              = 0;
+    virtual void setPwmHWBlink(size_t pwm, size_t onMs, size_t offMs) = 0;
+    virtual void setPwmHWBreath(size_t pwm, size_t onMs)              = 0;
+};
+
+class PwmManager
+{
+public:
+    enum EAppPwm
+    {
+        EAppPwm_Indication = 0,
+        EAppPwm_Red,
+        EAppPwm_Green,
+        EAppPwm_Blue,
+    };
+
+    static PwmManager & getInstance();
+
+    void setPwm(EAppPwm appPwm, bool state);
+    void setPwm(EAppPwm appPwm, uint32_t permille);
+    void setPwmBlink(EAppPwm appPwm, size_t onMs, size_t offMs);
+    void setPwmBreath(EAppPwm appPwm, size_t BrathMs);
+
+    void linkPwm(EAppPwm appPwm, size_t pwm);
+    void unlinkPwm(EAppPwm appPwm);
+    void unlinkPwm(size_t pwm);
+    void linkBackend(PwmBackend & backend);
+
+    PwmManager(PwmManager const &)     = delete;
+    void operator=(PwmManager const &) = delete;
+
+private:
+    struct PwmLink
+    {
+        enum EAppPwm appPwm;
+        size_t pwm;
+
+        friend bool operator<(const PwmLink & lhs, const PwmLink & rhs)
+        {
+            if (lhs.appPwm < rhs.appPwm)
+            {
+                return true;
+            }
+            else if (lhs.appPwm > rhs.appPwm)
+            {
+                return false;
+            }
+            else if (lhs.pwm < rhs.pwm)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        friend bool operator>(const PwmLink & lhs, const PwmLink & rhs)
+        {
+            if (lhs.appPwm > rhs.appPwm)
+            {
+                return true;
+            }
+            else if (lhs.appPwm < rhs.appPwm)
+            {
+                return false;
+            }
+            else if (lhs.pwm > rhs.pwm)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    };
+
+    PwmManager();
+
+    std::set<PwmLink> m_pwms;
+    PwmBackend * m_backend;
+};
+
+#if CONFIG_WS2812_STRIP
+
+class Ws2812Strip : public PwmBackend
+{
+public:
+    static Ws2812Strip & getInstance();
+    bool linkHW();
+
+    void setPwmHW(size_t pwm, bool state);
+    void setPwmHW(size_t pwm, uint32_t permille);
+    void setPwmHWBlink(size_t pwm, size_t onMs, size_t offMs);
+    void setPwmHWBreath(size_t pwm, size_t breathMs);
+
+    Ws2812Strip(Ws2812Strip const &)    = delete;
+    void operator=(Ws2812Strip const &) = delete;
+
+private:
+    Ws2812Strip(){};
+};
+
+#else
+
+class PwmPool : public PwmBackend
+{
+public:
+    static PwmPool & getInstance();
+    bool linkHW();
+
+    void setPwmHW(size_t pwm, bool state);
+    void setPwmHW(size_t pwm, uint32_t permille);
+    void setPwmHWBlink(size_t pwm, size_t onMs, size_t offMs);
+    void setPwmHWBreath(size_t pwm, size_t breathMs);
+
+    PwmPool(PwmPool const &)        = delete;
+    void operator=(PwmPool const &) = delete;
+
+private:
+    PwmPool(){};
+};
+
+#endif // CONFIG_WS2812_STRIP
diff --git a/examples/platform/telink/util/include/ThreadUtil.h b/examples/platform/telink/util/include/ThreadUtil.h
index eb6ed1e7f4b42d..df5e8d2eb147ba 100644
--- a/examples/platform/telink/util/include/ThreadUtil.h
+++ b/examples/platform/telink/util/include/ThreadUtil.h
@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,4 +17,8 @@
 
 #pragma once
 
+#include "AppConfig.h"
+
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
 void StartDefaultThreadNetwork(void);
+#endif
diff --git a/examples/platform/telink/util/include/WS2812Device.h b/examples/platform/telink/util/include/WS2812Device.h
deleted file mode 100644
index 261802bde5f5be..00000000000000
--- a/examples/platform/telink/util/include/WS2812Device.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <ColorFormat.h>
-
-#include <zephyr/drivers/led_strip.h>
-
-#include <system/SystemError.h>
-
-#define STRIP_NUM_PIXELS(LED_STRIP) DT_PROP(DT_ALIAS(LED_STRIP), chain_length)
-#define RGB_MIN_VALUE 0
-#define RGB_MAX_VALUE 255
-
-#define SET_RGB_TURN_OFF 0
-#define SET_RGB_TURN_ON 1
-
-class WS2812Device
-{
-public:
-    CHIP_ERROR Init(const struct device * ws2812Device, uint32_t aChainLength);
-    void SetLevel(RgbColor_t * pRgb);
-    void Set(bool aTurnOn);
-    bool IsTurnedOn(void);
-    uint8_t GetBlueLevel(void) const { return mLedRgb.b; }
-    uint8_t GetGreenLevel(void) const { return mLedRgb.g; }
-    uint8_t GetRedLevel(void) const { return mLedRgb.r; }
-
-private:
-    enum WS2812State_t : uint8_t
-    {
-        kRgbState_On = 0,
-        kRgbState_Off,
-    };
-
-    void UpdateRgbLight();
-
-    const struct device * mWs2812Device;
-    uint32_t mChainLength;
-    RgbColor_t mLedRgb;
-    WS2812State_t mState;
-};
diff --git a/examples/platform/telink/util/src/ButtonManager.cpp b/examples/platform/telink/util/src/ButtonManager.cpp
index a4c5e73c590120..5d0d297a75d21e 100644
--- a/examples/platform/telink/util/src/ButtonManager.cpp
+++ b/examples/platform/telink/util/src/ButtonManager.cpp
@@ -16,203 +16,135 @@
  *    limitations under the License.
  */
 
-#include <zephyr/device.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/irq.h>
-#include <zephyr/kernel.h>
+#include <ButtonManager.h>
 #include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ButtonManager, CONFIG_CHIP_APP_LOG_LEVEL);
 
-LOG_MODULE_REGISTER(ButtonManager);
+ButtonManager & ButtonManager::getInstance()
+{
+    static ButtonManager instance;
 
-#include <ButtonManager.h>
+    return instance;
+}
 
-ButtonManager ButtonManager::sInstance;
+ButtonManager::ButtonManager() : m_events{} {}
 
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-void button_pressed(const struct device * dev, struct gpio_callback * cb, uint32_t pins);
-#endif
-
-void Button::Configure(const gpio_dt_spec * input_button_dt, const gpio_dt_spec * output_button_dt, void (*callback)(void))
+void ButtonManager::addCallback(void (*callback)(void), size_t button, bool pressed)
 {
-    if (!device_is_ready(input_button_dt->port))
-    {
-        LOG_ERR("Input port %s is not ready\n", input_button_dt->port->name);
-    }
+    Event event = { .button = button, .pressed = pressed, .callback = callback };
 
-    mInput_button      = input_button_dt;
-    mOutput_matrix_pin = output_button_dt;
-    mCallback          = callback;
+    m_events.insert(event);
 }
 
-int Button::Init(void)
+void ButtonManager::rmCallback(void (*callback)(void))
 {
-    int ret = 0;
-
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-    ret = gpio_pin_configure_dt(mInput_button, GPIO_INPUT);
-    if (ret < 0)
+    for (auto it = m_events.begin(); it != m_events.end();)
     {
-        LOG_ERR("Config in pin err: %d", ret);
-        return ret;
-    }
-
-    ret = gpio_pin_interrupt_configure_dt(mInput_button, GPIO_INT_EDGE_TO_ACTIVE);
-    if (ret < 0)
-    {
-        LOG_ERR("Config irq pin err: %d", ret);
-        return ret;
-    }
-
-    gpio_init_callback(&mButton_cb_data, button_pressed, BIT(mInput_button->pin));
-    ret = gpio_add_callback(mInput_button->port, &mButton_cb_data);
-    if (ret < 0)
-    {
-        LOG_ERR("Config gpio_init_callback err: %d", ret);
-        return ret;
-    }
-#else
-
-    ret = gpio_pin_configure_dt(mOutput_matrix_pin, GPIO_OUTPUT_ACTIVE);
-    if (ret < 0)
-    {
-        LOG_ERR("Config out pin err: %d", ret);
-        return ret;
-    }
-
-    ret = gpio_pin_configure_dt(mInput_button, GPIO_INPUT);
-    if (ret < 0)
-    {
-        LOG_ERR("Config in pin err: %d", ret);
-        return ret;
+        if (it->callback == callback)
+        {
+            it = m_events.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
     }
-#endif
-
-    return ret;
 }
 
-int Button::Deinit(void)
+void ButtonManager::rmCallback(size_t button, bool pressed)
 {
-    int ret = 0;
-
-    /* Reconfigure output key pin to input */
-    ret = gpio_pin_configure_dt(mOutput_matrix_pin, GPIO_INPUT | GPIO_PULL_DOWN);
-    if (ret < 0)
+    for (auto it = m_events.begin(); it != m_events.end();)
     {
-        LOG_ERR("Reconfig out pin err: %d", ret);
-        return ret;
+        if (it->button == button && it->pressed == pressed)
+        {
+            it = m_events.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
     }
-
-    return ret;
 }
 
-void Button::Poll(Button * previous)
+void ButtonManager::linkBackend(ButtonBackend & backend)
 {
-    int ret = 0;
-
-    if (previous != NULL)
+    if (!backend.linkHW(onButton, this))
     {
-        ret = previous->Deinit();
-        assert(ret >= 0);
+        LOG_ERR("Button backend not inited!");
     }
+}
 
-    ret = Init();
-    assert(ret >= 0);
-
-    ret = gpio_pin_get_dt(mInput_button);
-    assert(ret >= 0);
+void ButtonManager::onButton(size_t button, bool pressed, void * buttonMgr)
+{
+    ButtonManager * buttonManager = static_cast<ButtonManager *>(buttonMgr);
 
-    if (ret == STATE_HIGH && ret != mPreviousState)
+    for (auto it = buttonManager->m_events.begin(); it != buttonManager->m_events.end(); ++it)
     {
-        if (mCallback != NULL)
+        if (it->button == button && it->pressed == pressed && it->callback)
         {
-            mCallback();
+            it->callback();
         }
     }
-
-    mPreviousState = ret;
-
-    k_msleep(10);
 }
 
-void Button::SetCallback(void (*callback)(void))
-{
-    mCallback = callback;
-}
+#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
 
-void ButtonManager::AddButton(Button & button)
-{
-    mButtons.push_back(button);
-}
+#include <zephyr_key_pool.h>
+
+static KEY_POOL_DEFINE(key_pool);
 
-void ButtonManager::SetCallback(unsigned int index, void (*callback)(void))
+ButtonPool & ButtonPool::getInstance()
 {
-    if (mButtons.size() <= index)
-    {
-        LOG_ERR("Wrong button index");
-    }
+    static ButtonPool instance;
 
-    mButtons[index].SetCallback(callback);
+    return instance;
 }
 
-void ButtonManager::Poll(void)
+bool ButtonPool::linkHW(void (*on_button_change)(size_t button, bool pressed, void * context), void * context)
 {
-    static Button * previous = NULL;
+    bool result = false;
 
-    for (unsigned int i = 0; i < mButtons.size(); i++)
+    if (key_pool_init(&key_pool))
     {
-        mButtons[i].Poll(previous);
-        previous = &mButtons[i];
+        key_pool_set_callback(&key_pool, on_button_change, context);
+        LOG_INF("Key pool inited");
+        result = true;
     }
-
-    k_msleep(10);
-}
-
-void ButtonEntry(void * param1, void * param2, void * param3)
-{
-    ButtonManager & sInstance = ButtonManagerInst();
-
-    while (true)
+    else
     {
-        sInstance.Poll();
+        LOG_ERR("Key pool not inited!");
     }
+    return result;
 }
 
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-void button_pressed(const struct device * dev, struct gpio_callback * cb, uint32_t pins)
-{
-    ButtonManager & sInstance = ButtonManagerInst();
-    sInstance.PollIRQ(dev, pins);
-}
+#else
 
-void ButtonManager::PollIRQ(const struct device * dev, uint32_t pins)
+#include <zephyr_key_matrix.h>
+
+static KEY_MATRIX_DEFINE(key_matrix);
+
+ButtonMatrix & ButtonMatrix::getInstance()
 {
-    for (unsigned int i = 0; i < mButtons.size(); i++)
-    {
-        mButtons[i].PollIRQ(dev, pins);
-    }
+    static ButtonMatrix instance;
+
+    return instance;
 }
 
-void Button::PollIRQ(const struct device * dev, uint32_t pins)
+bool ButtonMatrix::linkHW(void (*on_button_change)(size_t button, bool pressed, void * context), void * context)
 {
-    if ((BIT(mInput_button->pin) & pins) && (mCallback != NULL) && (dev == mInput_button->port))
+    bool result = false;
+
+    if (key_matrix_init(&key_matrix))
     {
-        mCallback();
+        key_matrix_set_callback(&key_matrix, on_button_change, context);
+        LOG_INF("Key matrix inited");
+        result = true;
     }
-}
-
-void Button::Configure(const gpio_dt_spec * input_button_dt, void (*callback)(void))
-{
-    if (!device_is_ready(input_button_dt->port))
+    else
     {
-        LOG_ERR("%s is not ready\n", input_button_dt->port->name);
+        LOG_ERR("Key matrix not inited!");
     }
-
-    mInput_button = input_button_dt;
-    mCallback     = callback;
-
-    Init();
+    return result;
 }
 
-#else
-K_THREAD_DEFINE(buttonThread, 512, ButtonEntry, NULL, NULL, NULL, K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1), 0, 0);
-#endif
+#endif // CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
diff --git a/examples/platform/telink/util/src/LEDManager.cpp b/examples/platform/telink/util/src/LEDManager.cpp
new file mode 100644
index 00000000000000..f2717c59ee249c
--- /dev/null
+++ b/examples/platform/telink/util/src/LEDManager.cpp
@@ -0,0 +1,154 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "LEDManager.h"
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(LedManager, CONFIG_CHIP_APP_LOG_LEVEL);
+
+LedManager & LedManager::getInstance()
+{
+    static LedManager instance;
+
+    return instance;
+}
+
+LedManager::LedManager() : m_leds{}, m_backend(NULL) {}
+
+void LedManager::setLed(EAppLed appLed, bool state)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_leds.begin(); it != m_leds.end(); ++it)
+    {
+        if (it->appLed == appLed)
+        {
+            m_backend->setLedHW(it->led, state);
+        }
+    }
+}
+
+void LedManager::setLed(EAppLed appLed, size_t onMs, size_t offMs)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_leds.begin(); it != m_leds.end(); ++it)
+    {
+        if (it->appLed == appLed)
+        {
+            m_backend->setLedHW(it->led, onMs, offMs);
+        }
+    }
+}
+
+void LedManager::linkLed(EAppLed appLed, size_t led)
+{
+    LedLink link = { .appLed = appLed, .led = led };
+
+    m_leds.insert(link);
+}
+
+void LedManager::unlinkLed(EAppLed appLed)
+{
+    for (auto it = m_leds.begin(); it != m_leds.end();)
+    {
+        if (it->appLed == appLed)
+        {
+            it = m_leds.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+}
+
+void LedManager::unlinkLed(size_t led)
+{
+    for (auto it = m_leds.begin(); it != m_leds.end();)
+    {
+        if (it->led == led)
+        {
+            it = m_leds.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+}
+
+void LedManager::linkBackend(LedBackend & backend)
+{
+    if (backend.linkHW())
+    {
+        m_backend = &backend;
+    }
+    else
+    {
+        LOG_ERR("LED backend not inited!");
+    }
+}
+
+#include <zephyr_led_pool.h>
+
+static LED_POOL_DEFINE(led_pool);
+
+LedPool & LedPool::getInstance()
+{
+    static LedPool instance;
+
+    return instance;
+}
+
+bool LedPool::linkHW()
+{
+    bool result = false;
+
+    if (led_pool_init(&led_pool))
+    {
+        LOG_INF("LED pool inited");
+        result = true;
+    }
+    else
+    {
+        LOG_ERR("LED pool not inited!");
+    }
+    return result;
+}
+
+void LedPool::setLedHW(size_t led, bool state)
+{
+    if (!led_pool_set(&led_pool, led, state ? LED_ON : LED_OFF))
+    {
+        LOG_WRN("LED pool set led %u failed!", led);
+    }
+}
+
+void LedPool::setLedHW(size_t led, size_t onMs, size_t offMs)
+{
+    if (!led_pool_set(&led_pool, led, LED_BLINK, K_MSEC(onMs), K_MSEC(offMs)))
+    {
+        LOG_WRN("LED pool set led %u failed!", led);
+    }
+}
diff --git a/examples/platform/telink/util/src/LEDWidget.cpp b/examples/platform/telink/util/src/LEDWidget.cpp
deleted file mode 100644
index 9db20104b6a69b..00000000000000
--- a/examples/platform/telink/util/src/LEDWidget.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "LEDWidget.h"
-
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(LEDWidget);
-
-static LEDWidget::LEDWidgetStateUpdateHandler sStateUpdateCallback;
-
-void LEDWidget::SetStateUpdateCallback(LEDWidgetStateUpdateHandler stateUpdateCb)
-{
-    if (stateUpdateCb)
-        sStateUpdateCallback = stateUpdateCb;
-}
-
-void LEDWidget::Init(gpio_dt_spec gpio)
-{
-    mBlinkOnTimeMS  = 0;
-    mBlinkOffTimeMS = 0;
-    mGPIO           = gpio;
-    mState          = false;
-
-    if (!gpio_is_ready_dt(&mGPIO))
-    {
-        LOG_ERR("GPIO device not ready");
-    }
-    else
-    {
-        int ret = gpio_pin_configure_dt(&mGPIO, GPIO_OUTPUT_ACTIVE);
-        if (ret < 0)
-        {
-            LOG_ERR("GPIO pin %d configure - fail. Status%d\n", mGPIO.pin, ret);
-        }
-    }
-
-    k_timer_init(&mLedTimer, &LEDWidget::LedStateTimerHandler, nullptr);
-    k_timer_user_data_set(&mLedTimer, this);
-
-    Set(false);
-}
-
-void LEDWidget::Invert(void)
-{
-    Set(!mState);
-}
-
-void LEDWidget::Set(bool state)
-{
-    k_timer_stop(&mLedTimer);
-    mBlinkOnTimeMS = mBlinkOffTimeMS = 0;
-    DoSet(state);
-}
-
-void LEDWidget::Blink(uint32_t changeRateMS)
-{
-    Blink(changeRateMS, changeRateMS);
-}
-
-void LEDWidget::Blink(uint32_t onTimeMS, uint32_t offTimeMS)
-{
-    k_timer_stop(&mLedTimer);
-
-    mBlinkOnTimeMS  = onTimeMS;
-    mBlinkOffTimeMS = offTimeMS;
-
-    if (mBlinkOnTimeMS != 0 && mBlinkOffTimeMS != 0)
-    {
-        DoSet(!mState);
-        ScheduleStateChange();
-    }
-}
-
-void LEDWidget::ScheduleStateChange()
-{
-    k_timer_start(&mLedTimer, K_MSEC(mState ? mBlinkOnTimeMS : mBlinkOffTimeMS), K_NO_WAIT);
-}
-
-void LEDWidget::DoSet(bool state)
-{
-    if (!gpio_is_ready_dt(&mGPIO))
-    {
-        return;
-    }
-    mState  = state;
-    int ret = gpio_pin_set_dt(&mGPIO, state);
-    if (ret < 0)
-    {
-        LOG_ERR("GPIO pin %d set -fail. Status: %d\n", mGPIO.pin, ret);
-    }
-}
-
-void LEDWidget::UpdateState()
-{
-    /* Prevent from keep updating the state if LED was set to solid On/Off value */
-    if (mBlinkOnTimeMS != 0 && mBlinkOffTimeMS != 0)
-    {
-        DoSet(!mState);
-        ScheduleStateChange();
-    }
-}
-
-void LEDWidget::LedStateTimerHandler(k_timer * timer)
-{
-    if (sStateUpdateCallback)
-        sStateUpdateCallback(reinterpret_cast<LEDWidget *>(timer->user_data));
-}
diff --git a/examples/platform/telink/util/src/PWMDevice.cpp b/examples/platform/telink/util/src/PWMDevice.cpp
deleted file mode 100644
index 8456d5482a3e6e..00000000000000
--- a/examples/platform/telink/util/src/PWMDevice.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "PWMDevice.h"
-
-#include "AppConfig.h"
-
-#include <lib/support/CodeUtils.h>
-
-#include <zephyr/drivers/pwm.h>
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(PWMDevice);
-
-constexpr uint32_t kBreatheStepTimeMS = 10;
-
-static PWMDevice::PWMTimerCallback_fn mActionBlinkStateUpdate_CB;
-
-CHIP_ERROR PWMDevice::Init(const pwm_dt_spec * pwmDevice, uint8_t aMinLevel, uint8_t aMaxLevel, uint8_t aDefaultLevel)
-{
-    // We use a gpioPin instead of a LEDWidget here because we want to use PWM
-    // and other features instead of just on/off.
-
-    mState     = kState_On;
-    mMinLevel  = aMinLevel;
-    mMaxLevel  = aMaxLevel;
-    mLevel     = aDefaultLevel;
-    mPwmDevice = pwmDevice;
-
-    if (!device_is_ready(mPwmDevice->dev))
-    {
-        LOG_ERR("PWM device %s is not ready", mPwmDevice->dev ? mPwmDevice->dev->name : "N/A");
-    }
-
-    k_timer_init(&mPwmLedTimer, &PWMDevice::PwmLedTimerHandler, nullptr);
-    k_timer_user_data_set(&mPwmLedTimer, this);
-
-    ClearAction();
-    Set(false);
-    return CHIP_NO_ERROR;
-}
-
-void PWMDevice::SetCallbacks(PWMCallback_fn aActionInitiated_CB, PWMCallback_fn aActionCompleted_CB,
-                             PWMTimerCallback_fn aActionBlinkStateUpdate_CB)
-{
-    mActionInitiated_CB        = aActionInitiated_CB;
-    mActionCompleted_CB        = aActionCompleted_CB;
-    mActionBlinkStateUpdate_CB = aActionBlinkStateUpdate_CB;
-}
-
-bool PWMDevice::InitiateAction(Action_t aAction, int32_t aActor, uint8_t * value)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate On/Off Action only when the previous one is complete.
-    if (mState == kState_Off && aAction == ON_ACTION)
-    {
-        action_initiated = true;
-        new_state        = kState_On;
-    }
-    else if (mState == kState_On && aAction == OFF_ACTION)
-    {
-        action_initiated = true;
-        new_state        = kState_Off;
-    }
-    else if ((aAction == LEVEL_ACTION || aAction == COLOR_ACTION_XY || aAction == COLOR_ACTION_HSV || aAction == COLOR_ACTION_CT) &&
-             *value != mLevel)
-    {
-        action_initiated = true;
-        if (*value == 0)
-        {
-            new_state = kState_Off;
-        }
-        else
-        {
-            new_state = kState_On;
-        }
-    }
-
-    if (action_initiated)
-    {
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-
-        if (aAction == ON_ACTION || aAction == OFF_ACTION)
-        {
-            Set(new_state == kState_On);
-        }
-        else if (aAction == LEVEL_ACTION || aAction == COLOR_ACTION_XY || aAction == COLOR_ACTION_HSV || aAction == COLOR_ACTION_CT)
-        {
-            SetLevel(*value);
-        }
-
-        if (mActionCompleted_CB)
-        {
-            mActionCompleted_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void PWMDevice::SetLevel(uint8_t aLevel)
-{
-    LOG_DBG("Setting brightness level to %u", aLevel);
-    mLevel = aLevel;
-    UpdateLight();
-}
-
-void PWMDevice::Set(bool aOn)
-{
-    mState = aOn ? kState_On : kState_Off;
-    UpdateLight();
-}
-
-void PWMDevice::UpdateLight(void)
-{
-    if (!device_is_ready(mPwmDevice->dev))
-    {
-        return;
-    }
-    constexpr uint32_t kPwmWidthUs  = 20000u;
-    const uint8_t maxEffectiveLevel = mMaxLevel - mMinLevel;
-    const uint8_t effectiveLevel    = mState == kState_On ? chip::min<uint8_t>(mLevel - mMinLevel, maxEffectiveLevel) : 0;
-
-    pwm_set(mPwmDevice->dev, mPwmDevice->channel, PWM_USEC(kPwmWidthUs), PWM_USEC(kPwmWidthUs * effectiveLevel / maxEffectiveLevel),
-            0);
-}
-
-void PWMDevice::InitiateBlinkAction(uint32_t onTimeMS, uint32_t offTimeMS)
-{
-    ClearAction();
-
-    if (onTimeMS != 0 && offTimeMS != 0)
-    {
-        mBlinkOnTimeMS  = onTimeMS;
-        mBlinkOffTimeMS = offTimeMS;
-
-        Set(mState != kState_On ? true : false);
-        StartBlinkTimer();
-    }
-    else
-    {
-        LOG_ERR("Invalid InitiateBlinkAction parameters. onTimeMS = %u, offTimeMS = %u", onTimeMS, offTimeMS);
-    }
-}
-
-void PWMDevice::InitiateBreatheAction(BreatheType_t type, uint32_t cycleTimeMS)
-{
-    ClearAction();
-
-    if (type != kBreatheType_Invalid && cycleTimeMS != 0)
-    {
-        mBreatheType      = type;
-        mBreatheStepNumb  = cycleTimeMS / kBreatheStepTimeMS;
-        mBreatheStepLevel = (mMaxLevel - mMinLevel) / mBreatheStepNumb;
-
-        if (mBreatheType == kBreatheType_Both)
-        {
-            mBreatheBothDirection = true;
-            mBreatheType          = mState == kState_On ? kBreatheType_Falling : kBreatheType_Rising;
-        }
-
-        if (mBreatheType == kBreatheType_Falling)
-        {
-            mLevel = mMaxLevel;
-        }
-        else
-        {
-            mLevel = mMinLevel;
-        }
-
-        Set(true);
-        StartBreatheTimer(kBreatheStepTimeMS);
-    }
-    else
-    {
-        LOG_ERR("Invalid InitiateBreatheAction parameters. Type = %u, cycleTimeMS = %u", type, cycleTimeMS);
-    }
-}
-
-void PWMDevice::StopAction(void)
-{
-    ClearAction();
-    Set(false);
-}
-
-void PWMDevice::UpdateAction(void)
-{
-    // Update of Breathe action
-    if (mBreatheType != kBreatheType_Invalid && mBreatheStepLevel != 0 && mBreatheStepNumb != 0)
-    {
-        if (mBreatheStepCntr == mBreatheStepNumb)
-        {
-            mBreatheStepCntr = 0;
-            if (mBreatheBothDirection)
-            {
-                mBreatheType = mBreatheType == kBreatheType_Rising ? kBreatheType_Falling : kBreatheType_Rising;
-            }
-        }
-        else
-        {
-            mBreatheStepCntr++;
-        }
-
-        if (mBreatheType == kBreatheType_Rising)
-        {
-            if (mBreatheStepCntr == mBreatheStepNumb)
-            {
-                mLevel = mMaxLevel;
-            }
-            else if (mBreatheStepCntr == 0)
-            {
-                mLevel = mMinLevel;
-            }
-            else
-            {
-                mLevel += mBreatheStepLevel;
-            }
-        }
-        else if (mBreatheType == kBreatheType_Falling)
-        {
-            if (mBreatheStepCntr == mBreatheStepNumb)
-            {
-                mLevel = mMinLevel;
-            }
-            else if (mBreatheStepCntr == 0)
-            {
-                mLevel = mMaxLevel;
-            }
-            else
-            {
-                mLevel -= mBreatheStepLevel;
-            }
-        }
-
-        Set(true);
-        StartBreatheTimer(kBreatheStepTimeMS);
-    }
-    // Update of Blink action
-    else if (mBlinkOnTimeMS != 0 && mBlinkOffTimeMS != 0)
-    {
-        Set(mState != kState_On ? true : false);
-        StartBlinkTimer();
-    }
-    else
-    {
-        LOG_ERR("PWM LED update state is incorrect");
-    }
-}
-
-void PWMDevice::StartBlinkTimer(void)
-{
-    k_timer_start(&mPwmLedTimer, K_MSEC(mState == kState_On ? mBlinkOnTimeMS : mBlinkOffTimeMS), K_NO_WAIT);
-}
-
-void PWMDevice::StartBreatheTimer(uint32_t stepTimeMS)
-{
-    k_timer_start(&mPwmLedTimer, K_MSEC(stepTimeMS), K_NO_WAIT);
-}
-
-void PWMDevice::ClearAction(void)
-{
-    k_timer_stop(&mPwmLedTimer);
-    mBreatheBothDirection = false;
-    mBreatheType          = kBreatheType_Invalid;
-    mBreatheStepLevel     = 0;
-    mBreatheStepNumb      = 0;
-    mBlinkOnTimeMS        = 0;
-    mBlinkOffTimeMS       = 0;
-    mLevel                = mMaxLevel;
-}
-
-void PWMDevice::PwmLedTimerHandler(k_timer * timer)
-{
-    if (mActionBlinkStateUpdate_CB)
-    {
-        mActionBlinkStateUpdate_CB(timer);
-    }
-}
diff --git a/examples/platform/telink/util/src/PWMManager.cpp b/examples/platform/telink/util/src/PWMManager.cpp
new file mode 100644
index 00000000000000..987b66518d44ca
--- /dev/null
+++ b/examples/platform/telink/util/src/PWMManager.cpp
@@ -0,0 +1,264 @@
+/*
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "PWMManager.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PwmManager, CONFIG_CHIP_APP_LOG_LEVEL);
+
+PwmManager & PwmManager::getInstance()
+{
+    static PwmManager instance;
+
+    return instance;
+}
+
+PwmManager::PwmManager() : m_pwms{}, m_backend(NULL) {}
+
+void PwmManager::setPwm(EAppPwm appPwm, bool state)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_pwms.begin(); it != m_pwms.end(); ++it)
+    {
+        if (it->appPwm == appPwm)
+        {
+            m_backend->setPwmHW(it->pwm, state);
+        }
+    }
+}
+
+void PwmManager::setPwm(EAppPwm appPwm, uint32_t permille)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_pwms.begin(); it != m_pwms.end(); ++it)
+    {
+        if (it->appPwm == appPwm)
+        {
+            m_backend->setPwmHW(it->pwm, permille);
+        }
+    }
+}
+
+void PwmManager::setPwmBlink(EAppPwm appPwm, size_t onMs, size_t offMs)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_pwms.begin(); it != m_pwms.end(); ++it)
+    {
+        if (it->appPwm == appPwm)
+        {
+            m_backend->setPwmHWBlink(it->pwm, onMs, offMs);
+        }
+    }
+}
+
+void PwmManager::setPwmBreath(EAppPwm appPwm, size_t BrathMs)
+{
+    if (!m_backend)
+    {
+        return;
+    }
+
+    for (auto it = m_pwms.begin(); it != m_pwms.end(); ++it)
+    {
+        if (it->appPwm == appPwm)
+        {
+            m_backend->setPwmHWBreath(it->pwm, BrathMs);
+        }
+    }
+}
+
+void PwmManager::linkPwm(EAppPwm appPwm, size_t pwm)
+{
+    PwmLink link = { .appPwm = appPwm, .pwm = pwm };
+
+    m_pwms.insert(link);
+}
+
+void PwmManager::unlinkPwm(EAppPwm appPwm)
+{
+    for (auto it = m_pwms.begin(); it != m_pwms.end();)
+    {
+        if (it->appPwm == appPwm)
+        {
+            it = m_pwms.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+}
+
+void PwmManager::unlinkPwm(size_t pwm)
+{
+    for (auto it = m_pwms.begin(); it != m_pwms.end();)
+    {
+        if (it->pwm == pwm)
+        {
+            it = m_pwms.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+}
+
+void PwmManager::linkBackend(PwmBackend & backend)
+{
+    if (backend.linkHW())
+    {
+        m_backend = &backend;
+    }
+    else
+    {
+        LOG_ERR("PWM backend not inited!");
+    }
+}
+
+#if CONFIG_WS2812_STRIP
+
+#include <zephyr_ws2812.h>
+
+static WS2812_LED_DEFINE(led_strip);
+
+Ws2812Strip & Ws2812Strip::getInstance()
+{
+    static Ws2812Strip instance;
+
+    return instance;
+}
+
+bool Ws2812Strip::linkHW()
+{
+    bool result = false;
+
+    if (ws2812_led_init(&led_strip))
+    {
+        LOG_INF("WS2812 LED inited");
+        result = true;
+    }
+    else
+    {
+        LOG_ERR("WS2812 LED not inited!");
+    }
+    return result;
+}
+
+void Ws2812Strip::setPwmHW(size_t pwm, bool state)
+{
+    LOG_INF("PWM %u turn %s", pwm, state ? "on" : "off");
+    if (!ws2812_led_set(&led_strip, pwm, state ? WS2812_LED_ON : WS2812_LED_OFF))
+    {
+        LOG_WRN("WS2812 LED set pwm %u failed!", pwm);
+    }
+}
+
+void Ws2812Strip::setPwmHW(size_t pwm, uint32_t permille)
+{
+    LOG_INF("PWM %u set %u", pwm, permille);
+    if (!ws2812_led_set(&led_strip, pwm, WS2812_LED_FIXED, permille))
+    {
+        LOG_WRN("WS2812 LED set pwm %u to %u permille failed!", pwm, permille);
+    }
+}
+
+void Ws2812Strip::setPwmHWBlink(size_t pwm, size_t onMs, size_t offMs)
+{
+    LOG_WRN("WS2812 LED setPwmHWBlink not supported");
+}
+
+void Ws2812Strip::setPwmHWBreath(size_t pwm, size_t breathMs)
+{
+
+    LOG_WRN("WS2812 LED setPwmHWBreath not supported");
+}
+
+#else
+
+#include <zephyr_pwm_pool.h>
+
+static PWM_POOL_DEFINE(pwm_pool);
+
+PwmPool & PwmPool::getInstance()
+{
+    static PwmPool instance;
+
+    return instance;
+}
+
+bool PwmPool::linkHW()
+{
+    bool result = false;
+
+    if (pwm_pool_init(&pwm_pool))
+    {
+        LOG_INF("PWM pool inited");
+        result = true;
+    }
+    else
+    {
+        LOG_ERR("PWM pool not inited!");
+    }
+    return result;
+}
+
+void PwmPool::setPwmHW(size_t pwm, bool state)
+{
+    if (!pwm_pool_set(&pwm_pool, pwm, state ? PWM_ON : PWM_OFF))
+    {
+        LOG_WRN("PWM pool set pwm %u failed!", pwm);
+    }
+}
+
+void PwmPool::setPwmHW(size_t pwm, uint32_t permille)
+{
+    if (!pwm_pool_set(&pwm_pool, pwm, PWM_FIXED, permille))
+    {
+        LOG_WRN("PWM pool set pwm %u to %u permille failed!", pwm, permille);
+    }
+}
+
+void PwmPool::setPwmHWBlink(size_t pwm, size_t onMs, size_t offMs)
+{
+    if (!pwm_pool_set(&pwm_pool, pwm, PWM_BLINK, K_MSEC(onMs), K_MSEC(offMs)))
+    {
+        LOG_WRN("PWM pool set pwm %u blink to (%u-%u)mS failed!", pwm, onMs, offMs);
+    }
+}
+
+void PwmPool::setPwmHWBreath(size_t pwm, size_t breathMs)
+{
+    if (!pwm_pool_set(&pwm_pool, pwm, PWM_BREATH, K_MSEC(breathMs)))
+    {
+        LOG_WRN("PWM pool set pwm %u breath to %umS failed!", pwm, breathMs);
+    }
+}
+
+#endif // CONFIG_WS2812_STRIP
diff --git a/examples/platform/telink/util/src/ThreadUtil.cpp b/examples/platform/telink/util/src/ThreadUtil.cpp
index b8c13d54a11edd..7798b18bf02d41 100644
--- a/examples/platform/telink/util/src/ThreadUtil.cpp
+++ b/examples/platform/telink/util/src/ThreadUtil.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright (c) 2021-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,8 @@
 
 #include "ThreadUtil.h"
 
+#if !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE && CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
 #include <platform/CHIPDeviceLayer.h>
 
 #include <app/server/Dnssd.h>
@@ -51,3 +53,5 @@ void StartDefaultThreadNetwork(void)
 
     chip::app::DnssdServer::Instance().StartServer();
 }
+
+#endif
diff --git a/examples/platform/telink/util/src/WS2812Device.cpp b/examples/platform/telink/util/src/WS2812Device.cpp
deleted file mode 100644
index 06b70373f8ff29..00000000000000
--- a/examples/platform/telink/util/src/WS2812Device.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *    Copyright (c) 2023 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "WS2812Device.h"
-
-#include <lib/support/CodeUtils.h>
-
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(WS2812Device);
-
-using namespace chip;
-
-CHIP_ERROR WS2812Device::Init(const struct device * ws2812Device, uint32_t aChainLength)
-{
-    mWs2812Device = ws2812Device;
-    mChainLength  = aChainLength;
-    mState        = kRgbState_Off;
-    memset(&mLedRgb, RGB_MAX_VALUE, sizeof(RgbColor_t));
-
-    if (!device_is_ready(mWs2812Device))
-    {
-        LOG_ERR("Device %s is not ready", mWs2812Device->name);
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
-
-    UpdateRgbLight();
-
-    return CHIP_NO_ERROR;
-}
-
-void WS2812Device::UpdateRgbLight()
-{
-    int status;
-    led_rgb setRgb = { 0 };
-
-    if (mState == kRgbState_On)
-    {
-        setRgb.r = mLedRgb.r;
-        setRgb.g = mLedRgb.g;
-        setRgb.b = mLedRgb.b;
-    }
-
-    status = led_strip_update_rgb(mWs2812Device, &setRgb, mChainLength);
-    if (status)
-    {
-        LOG_ERR("Couldn't update strip: %d", status);
-    }
-}
-
-void WS2812Device::SetLevel(RgbColor_t * pRgb)
-{
-    if (pRgb != NULL)
-    {
-        memcpy(&mLedRgb, pRgb, sizeof(RgbColor_t));
-    }
-
-    UpdateRgbLight();
-}
-
-void WS2812Device::Set(bool aTurnOn)
-{
-    mState = aTurnOn ? kRgbState_On : kRgbState_Off;
-    UpdateRgbLight();
-}
-
-bool WS2812Device::IsTurnedOn()
-{
-    return mState == kRgbState_On;
-}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_matrix.c b/examples/platform/telink/zephyr_ext/zephyr_key_matrix.c
new file mode 100644
index 00000000000000..00ea46c82d0e2f
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_key_matrix.c
@@ -0,0 +1,139 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "zephyr_key_matrix.h"
+
+/* Key matrix scanning period */
+#define KEY_MATRIX_SCAN_PERIOD_MS 100
+
+/* Poll key matrix and rise event on key change */
+static void key_matrix_poll(struct key_matrix_data * key_matrix, bool init)
+{
+    for (size_t i = 0; i < key_matrix->col_len; i++)
+    {
+        gpio_pin_configure_dt(&key_matrix->col[i], GPIO_OUTPUT_ACTIVE);
+        for (size_t j = 0; j < key_matrix->row_len; j++)
+        {
+            size_t button_num = i * key_matrix->col_len + j;
+            bool pin          = gpio_pin_get_dt(&key_matrix->row[j]);
+
+            if (pin != (bool) (key_matrix->buttons[button_num / 8] & BIT(button_num % 8)))
+            {
+                WRITE_BIT(key_matrix->buttons[button_num / 8], button_num % 8, pin);
+                if (!init && key_matrix->on_button_change)
+                {
+                    key_matrix->on_button_change(button_num, pin, key_matrix->context);
+                }
+            }
+        }
+        gpio_pin_configure_dt(&key_matrix->col[i], GPIO_INPUT);
+    }
+}
+
+/* Key matrix scan worker */
+static void key_matrix_scan_work(struct k_work * item)
+{
+    struct key_matrix_data * key_matrix = CONTAINER_OF(item, struct key_matrix_data, work);
+
+    (void) k_work_schedule(&key_matrix->work, K_MSEC(KEY_MATRIX_SCAN_PERIOD_MS));
+    key_matrix_poll(key_matrix, false);
+}
+
+/* Public APIs */
+
+bool key_matrix_init(struct key_matrix_data * key_matrix)
+{
+    bool result = true;
+
+    do
+    {
+        if (!key_matrix->col_len || !key_matrix->row_len)
+        {
+            result = false;
+            break;
+        }
+        /* check if all GPIOs are ready */
+        for (size_t i = 0; i < key_matrix->col_len; i++)
+        {
+            if (!gpio_is_ready_dt(&key_matrix->col[i]))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        for (size_t i = 0; i < key_matrix->row_len; i++)
+        {
+            if (!gpio_is_ready_dt(&key_matrix->row[i]))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* init all GPIOs are ready */
+        for (size_t i = 0; i < key_matrix->col_len; i++)
+        {
+            if (gpio_pin_configure_dt(&key_matrix->col[i], GPIO_INPUT))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        for (size_t i = 0; i < key_matrix->row_len; i++)
+        {
+            if (gpio_pin_configure_dt(&key_matrix->row[i], GPIO_INPUT))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* set all keys to current state */
+        key_matrix_poll(key_matrix, true);
+        key_matrix->on_button_change = NULL;
+        key_matrix->context          = NULL;
+        /* work init */
+        k_work_init_delayable(&key_matrix->work, key_matrix_scan_work);
+        while (k_work_schedule(&key_matrix->work, K_NO_WAIT) == -EBUSY)
+        {
+            k_usleep(10); /* Let other stuffs run */
+        }
+        /* all done */
+    } while (0);
+
+    return result;
+}
+
+void key_matrix_set_callback(struct key_matrix_data * key_matrix, key_matrix_on_button_change_t on_button_change, void * context)
+{
+    key_matrix->on_button_change = on_button_change;
+    key_matrix->context          = context;
+}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_matrix.h b/examples/platform/telink/zephyr_ext/zephyr_key_matrix.h
new file mode 100644
index 00000000000000..52f2db22f82eb7
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_key_matrix.h
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef ZEPHYR_KEY_MATRIX_H
+#define ZEPHYR_KEY_MATRIX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+
+/* Data types */
+
+typedef void (*key_matrix_on_button_change_t)(size_t button, bool pressed, void * context);
+
+struct key_matrix_data
+{
+    const struct gpio_dt_spec * col;
+    const size_t col_len;
+    const struct gpio_dt_spec * row;
+    const size_t row_len;
+    uint8_t * buttons;
+    key_matrix_on_button_change_t on_button_change;
+    void * context;
+    struct k_work_delayable work;
+};
+
+/*
+ * Declare struct key_matrix_data variable base on data from .dts.
+ * The name of variable should correspond to .dts node name.
+ * .dts fragment example:
+ * name {
+ *     compatible = "gpio-keys";
+ *     col {
+ *         gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>, <&gpiof 6 GPIO_ACTIVE_HIGH>;
+ *     };
+ *     row {
+ *         gpios = <&gpiod 2 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+ *                 <&gpiod 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+ *     };
+ * };
+ */
+#define KEY_MATRIX_DEFINE(name)                                                                                                    \
+    struct key_matrix_data name = {                                                                                                \
+        .col     = (const struct gpio_dt_spec[]){ COND_CODE_1(                                                                     \
+            DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios),                                                    \
+            (DT_FOREACH_PROP_ELEM_SEP(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))), ()) },    \
+        .col_len = COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios),                                     \
+                               (DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios)), (0)),                                  \
+        .row     = (const struct gpio_dt_spec[]){ COND_CODE_1(                                                                     \
+            DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios),                                                    \
+            (DT_FOREACH_PROP_ELEM_SEP(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))), ()) },    \
+        .row_len = COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios),                                     \
+                               (DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios)), (0)),                                  \
+        .buttons = (uint8_t[COND_CODE_1(UTIL_AND(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios),                   \
+                                                 DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios)),                  \
+                                        (DIV_ROUND_UP(DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, col)), gpios) *                  \
+                                                          DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, row)), gpios),               \
+                                                      8)),                                                                         \
+                                        (0))]){},                                                                                  \
+    }
+
+/* Public APIs */
+
+bool key_matrix_init(struct key_matrix_data * key_matrix);
+void key_matrix_set_callback(struct key_matrix_data * key_matrix, key_matrix_on_button_change_t on_button_change, void * context);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_KEY_MATRIX_H */
diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_pool.c b/examples/platform/telink/zephyr_ext/zephyr_key_pool.c
new file mode 100644
index 00000000000000..5a88d15303fde9
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_key_pool.c
@@ -0,0 +1,194 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "zephyr_key_pool.h"
+#include <stdlib.h>
+
+/* Key pool denouncing settle time */
+#define KEY_POOL_DEBOUNCING_GUARD_MS 10
+
+/* Auxiliary data to link key pool with pin isr */
+struct key_pool_aux_data
+{
+    struct key_pool_data * key_pool;
+    const struct device * port;
+    struct gpio_callback callback;
+};
+
+/* Auxiliary function to get ports number in pool */
+static size_t key_pool_port_number(const struct key_pool_data * key_pool)
+{
+    size_t port_num = 0;
+
+    for (size_t i = 0; i < key_pool->inp_len; i++)
+    {
+        bool port_already = false;
+
+        for (size_t j = 0; j < i; j++)
+        {
+            if (key_pool->inp[i].port == key_pool->inp[j].port)
+            {
+                port_already = true;
+                break;
+            }
+        }
+        if (!port_already)
+        {
+            port_num++;
+        }
+    }
+    return port_num;
+}
+
+/* Poll key pool and rise event on key change */
+static void key_pool_poll(struct key_pool_data * key_pool, bool init)
+{
+    for (size_t i = 0; i < key_pool->inp_len; i++)
+    {
+        bool pin = gpio_pin_get_dt(&key_pool->inp[i]);
+
+        if (pin != (bool) (key_pool->buttons[i / 8] & BIT(i % 8)))
+        {
+            WRITE_BIT(key_pool->buttons[i / 8], i % 8, pin);
+            if (!init && key_pool->on_button_change)
+            {
+                key_pool->on_button_change(i, pin, key_pool->context);
+            }
+        }
+    }
+}
+
+/* Key pool scan worker */
+static void key_pool_event_work(struct k_work * item)
+{
+    struct key_pool_data * key_pool = CONTAINER_OF(item, struct key_pool_data, work);
+
+    key_pool_poll(key_pool, false);
+}
+
+/* Key pool pin isr */
+static void key_pool_on_pin_isr(const struct device * dev, struct gpio_callback * cb, uint32_t pins)
+{
+    struct key_pool_aux_data * key_pool_aux = CONTAINER_OF(cb, struct key_pool_aux_data, callback);
+
+    (void) k_work_reschedule(&key_pool_aux->key_pool->work, K_MSEC(KEY_POOL_DEBOUNCING_GUARD_MS));
+}
+
+/* Public APIs */
+
+bool key_pool_init(struct key_pool_data * key_pool)
+{
+    bool result = true;
+
+    do
+    {
+        if (!key_pool->inp_len)
+        {
+            result = false;
+            break;
+        }
+        /* check if all GPIOs are ready */
+        for (size_t i = 0; i < key_pool->inp_len; i++)
+        {
+            if (!gpio_is_ready_dt(&key_pool->inp[i]))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* init all GPIOs are ready */
+        for (size_t i = 0; i < key_pool->inp_len; i++)
+        {
+            if (gpio_pin_configure_dt(&key_pool->inp[i], GPIO_INPUT))
+            {
+                result = false;
+                break;
+            }
+            if (gpio_pin_interrupt_configure_dt(&key_pool->inp[i], GPIO_INT_EDGE_BOTH))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* add callbacks to all ports */
+        struct key_pool_aux_data * key_pool_aux =
+            (struct key_pool_aux_data *) malloc(sizeof(struct key_pool_aux_data) * key_pool_port_number(key_pool));
+
+        if (!key_pool_aux)
+        {
+            result = false;
+            break;
+        }
+
+        key_pool->aux                  = key_pool_aux;
+        size_t key_pool_aux_inited_cnt = 0;
+
+        for (size_t i = 0; i < key_pool->inp_len; i++)
+        {
+            bool port_found = false;
+
+            for (size_t j = 0; j < key_pool_aux_inited_cnt; j++)
+            {
+                if (key_pool->inp[i].port == key_pool_aux[j].port)
+                {
+                    port_found = true;
+                    key_pool_aux[j].callback.pin_mask |= BIT(key_pool->inp[i].pin);
+                }
+            }
+            if (!port_found)
+            {
+                key_pool_aux[key_pool_aux_inited_cnt].key_pool = key_pool;
+                key_pool_aux[key_pool_aux_inited_cnt].port     = key_pool->inp[i].port;
+                gpio_init_callback(&key_pool_aux[key_pool_aux_inited_cnt].callback, key_pool_on_pin_isr, BIT(key_pool->inp[i].pin));
+                key_pool_aux_inited_cnt++;
+            }
+        }
+        for (size_t i = 0; i < key_pool_aux_inited_cnt; i++)
+        {
+            if (gpio_add_callback(key_pool_aux[i].port, &key_pool_aux[i].callback))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* set all keys to current state */
+        key_pool_poll(key_pool, true);
+        /* init work */
+        k_work_init_delayable(&key_pool->work, key_pool_event_work);
+        /* all done */
+    } while (0);
+
+    return result;
+}
+
+void key_pool_set_callback(struct key_pool_data * key_pool, key_pool_on_button_change_t on_button_change, void * context)
+{
+    key_pool->on_button_change = on_button_change;
+    key_pool->context          = context;
+}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_pool.h b/examples/platform/telink/zephyr_ext/zephyr_key_pool.h
new file mode 100644
index 00000000000000..bc39227c5f7ae3
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_key_pool.h
@@ -0,0 +1,75 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef ZEPHYR_KEY_POOL_H
+#define ZEPHYR_KEY_POOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+
+/* Data types */
+
+typedef void (*key_pool_on_button_change_t)(size_t button, bool pressed, void * context);
+
+struct key_pool_data
+{
+    const struct gpio_dt_spec * inp;
+    const size_t inp_len;
+    uint8_t * buttons;
+    void * aux;
+    key_pool_on_button_change_t on_button_change;
+    void * context;
+    struct k_work_delayable work;
+};
+
+/*
+ * Declare struct key_pool_data variable base on data from .dts.
+ * The name of variable should correspond to .dts node name.
+ * .dts fragment example:
+ * name {
+ *     compatible = "gpio-keys";
+ *     inp {
+ *         gpios = <&gpioc 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>,
+ *                 <&gpioc 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+ *     };
+ * };
+ */
+#define KEY_POOL_DEFINE(name)                                                                                                      \
+    struct key_pool_data name = {                                                                                                  \
+        .inp     = (const struct gpio_dt_spec[]){ COND_CODE_1(                                                                     \
+            DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios),                                                    \
+            (DT_FOREACH_PROP_ELEM_SEP(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))), ()) },    \
+        .inp_len = COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios),                                     \
+                               (DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios)), (0)),                                  \
+        .buttons = (uint8_t[COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios),                            \
+                                        (DIV_ROUND_UP(DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, inp)), gpios), 8)), (0))]){},    \
+    }
+
+/* Public APIs */
+
+bool key_pool_init(struct key_pool_data * key_pool);
+void key_pool_set_callback(struct key_pool_data * key_pool, key_pool_on_button_change_t on_button_change, void * context);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_KEY_POOL_H */
diff --git a/examples/platform/telink/zephyr_ext/zephyr_led_pool.c b/examples/platform/telink/zephyr_ext/zephyr_led_pool.c
new file mode 100644
index 00000000000000..f8ced2d413fd63
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_led_pool.c
@@ -0,0 +1,202 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "zephyr_led_pool.h"
+#include <stdarg.h>
+#include <stdlib.h>
+
+/* Auxiliary data to support blink */
+struct led_pool_aux_data
+{
+    enum led_state state;
+    k_ticks_t t_event;
+    k_timeout_t t_on;
+    k_timeout_t t_off;
+    bool current_state;
+};
+
+/* Get timeout to next event in auxiliary data */
+static k_timeout_t led_pool_aux_timeout(const struct led_pool_data * led_pool)
+{
+    k_timeout_t timeout                           = { .ticks = K_TICKS_FOREVER };
+    const struct led_pool_aux_data * led_pool_aux = (const struct led_pool_aux_data *) led_pool->aux;
+    size_t led_pool_aux_len                       = led_pool->out_len;
+
+    for (size_t i = 0; i < led_pool_aux_len; i++)
+    {
+        if (led_pool_aux[i].state == LED_BLINK)
+        {
+            k_ticks_t t_next = led_pool_aux[i].t_event +
+                (led_pool_aux[i].current_state ? led_pool_aux[i].t_on.ticks : led_pool_aux[i].t_off.ticks);
+            k_ticks_t t_now  = sys_clock_tick_get();
+            k_timeout_t this = { .ticks = t_next > t_now ? t_next - t_now : 0 };
+            if (timeout.ticks == K_TICKS_FOREVER || this.ticks < timeout.ticks)
+            {
+                timeout.ticks = this.ticks;
+            }
+        }
+    }
+    return timeout;
+}
+
+/* Process events in auxiliary data */
+static void led_pool_aux_update(const struct led_pool_data * led_pool)
+{
+    struct led_pool_aux_data * led_pool_aux = (struct led_pool_aux_data *) led_pool->aux;
+    size_t led_pool_aux_len                 = led_pool->out_len;
+
+    for (size_t i = 0; i < led_pool_aux_len; i++)
+    {
+        if (led_pool_aux[i].state == LED_BLINK)
+        {
+            k_ticks_t t_next = led_pool_aux[i].t_event +
+                (led_pool_aux[i].current_state ? led_pool_aux[i].t_on.ticks : led_pool_aux[i].t_off.ticks);
+            k_ticks_t t_now = sys_clock_tick_get();
+
+            if (t_next <= t_now)
+            {
+                led_pool_aux[i].current_state = !led_pool_aux[i].current_state;
+                led_pool_aux[i].t_event       = t_now;
+                (void) gpio_pin_set_dt(&led_pool->out[i], led_pool_aux[i].current_state);
+            }
+        }
+    }
+}
+
+/* Led pool worker */
+static void led_pool_event_work(struct k_work * item)
+{
+    struct led_pool_data * led_pool = CONTAINER_OF(item, struct led_pool_data, work);
+
+    led_pool_aux_update(led_pool);
+    (void) k_work_reschedule(&led_pool->work, led_pool_aux_timeout(led_pool));
+}
+
+/* Public APIs */
+
+bool led_pool_init(struct led_pool_data * led_pool)
+{
+    bool result = true;
+
+    do
+    {
+        if (!led_pool->out_len)
+        {
+            result = false;
+            break;
+        }
+        /* check if all GPIOs are ready */
+        for (size_t i = 0; i < led_pool->out_len; i++)
+        {
+            if (!gpio_is_ready_dt(&led_pool->out[i]))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* init all GPIOs are ready */
+        for (size_t i = 0; i < led_pool->out_len; i++)
+        {
+            if (gpio_pin_configure_dt(&led_pool->out[i], GPIO_OUTPUT))
+            {
+                result = false;
+                break;
+            }
+            if (gpio_pin_set_dt(&led_pool->out[i], 0))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* set auxiliary blink structure */
+        struct led_pool_aux_data * led_pool_aux =
+            (struct led_pool_aux_data *) malloc(sizeof(struct led_pool_aux_data) * led_pool->out_len);
+
+        if (!led_pool_aux)
+        {
+            result = false;
+            break;
+        }
+
+        for (size_t i = 0; i < led_pool->out_len; i++)
+        {
+            led_pool_aux[i].state = LED_OFF;
+        }
+        led_pool->aux = led_pool_aux;
+        /* init work */
+        k_work_init_delayable(&led_pool->work, led_pool_event_work);
+        if (k_work_reschedule(&led_pool->work, led_pool_aux_timeout(led_pool)) < 0)
+        {
+            result = false;
+            break;
+        }
+        /* all done */
+    } while (0);
+
+    return result;
+}
+
+bool led_pool_set(struct led_pool_data * led_pool, size_t led, enum led_state state, ...)
+{
+    bool result = false;
+
+    if (led < led_pool->out_len)
+    {
+        if (state == LED_ON || state == LED_OFF)
+        {
+            if (!gpio_pin_set_dt(&led_pool->out[led], state))
+            {
+                struct led_pool_aux_data * led_pool_aux = led_pool->aux;
+
+                led_pool_aux[led].state = state;
+                if (k_work_reschedule(&led_pool->work, led_pool_aux_timeout(led_pool)) >= 0)
+                {
+                    result = true;
+                }
+            }
+        }
+        else if (state == LED_BLINK)
+        {
+            if (!gpio_pin_set_dt(&led_pool->out[led], 1))
+            {
+                struct led_pool_aux_data * led_pool_aux = led_pool->aux;
+                va_list argptr;
+
+                va_start(argptr, state);
+                led_pool_aux[led].state         = state;
+                led_pool_aux[led].t_event       = sys_clock_tick_get();
+                led_pool_aux[led].t_on          = va_arg(argptr, k_timeout_t);
+                led_pool_aux[led].t_off         = va_arg(argptr, k_timeout_t);
+                led_pool_aux[led].current_state = true;
+                va_end(argptr);
+                if (k_work_reschedule(&led_pool->work, led_pool_aux_timeout(led_pool)) >= 0)
+                {
+                    result = true;
+                }
+            }
+        }
+    }
+    return result;
+}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_led_pool.h b/examples/platform/telink/zephyr_ext/zephyr_led_pool.h
new file mode 100644
index 00000000000000..e25de9fe7aa250
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_led_pool.h
@@ -0,0 +1,75 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef ZEPHYR_LED_POOL_H
+#define ZEPHYR_LED_POOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+
+/* Data types */
+
+enum led_state
+{
+    LED_OFF = 0,
+    LED_ON,
+    LED_BLINK
+};
+
+struct led_pool_data
+{
+    const struct gpio_dt_spec * out;
+    const size_t out_len;
+    void * aux;
+    struct k_work_delayable work;
+};
+
+/*
+ * Declare struct led_pool_data variable base on data from .dts.
+ * The name of variable should correspond to .dts node name.
+ * .dts fragment example:
+ * name {
+ *     compatible = "gpio-leds";
+ *     out {
+ *         gpios = <&gpioe 6 GPIO_ACTIVE_HIGH>,
+ *                 <&gpiod 0 GPIO_ACTIVE_HIGH>;
+ *     };
+ * };
+ */
+#define LED_POOL_DEFINE(name)                                                                                                      \
+    struct led_pool_data name = {                                                                                                  \
+        .out     = (const struct gpio_dt_spec[]){ COND_CODE_1(                                                                     \
+            DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, out)), gpios),                                                    \
+            (DT_FOREACH_PROP_ELEM_SEP(DT_PATH_INTERNAL(DT_CHILD(name, out)), gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))), ()) },    \
+        .out_len = COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, out)), gpios),                                     \
+                               (DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, out)), gpios)), (0)),                                  \
+    }
+
+/* Public APIs */
+
+bool led_pool_init(struct led_pool_data * led_pool);
+bool led_pool_set(struct led_pool_data * led_pool, size_t led, enum led_state state, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_KEY_POOL_H */
diff --git a/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.c b/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.c
new file mode 100644
index 00000000000000..3f1651844f1cec
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.c
@@ -0,0 +1,329 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "zephyr_pwm_pool.h"
+#include <stdarg.h>
+#include <stdlib.h>
+
+/* Auxiliary data to support blink & breath */
+struct pwm_pool_aux_data
+{
+    /* common */
+    enum pwm_state state;
+    k_ticks_t t_event;
+    bool current_state;
+    union
+    {
+        struct blink
+        {
+            k_timeout_t t_on;
+            k_timeout_t t_off;
+        } blink;
+        struct breath
+        {
+            uint32_t period;
+            uint32_t current_pulse;
+            uint32_t step_pulse;
+        } breath;
+    } mode;
+};
+
+/* Get timeout to next event in auxiliary data */
+static k_timeout_t pwm_pool_aux_timeout(const struct pwm_pool_data * pwm_pool)
+{
+    k_timeout_t timeout                           = { .ticks = K_TICKS_FOREVER };
+    const struct pwm_pool_aux_data * pwm_pool_aux = (const struct pwm_pool_aux_data *) pwm_pool->aux;
+    size_t pwm_pool_aux_len                       = pwm_pool->out_len;
+
+    for (size_t i = 0; i < pwm_pool_aux_len; i++)
+    {
+        if (pwm_pool_aux[i].state == PWM_BLINK)
+        {
+            k_ticks_t t_next = pwm_pool_aux[i].t_event +
+                (pwm_pool_aux[i].current_state ? pwm_pool_aux[i].mode.blink.t_on.ticks : pwm_pool_aux[i].mode.blink.t_off.ticks);
+            k_ticks_t t_now  = sys_clock_tick_get();
+            k_timeout_t this = { .ticks = t_next > t_now ? t_next - t_now : 0 };
+            if (timeout.ticks == K_TICKS_FOREVER || this.ticks < timeout.ticks)
+            {
+                timeout.ticks = this.ticks;
+            }
+        }
+        else if (pwm_pool_aux[i].state == PWM_BREATH)
+        {
+            k_ticks_t t_next = pwm_pool_aux[i].t_event + K_NSEC(pwm_pool_aux[i].mode.breath.period).ticks;
+            k_ticks_t t_now  = sys_clock_tick_get();
+            k_timeout_t this = { .ticks = t_next > t_now ? t_next - t_now : 0 };
+            if (timeout.ticks == K_TICKS_FOREVER || this.ticks < timeout.ticks)
+            {
+                timeout.ticks = this.ticks;
+            }
+        }
+    }
+    return timeout;
+}
+
+/* Process events in auxiliary data */
+static void pwm_pool_aux_update(const struct pwm_pool_data * pwm_pool)
+{
+    struct pwm_pool_aux_data * pwm_pool_aux = (struct pwm_pool_aux_data *) pwm_pool->aux;
+    size_t pwm_pool_aux_len                 = pwm_pool->out_len;
+
+    for (size_t i = 0; i < pwm_pool_aux_len; i++)
+    {
+        if (pwm_pool_aux[i].state == PWM_BLINK)
+        {
+            k_ticks_t t_next = pwm_pool_aux[i].t_event +
+                (pwm_pool_aux[i].current_state ? pwm_pool_aux[i].mode.blink.t_on.ticks : pwm_pool_aux[i].mode.blink.t_off.ticks);
+            k_ticks_t t_now = sys_clock_tick_get();
+
+            if (t_next <= t_now)
+            {
+                pwm_pool_aux[i].t_event       = t_now;
+                pwm_pool_aux[i].current_state = !pwm_pool_aux[i].current_state;
+                (void) pwm_set_dt(&pwm_pool->out[i], pwm_pool->out[i].period,
+                                  pwm_pool_aux[i].current_state ? pwm_pool->out[i].period : 0);
+            }
+        }
+        else if (pwm_pool_aux[i].state == PWM_BREATH)
+        {
+            k_ticks_t t_next = pwm_pool_aux[i].t_event + K_NSEC(pwm_pool_aux[i].mode.breath.period).ticks;
+            k_ticks_t t_now  = sys_clock_tick_get();
+
+            if (t_next <= t_now)
+            {
+                pwm_pool_aux[i].t_event = t_now;
+                if (pwm_pool_aux[i].current_state)
+                {
+                    if (pwm_pool_aux[i].mode.breath.current_pulse <=
+                        pwm_pool_aux[i].mode.breath.period - pwm_pool_aux[i].mode.breath.step_pulse)
+                    {
+                        pwm_pool_aux[i].mode.breath.current_pulse += pwm_pool_aux[i].mode.breath.step_pulse;
+                    }
+                    else
+                    {
+                        pwm_pool_aux[i].mode.breath.current_pulse = pwm_pool_aux[i].mode.breath.period;
+                        pwm_pool_aux[i].current_state             = false;
+                    }
+                }
+                else
+                {
+                    if (pwm_pool_aux[i].mode.breath.current_pulse >= pwm_pool_aux[i].mode.breath.step_pulse)
+                    {
+                        pwm_pool_aux[i].mode.breath.current_pulse -= pwm_pool_aux[i].mode.breath.step_pulse;
+                    }
+                    else
+                    {
+                        pwm_pool_aux[i].mode.breath.current_pulse = 0;
+                        pwm_pool_aux[i].current_state             = true;
+                    }
+                }
+                (void) pwm_set_dt(&pwm_pool->out[i], pwm_pool->out[i].period, pwm_pool_aux[i].mode.breath.current_pulse);
+            }
+        }
+    }
+}
+
+/* Pwm pool worker */
+static void pwm_pool_event_work(struct k_work * item)
+{
+    struct pwm_pool_data * pwm_pool = CONTAINER_OF(item, struct pwm_pool_data, work);
+
+    pwm_pool_aux_update(pwm_pool);
+    (void) k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool));
+}
+
+/* Public APIs */
+
+bool pwm_pool_init(struct pwm_pool_data * pwm_pool)
+{
+    bool result = true;
+
+    do
+    {
+        if (!pwm_pool->out_len)
+        {
+            result = false;
+            break;
+        }
+        /* check if all PWMs are ready */
+        for (size_t i = 0; i < pwm_pool->out_len; i++)
+        {
+            if (!device_is_ready(pwm_pool->out[i].dev))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* init all PWMs are ready */
+        for (size_t i = 0; i < pwm_pool->out_len; i++)
+        {
+            if (pwm_set_dt(&pwm_pool->out[i], pwm_pool->out[i].period, 0))
+            {
+                result = false;
+                break;
+            }
+        }
+        if (!result)
+        {
+            break;
+        }
+        /* set auxiliary blink/breath structure */
+        struct pwm_pool_aux_data * pwm_pool_aux =
+            (struct pwm_pool_aux_data *) malloc(sizeof(struct pwm_pool_aux_data) * pwm_pool->out_len);
+
+        if (!pwm_pool_aux)
+        {
+            result = false;
+            break;
+        }
+
+        for (size_t i = 0; i < pwm_pool->out_len; i++)
+        {
+            pwm_pool_aux[i].state = PWM_OFF;
+        }
+        pwm_pool->aux = pwm_pool_aux;
+        /* init work */
+        k_work_init_delayable(&pwm_pool->work, pwm_pool_event_work);
+        if (k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool)) < 0)
+        {
+            result = false;
+            break;
+        }
+        /* all done */
+    } while (0);
+
+    return result;
+}
+
+bool pwm_pool_set(struct pwm_pool_data * pwm_pool, size_t pwm, enum pwm_state state, ...)
+{
+    bool result = false;
+
+    if (pwm < pwm_pool->out_len)
+    {
+        if (state == PWM_ON || state == PWM_OFF)
+        {
+            if (!pwm_set_dt(&pwm_pool->out[pwm], pwm_pool->out[pwm].period, state ? pwm_pool->out[pwm].period : 0))
+            {
+                struct pwm_pool_aux_data * pwm_pool_aux = pwm_pool->aux;
+
+                pwm_pool_aux[pwm].state = state;
+                if (k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool)) >= 0)
+                {
+                    result = true;
+                }
+            }
+        }
+        else if (state == PWM_FIXED)
+        {
+            va_list argptr;
+
+            va_start(argptr, state);
+            uint32_t permille = va_arg(argptr, uint32_t);
+
+            va_end(argptr);
+            if (permille <= PERMILLE_MAX)
+            {
+                if (!pwm_set_dt(&pwm_pool->out[pwm], pwm_pool->out[pwm].period,
+                                ((uint64_t) permille * pwm_pool->out[pwm].period) / PERMILLE_MAX))
+                {
+                    struct pwm_pool_aux_data * pwm_pool_aux = pwm_pool->aux;
+
+                    pwm_pool_aux[pwm].state = state;
+                    if (k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool)) >= 0)
+                    {
+                        result = true;
+                    }
+                }
+            }
+        }
+        else if (state == PWM_BLINK)
+        {
+            va_list argptr;
+
+            va_start(argptr, state);
+            k_timeout_t t_on  = va_arg(argptr, k_timeout_t);
+            k_timeout_t t_off = va_arg(argptr, k_timeout_t);
+
+            va_end(argptr);
+            if (t_on.ticks >= K_NSEC(pwm_pool->out[pwm].period).ticks && t_off.ticks >= K_NSEC(pwm_pool->out[pwm].period).ticks)
+            {
+                if (!pwm_set_dt(&pwm_pool->out[pwm], pwm_pool->out[pwm].period, pwm_pool->out[pwm].period))
+                {
+                    struct pwm_pool_aux_data * pwm_pool_aux = pwm_pool->aux;
+
+                    pwm_pool_aux[pwm].state            = state;
+                    pwm_pool_aux[pwm].t_event          = sys_clock_tick_get();
+                    pwm_pool_aux[pwm].current_state    = true;
+                    pwm_pool_aux[pwm].mode.blink.t_on  = t_on;
+                    pwm_pool_aux[pwm].mode.blink.t_off = t_off;
+
+                    if (k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool)) >= 0)
+                    {
+                        result = true;
+                    }
+                }
+            }
+        }
+        else if (state == PWM_BREATH)
+        {
+            va_list argptr;
+
+            va_start(argptr, state);
+            k_timeout_t t_breath = va_arg(argptr, k_timeout_t);
+
+            va_end(argptr);
+            if (t_breath.ticks >= K_NSEC(pwm_pool->out[pwm].period).ticks * 2)
+            {
+                if (!pwm_set_dt(&pwm_pool->out[pwm], pwm_pool->out[pwm].period, 0))
+                {
+                    struct pwm_pool_aux_data * pwm_pool_aux = pwm_pool->aux;
+
+                    pwm_pool_aux[pwm].state   = state;
+                    pwm_pool_aux[pwm].t_event = sys_clock_tick_get();
+                    /*
+                     * set new value now because pwm will be updated
+                     * with its value when current cycle will finished
+                     */
+                    if (pwm_pool_aux[pwm].t_event > K_NSEC(pwm_pool->out[pwm].period).ticks)
+                    {
+                        pwm_pool_aux[pwm].t_event -= K_NSEC(pwm_pool->out[pwm].period).ticks;
+                    }
+                    else
+                    {
+                        pwm_pool_aux[pwm].t_event = 0;
+                    }
+                    pwm_pool_aux[pwm].current_state             = true;
+                    pwm_pool_aux[pwm].mode.breath.period        = pwm_pool->out[pwm].period;
+                    pwm_pool_aux[pwm].mode.breath.current_pulse = 0;
+                    pwm_pool_aux[pwm].mode.breath.step_pulse =
+                        ((uint64_t) pwm_pool->out[pwm].period * pwm_pool->out[pwm].period * 2) /
+                        k_ticks_to_ns_ceil64(t_breath.ticks);
+                    if (k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool)) >= 0)
+                    {
+                        result = true;
+                    }
+                }
+            }
+        }
+    }
+    return result;
+}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.h b/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.h
new file mode 100644
index 00000000000000..df50f4057a0c1e
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.h
@@ -0,0 +1,88 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef ZEPHYR_PWM_POOL_H
+#define ZEPHYR_PWM_POOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/kernel.h>
+
+/* Zephyr PWM device tree compatibility macro */
+
+#define PWM_DT_SPEC_GET_BY_IDX_COMPAT(node_id, prop, idx) PWM_DT_SPEC_GET_BY_IDX(node_id, idx)
+
+/* Defines */
+
+#ifndef PERMILLE_MAX
+#define PERMILLE_MAX 1000
+#endif /* PERMILLE_MAX */
+
+/* Data types */
+
+enum pwm_state
+{
+    PWM_OFF = 0,
+    PWM_ON,
+    PWM_FIXED,
+    PWM_BLINK,
+    PWM_BREATH
+};
+
+struct pwm_pool_data
+{
+    const struct pwm_dt_spec * out;
+    const size_t out_len;
+    void * aux;
+    struct k_work_delayable work;
+};
+
+/*
+ * Declare struct led_pool_data variable base on data from .dts.
+ * The name of variable should correspond to .dts node name.
+ * .dts fragment example:
+ * name {
+ *     compatible = "pwm-leds";
+ *     out {
+ *         pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+ *                <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+ *                <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+ *     };
+ * };
+ */
+#define PWM_POOL_DEFINE(name)                                                                                                        \
+    struct pwm_pool_data name = {                                                                                                    \
+        .out     = (const struct pwm_dt_spec[]){ COND_CODE_1(                                                                        \
+            DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, out)), pwms),                                                       \
+            (DT_FOREACH_PROP_ELEM_SEP(DT_PATH_INTERNAL(DT_CHILD(name, out)), pwms, PWM_DT_SPEC_GET_BY_IDX_COMPAT, (, ))), ()) }, \
+        .out_len = COND_CODE_1(DT_NODE_HAS_PROP(DT_PATH_INTERNAL(DT_CHILD(name, out)), pwms),                                        \
+                               (DT_PROP_LEN(DT_PATH_INTERNAL(DT_CHILD(name, out)), pwms)), (0)),                                     \
+    }
+
+/* Public APIs */
+
+bool pwm_pool_init(struct pwm_pool_data * pwm_pool);
+bool pwm_pool_set(struct pwm_pool_data * pwm_pool, size_t pwm, enum pwm_state state, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_KEY_POOL_H */
diff --git a/examples/platform/telink/zephyr_ext/zephyr_ws2812.c b/examples/platform/telink/zephyr_ext/zephyr_ws2812.c
new file mode 100644
index 00000000000000..f8ce1c01b685d2
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_ws2812.c
@@ -0,0 +1,112 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "zephyr_ws2812.h"
+#include <stdarg.h>
+#include <string.h>
+
+/* Public APIs */
+
+bool ws2812_led_init(struct ws2812_led_data * ws2812_led)
+{
+    bool result = true;
+
+    do
+    {
+        if (!ws2812_led->led_len)
+        {
+            result = false;
+            break;
+        }
+        /* check if ws2812 is ready */
+        if (!device_is_ready(ws2812_led->led))
+        {
+            result = false;
+            break;
+        }
+        /* init all LEDs ready */
+        memset(ws2812_led->pix, 0x00, sizeof(struct led_rgb) * ws2812_led->led_len);
+        memcpy(ws2812_led->aux, ws2812_led->pix, sizeof(struct led_rgb) * ws2812_led->led_len);
+        if (led_strip_update_rgb(ws2812_led->led, (struct led_rgb *) ws2812_led->aux, ws2812_led->led_len))
+        {
+            result = false;
+            break;
+        }
+        /* all done */
+    } while (0);
+
+    return result;
+}
+
+bool ws2812_led_set(struct ws2812_led_data * ws2812_led, size_t id, enum ws2812_led_state state, ...)
+{
+    bool result = false;
+
+    if (id < ws2812_led->led_len * 3)
+    {
+        if (state == WS2812_LED_ON || state == WS2812_LED_OFF)
+        {
+            switch (id % 3)
+            {
+            case 0:
+                ws2812_led->pix[id / 3].r = (state ? 0xff : 0);
+                break;
+            case 1:
+                ws2812_led->pix[id / 3].g = (state ? 0xff : 0);
+                break;
+            case 2:
+                ws2812_led->pix[id / 3].b = (state ? 0xff : 0);
+                break;
+            }
+            memcpy(ws2812_led->aux, ws2812_led->pix, sizeof(struct led_rgb) * ws2812_led->led_len);
+            if (!led_strip_update_rgb(ws2812_led->led, (struct led_rgb *) ws2812_led->aux, ws2812_led->led_len))
+            {
+                result = true;
+            }
+        }
+        else if (state == WS2812_LED_FIXED)
+        {
+            va_list argptr;
+
+            va_start(argptr, state);
+            uint32_t permille = va_arg(argptr, uint32_t);
+
+            va_end(argptr);
+            if (permille <= PERMILLE_MAX)
+            {
+                switch (id % 3)
+                {
+                case 0:
+                    ws2812_led->pix[id / 3].r = (permille * 0xff + PERMILLE_MAX / 2) / PERMILLE_MAX;
+                    break;
+                case 1:
+                    ws2812_led->pix[id / 3].g = (permille * 0xff + PERMILLE_MAX / 2) / PERMILLE_MAX;
+                    break;
+                case 2:
+                    ws2812_led->pix[id / 3].b = (permille * 0xff + PERMILLE_MAX / 2) / PERMILLE_MAX;
+                    break;
+                }
+                memcpy(ws2812_led->aux, ws2812_led->pix, sizeof(struct led_rgb) * ws2812_led->led_len);
+                if (!led_strip_update_rgb(ws2812_led->led, (struct led_rgb *) ws2812_led->aux, ws2812_led->led_len))
+                {
+                    result = true;
+                }
+            }
+        }
+    }
+    return result;
+}
diff --git a/examples/platform/telink/zephyr_ext/zephyr_ws2812.h b/examples/platform/telink/zephyr_ext/zephyr_ws2812.h
new file mode 100644
index 00000000000000..6abb668ae48259
--- /dev/null
+++ b/examples/platform/telink/zephyr_ext/zephyr_ws2812.h
@@ -0,0 +1,85 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef ZEPHYR_WS2812_H
+#define ZEPHYR_WS2812_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/drivers/led_strip.h>
+#include <zephyr/kernel.h>
+
+/* Defines */
+
+#ifndef PERMILLE_MAX
+#define PERMILLE_MAX 1000
+#endif /* PERMILLE_MAX */
+
+/* Data types */
+
+enum ws2812_led_state
+{
+    WS2812_LED_OFF = 0,
+    WS2812_LED_ON,
+    WS2812_LED_FIXED
+};
+
+struct ws2812_led_data
+{
+    const struct device * led;
+    const size_t led_len;
+    struct led_rgb * pix;
+    void * aux;
+};
+
+/*
+ * Declare struct ws2812_led_data variable base on data from .dts.
+ * The name of variable should correspond to .dts node name.
+ * .dts fragment example:
+ * name: ws2812 {
+ *     compatible = "worldsemi,ws2812-gpio";
+ *     chain-length = <1>;
+ *     color-mapping = <LED_COLOR_ID_GREEN
+ *                      LED_COLOR_ID_RED
+ *                      LED_COLOR_ID_BLUE>;
+ *     in-gpios = <&gpiob 4 0>;
+ * };
+ */
+#define WS2812_LED_DEFINE(name)                                                                                                    \
+    struct ws2812_led_data name = {                                                                                                \
+        .led     = COND_CODE_1(DT_NODE_HAS_COMPAT(DT_NODELABEL(name), worldsemi_ws2812_gpio), (DEVICE_DT_GET(DT_NODELABEL(name))), \
+                               (NULL)),                                                                                            \
+        .led_len = COND_CODE_1(DT_NODE_HAS_COMPAT(DT_NODELABEL(name), worldsemi_ws2812_gpio),                                      \
+                               (DT_PROP(DT_NODELABEL(name), chain_length)), (0)),                                                  \
+        .pix     = (struct led_rgb[COND_CODE_1(DT_NODE_HAS_COMPAT(DT_NODELABEL(name), worldsemi_ws2812_gpio),                      \
+                                               (DT_PROP(DT_NODELABEL(name), chain_length)), (0))]){},                              \
+        .aux     = (struct led_rgb[COND_CODE_1(DT_NODE_HAS_COMPAT(DT_NODELABEL(name), worldsemi_ws2812_gpio),                      \
+                                               (DT_PROP(DT_NODELABEL(name), chain_length)), (0))]){},                              \
+    }
+
+/* Public APIs */
+
+bool ws2812_led_init(struct ws2812_led_data * ws2812_led);
+bool ws2812_led_set(struct ws2812_led_data * ws2812_led, size_t id, enum ws2812_led_state state, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_WS2812_H */
diff --git a/examples/platform/tizen/OptionsProxy.cpp b/examples/platform/tizen/OptionsProxy.cpp
index c00ac172e6627d..1c2d41ca1308d1 100644
--- a/examples/platform/tizen/OptionsProxy.cpp
+++ b/examples/platform/tizen/OptionsProxy.cpp
@@ -25,6 +25,8 @@
 #include <lib/core/CHIPConfig.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <string>
+
 namespace {
 
 struct Option
diff --git a/examples/pump-app/cc13x2x7_26x2x7/.gn b/examples/pump-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  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/BUILD.gn b/examples/pump-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 02e87a04f067f0..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/pump-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":pump_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("pump_app") {
-  output_name = "chip-${ti_simplelink_board}-pump-example.out"
-
-  sources = [
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/CHIPDeviceManager.cpp",
-    "${project_dir}/main/DeviceCallbacks.cpp",
-    "${project_dir}/main/PumpManager.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/pump-app/pump-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":pump_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 6bfb8feee4665f..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,310 +0,0 @@
-# Matter Pump Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Pump Example Application](#matter-pump-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX pump example application provides a working demonstration of a
-connected pump device. This uses the open-source Matter implementation and the
-Texas Instruments SimpleLink™ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The pump example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | BLE Advertisement (Enable/Disable)     |
-| Left Button (`BTN-1`) Press (more than 5000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Toggle pump state                      |
-| Red & Green LED Blinking State                   | Pump transition from either Start/Stop |
-| Red & Green LED On State                         | Pump is started                        |
-| Red & Green LED Off State                        | Pump stopped                           |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-1`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** The pump configuration & control cluster commands have the following
-formats:
-
-```
-./chip-tool pumpconfigurationandcontrol <write> <attribute-name> <attribute-values> <destination-id> <endpoint-id-ignored-for-group-commands>
-```
-
-Send commands to the pump-app. Here are some example commands:
-
-Write normal operation mode (0) to device
-
-```
-./chip-tool pumpconfigurationandcontrol write operation-mode 0 1 1
-```
-
-Get current operation mode
-
-```
-./chip-tool pumpconfigurationandcontrol read effective-operation-mode 1 1
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-1` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-app/cc13x2x7_26x2x7/args.gni b/examples/pump-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 1467940fa222ee..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-#chip_progress_logging = false
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x800A"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-chip_openthread_ftd = false
-
-custom_factory_data = true
diff --git a/examples/pump-app/cc13x2x7_26x2x7/build_overrides b/examples/pump-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg
deleted file mode 100644
index b46e258311e19b..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg
deleted file mode 100644
index 85dc32c0530acc..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg
deleted file mode 100644
index f1563f8933b01c..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg
deleted file mode 100644
index a3d63e4dfcd944..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg
deleted file mode 100644
index ad07cbf180d1d0..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg
deleted file mode 100644
index 43010467f37d95..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg
deleted file mode 100644
index 119886b184c7c5..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg
deleted file mode 100644
index 4bd4776f692973..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg
deleted file mode 100644
index 33cb488a6541ec..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg
deleted file mode 100644
index 66a2855628808b..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg
deleted file mode 100644
index d0270ecaaedf9f..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg
deleted file mode 100644
index 73f21c9a69d118..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg
deleted file mode 100644
index 36a34f4a5e12e3..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg
deleted file mode 100644
index e6a4e04371a369..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg
deleted file mode 100644
index 6a38f067e4fc4c..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg
deleted file mode 100644
index 6a2a9a8a813ce0..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg
deleted file mode 100644
index c6e6dd2249f498..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md b/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md
deleted file mode 100644
index ac31ab8bbea1f0..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Programming and Debugging with CCS
-
--   Download and install [Code Composer Studio][ccs].
-
--   Use `xdsdfu` to determine the XDS110 serial number to identify the device.
-    This may be skipped if there is only one LaunchPad connected to your PC, but
-    it is recommended.
-
-    ```
-    C:\>cd \ti\ccs1010\ccs\ccs_base\common\uscif\xds110
-
-    C:\ti\ccs1010\ccs\ccs_base\common\uscif\xds110>xdsdfu.exe -e
-
-    USB Device Firmware Upgrade Utility
-    Copyright (c) 2008-2019 Texas Instruments Incorporated.  All rights reserved.
-
-    Scanning USB buses for supported XDS110 devices...
-    ```
-
-<<<< Device 0 >>>>
-
-VID: 0x0451 PID: 0xbef3 Device Name: XDS110 Embed with CMSIS-DAP Version:
-3.0.0.13 Manufacturer: Texas Instruments Serial Num: L4100652 Mode: Runtime
-Configuration: Standard
-
-Found 1 device.
-
-```
-In this example, my LaunchPad's XDS110 has a serial number of `L4100652`.
-
-- Start a new Code Composer Studio Workspace. This can be named anything you
-would like. But it is recommended that you use a blank workspace.
-
-![CCS step 1](images/ccs-1.jpg)
-
-- Create a new Target Configuration File by selecting `File` >> `New` >>
-`Target Configuration File`. This file can also be exported from UniFlash
-with the `download ccxml` function.
-
-![CCS step 2](images/ccs-2.jpg)
-
-- Name the new ccxml file a useful name. Here I use the XDS110 serial number
-from before. Leave the Location as the shared location and click `Finish` to
-create the file.
-
-![CCS step 3](images/ccs-3.jpg)
-
-- In the new ccxml, select the `Connection` and the `Board or Device`. This may
-be different for your setup, but all LaunchPads will use the `Texas
-Instruments XDS110 USB Debug Probe` for the target connection. And the and a
-`CC1352R1F3` is mounted on the `CC1352R1_LAUNCHXL` LaunchPads. Builds for
-other LaunchPads should use the corresponding SoC name.
-
-![CCS step 4](images/ccs-4.jpg)
-
-- Now set the XDS110 serial number in the advanced tab of the ccxml. First
-select the `Advanced` tab at the bottom of the window. Then select the Debug
-Probe in the connection tree. Then select `Select by serial number` in the
-`Debug Probe Selection`. Then enter the serial number from `xdsdfu` earlier
-in the `Enter the serial number` text field. Finally click `Save` to save
-your ccxml.
-
-![CCS step 5](images/ccs-5.jpg)
-
-- Clicking `Test Connection` with the LaunchPad connected will cause a JTAG
-Integrity scan with the Debug Probe. This is a nice way to check that your
-ccxml is setup correctly.
-
-![CCS step 6](images/ccs-6.jpg)
-
-- Now open the Debug Configurations dialog to setup a new debug configuration.
-Select `Run` >> `Debug Configurations...`.
-
-![CCS step 7](images/ccs-7.jpg)
-
-- Create a new launch configuration from the default CCS launch configuration.
-Select `Code Composer Studio - Device Debugging` and then create a new launch
-configuration with the `New launch configuration` button.
-
-![CCS step 8](images/ccs-8.jpg)
-
-- Name your new configuration. Update the `Target Configuration` field with the
-ccxml you created earlier. Click `Apply` to save the launch configuration.
-
-Once the launch configuration is created you do not need to re-create it
-every time. The Debug session can be started with the `Debug` button in the
-`Debug Configurations` dialog, or by selecting `Run` >> `Debug History` >>
-`<launch configuration name>`.
-
-![CCS step 9](images/ccs-9.jpg)
-
-- Now that the Debug session is started we can connect to the target. Make sure
-that the right Debug Probe is selected in the `Debug` window and click
-`Connect Target`.
-
-![CCS step 9](images/ccs-10.jpg)
-
-- The target MCU is connected. The MCU is halted on connection by default.
-Select the `Load Program...` option to select the ELF image to load.
-
-![CCS step 9](images/ccs-11.jpg)
-
-- Navigate to the ELF file
-(`${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-file) in the `Load Program` dialog. Click `OK` to begin loading the target.
-
-![CCS step 9](images/ccs-12.jpg)
-
-- After locating the source file for `main.cpp` we can step through the code
-as it executes.
-
-![CCS step 9](images/ccs-13.jpg)
-
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-```
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md b/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
deleted file mode 100644
index f6b3acb27b9b28..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Programming with UniFlash
-
--   Download and install [UniFlash][uniflash].
-
--   Select the Device Detect option. Then select the device you wish to program.
-    Or you can create a new configuration if you know the debugger serial number
-
-    ![UniFlash step 1](images/uniflash-1.jpg)
-
--   Browse for your build image by clicking the `Browse` button. It will be at
-    `${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-
-    ![UniFlash step 2](images/uniflash-2.jpg)
-
--   Load the image by clicking the `Load Image` button. This will eventually
-    result in a success message in the console below.
-
-    ![UniFlash step 3](images/uniflash-3.jpg)
-
--   Open a terminal to the XDS110 User UART and interact with the example
-    application.
-
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 8ac373b643bfce..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include "CHIPDeviceManager.h"
-#include "DeviceCallbacks.h"
-#include <app/server/Dnssd.h>
-#include <app/server/Server.h>
-
-#include "FreeRTOS.h"
-#include <app/EventLogging.h>
-#include <app/util/af-types.h>
-#include <app/util/af.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-#define PCC_CLUSTER_ENDPOINT 1
-#define ONOFF_CLUSTER_ENDPOINT 1
-#define EXTENDED_DISCOVERY_TIMEOUT_SEC 20
-
-using namespace chip;
-using namespace chip::app;
-using namespace chip::Credentials;
-using namespace chip::DeviceLayer;
-using namespace chip::DeviceManager;
-using namespace chip::app::Clusters;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-
-AppTask AppTask::sAppTask;
-
-static DeviceCallbacks sDeviceCallbacks;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(chip::Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-static const chip::EndpointId sIdentifyEndpointId = 0;
-static const uint32_t sIdentifyBlinkRateMs        = 500;
-
-::Identify stIdentify = { sIdentifyEndpointId, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-#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");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGPRESSED;
-    buttonParams.longPressDuration = 5000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Initialize Pump module
-    PLAT_LOG("Initialize Pump");
-    PumpMgr().Init();
-
-    PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY
-    DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(EXTENDED_DISCOVERY_TIMEOUT_SEC);
-#endif
-
-    // Init ZCL Data Model
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    uint32_t iterationCount;
-    mFactoryDataProvider.GetSpake2pIterationCount(iterationCount);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
-    ret                           = deviceMgr.Init(&sDeviceCallbacks);
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("CHIPDeviceManager::Init() failed: %s", ErrorStr(ret));
-        while (true)
-            ;
-    }
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGPRESSED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongPressed;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // If the action has been initiated by the pump, update the pump trait
-    // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start initiated");
-        ; // TODO
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Stop initiated");
-        ; // TODO
-    }
-
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void AppTask::ActionCompleted(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // if the action has been completed by the pump, update the pump trait.
-    // Turn on the pump state LED if in a STARTED state OR
-    // Turn off the pump state LED if in an STOPPED state.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-        // Signal to the PCC cluster, that the pump is running
-        sAppTask.UpdateClusterState();
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Pump stop completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOff(sAppRedHandle);
-        // Signal to the PCC cluster, that the pump is NOT running
-        sAppTask.UpdateClusterState();
-    }
-    if (aActor == AppEvent::kEventType_ButtonLeft)
-    {
-        sAppTask.UpdateClusterState();
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle Pump state
-            if (!PumpMgr().IsStopped())
-            {
-                PumpMgr().InitiateAction(0, PumpManager::STOP_ACTION);
-            }
-            else
-            {
-                PumpMgr().InitiateAction(0, PumpManager::START_ACTION);
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Post event for demonstration purposes, we must ensure that the
-            // LogEvent is called in the right context which is the Matter mainloop
-            // thru ScheduleWork()
-            chip::DeviceLayer::PlatformMgr().ScheduleWork(sAppTask.PostEvents, reinterpret_cast<intptr_t>(nullptr));
-
-            // Toggle BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        else if (AppEvent::kAppEventButtonType_LongPressed == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, sIdentifyBlinkRateMs, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        if (!PumpMgr().IsStopped())
-        {
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        }
-        else
-        {
-            LED_setOff(sAppGreenHandle);
-        }
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::InitOnOffClusterState()
-{
-
-    Protocols::InteractionModel::Status status;
-
-    ChipLogProgress(NotSpecified, "Init On/Off clusterstate");
-
-    // Write false as pump always boots in stopped mode
-    status = OnOff::Attributes::OnOff::Set(ONOFF_CLUSTER_ENDPOINT, false);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Init On/Off state  %x", to_underlying(status));
-    }
-}
-
-void AppTask::InitPCCClusterState() {}
-
-void AppTask::UpdateClusterState(void)
-{
-    // We must ensure that the Cluster accessors gets called in the right context
-    // which is the Matter mainloop thru ScheduleWork()
-    chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateCluster, reinterpret_cast<intptr_t>(nullptr));
-}
-
-void AppTask::UpdateCluster(intptr_t context)
-{
-    Protocols::InteractionModel::Status status;
-    BitMask<PumpConfigurationAndControl::PumpStatusBitmap> pumpStatus;
-
-    ChipLogProgress(NotSpecified, "Update Cluster State");
-
-    // Update the PumpStatus
-    PumpConfigurationAndControl::Attributes::PumpStatus::Get(PCC_CLUSTER_ENDPOINT, &pumpStatus);
-    if (PumpMgr().IsStopped())
-    {
-        pumpStatus.Clear(PumpConfigurationAndControl::PumpStatusBitmap::kRunning);
-    }
-    else
-    {
-        pumpStatus.Set(PumpConfigurationAndControl::PumpStatusBitmap::kRunning);
-    }
-    PumpConfigurationAndControl::Attributes::PumpStatus::Set(PCC_CLUSTER_ENDPOINT, pumpStatus);
-
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(PCC_CLUSTER_ENDPOINT,
-                                                                       PumpConfigurationAndControl::ControlModeEnum::kConstantFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Flow error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantPressure);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Pressure error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Speed error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantTemperature);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Temperature error  %x", to_underlying(status));
-    }
-
-    // Write the new values
-    bool onOffState = !PumpMgr().IsStopped();
-    status          = OnOff::Attributes::OnOff::Set(ONOFF_CLUSTER_ENDPOINT, onOffState);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating On/Off state  %x", to_underlying(status));
-    }
-
-    int16_t maxPressure = PumpMgr().GetMaxPressure();
-    status              = PumpConfigurationAndControl::Attributes::MaxPressure::Set(PCC_CLUSTER_ENDPOINT, maxPressure);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxPressure  %x", to_underlying(status));
-    }
-
-    uint16_t maxSpeed = PumpMgr().GetMaxSpeed();
-    status            = PumpConfigurationAndControl::Attributes::MaxSpeed::Set(PCC_CLUSTER_ENDPOINT, maxSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t maxFlow = PumpMgr().GetMaxFlow();
-    status           = PumpConfigurationAndControl::Attributes::MaxFlow::Set(PCC_CLUSTER_ENDPOINT, maxFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxFlow  %x", to_underlying(status));
-    }
-
-    int16_t minConstPress = PumpMgr().GetMinConstPressure();
-    status                = PumpConfigurationAndControl::Attributes::MinConstPressure::Set(PCC_CLUSTER_ENDPOINT, minConstPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstPressure  %x", to_underlying(status));
-    }
-
-    int16_t maxConstPress = PumpMgr().GetMaxConstPressure();
-    status                = PumpConfigurationAndControl::Attributes::MaxConstPressure::Set(PCC_CLUSTER_ENDPOINT, maxConstPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstPressure  %x", to_underlying(status));
-    }
-
-    int16_t minCompPress = PumpMgr().GetMinCompPressure();
-    status               = PumpConfigurationAndControl::Attributes::MinCompPressure::Set(PCC_CLUSTER_ENDPOINT, minCompPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinCompPressure  %x", to_underlying(status));
-    }
-
-    int16_t maxCompPress = PumpMgr().GetMaxCompPressure();
-    status               = PumpConfigurationAndControl::Attributes::MaxCompPressure::Set(PCC_CLUSTER_ENDPOINT, maxCompPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxCompPressure  %x", to_underlying(status));
-    }
-
-    uint16_t minConstSpeed = PumpMgr().GetMinConstSpeed();
-    status                 = PumpConfigurationAndControl::Attributes::MinConstSpeed::Set(PCC_CLUSTER_ENDPOINT, minConstSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t maxConstSpeed = PumpMgr().GetMaxConstSpeed();
-    status                 = PumpConfigurationAndControl::Attributes::MaxConstSpeed::Set(PCC_CLUSTER_ENDPOINT, maxConstSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t minConstFlow = PumpMgr().GetMinConstFlow();
-    status                = PumpConfigurationAndControl::Attributes::MinConstFlow::Set(PCC_CLUSTER_ENDPOINT, minConstFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstFlow  %x", to_underlying(status));
-    }
-
-    uint16_t maxConstFlow = PumpMgr().GetMaxConstFlow();
-    status                = PumpConfigurationAndControl::Attributes::MaxConstFlow::Set(PCC_CLUSTER_ENDPOINT, maxConstFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstFlow  %x", to_underlying(status));
-    }
-
-    int16_t minConstTemp = PumpMgr().GetMinConstTemp();
-    status               = PumpConfigurationAndControl::Attributes::MinConstTemp::Set(PCC_CLUSTER_ENDPOINT, minConstTemp);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstTemp  %x", to_underlying(status));
-    }
-
-    int16_t maxConstTemp = PumpMgr().GetMaxConstTemp();
-    status               = PumpConfigurationAndControl::Attributes::MaxConstTemp::Set(PCC_CLUSTER_ENDPOINT, maxConstTemp);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstTemp  %x", to_underlying(status));
-    }
-}
-
-void AppTask::PostEvents(intptr_t context)
-{
-    // Example on posting events - here we post the general fault event on endpoints with PCC Server enabled
-    for (auto endpoint : EnabledEndpointsWithServerCluster(PumpConfigurationAndControl::Id))
-    {
-        PumpConfigurationAndControl::Events::GeneralFault::Type event;
-        EventNumber eventNumber;
-
-        ChipLogProgress(Zcl, "AppTask: Post PCC GeneralFault event");
-        // Using default priority for the event
-        if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
-        {
-            ChipLogError(Zcl, "AppTask: Failed to record GeneralFault event");
-        }
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
deleted file mode 100644
index 11a8fbbd69b2a6..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      This file implements the CHIP Device Interface that is used by
- *      applications to interact with the CHIP stack
- *
- */
-
-#include <stdlib.h>
-
-#include "AppConfig.h"
-#include "CHIPDeviceManager.h"
-
-#include <app/ConcreteAttributePath.h>
-#include <app/util/basic-types.h>
-#include <lib/core/ErrorStr.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CodeUtils.h>
-#include <setup_payload/SetupPayload.h>
-
-using namespace ::chip;
-
-namespace chip {
-namespace DeviceManager {
-
-using namespace ::chip::DeviceLayer;
-
-void CHIPDeviceManager::CommonDeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
-{
-    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
-    if (cb != nullptr)
-    {
-        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
-    }
-}
-
-CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
-{
-    mCB = cb;
-
-    // Register a function to receive events from the CHIP device layer.  Note that calls to
-    // this function will happen on the CHIP event loop thread, not the app_main thread.
-    PlatformMgr().AddEventHandler(CHIPDeviceManager::CommonDeviceEventHandler, reinterpret_cast<intptr_t>(cb));
-
-    // Start a task to run the CHIP Device event loop.
-    return PlatformMgr().StartEventLoopTask();
-}
-} // namespace DeviceManager
-} // namespace chip
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
-        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
-    if (cb != nullptr)
-    {
-        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type, size,
-                                        value);
-    }
-}
-
-chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                           uint8_t type, uint16_t size, uint8_t * value)
-{
-    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
-        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
-    if (cb != nullptr)
-    {
-        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type,
-                                              size, value);
-    }
-
-    return chip::Protocols::InteractionModel::Status::Success;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
deleted file mode 100644
index 9bcfec5a6f8b51..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file DeviceCallbacks.cpp
- *
- * Implements all the callbacks to the application from the CHIP Stack
- *
- **/
-
-#include "DeviceCallbacks.h"
-#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>
-
-using namespace chip;
-using namespace chip::Inet;
-using namespace chip::System;
-using namespace chip::DeviceLayer;
-using namespace chip::app::Clusters;
-
-void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    switch (event->Type)
-    {
-    case DeviceEventType::kThreadConnectivityChange:
-        OnThreadConnectivityChange(event);
-        break;
-
-    case DeviceEventType::kInternetConnectivityChange:
-        OnInternetConnectivityChange(event);
-        break;
-
-    case DeviceEventType::kServiceProvisioningChange:
-        PLAT_LOG("## Service provisioning state change (%d,%d)", event->ServiceProvisioningChange.IsServiceProvisioned,
-                 event->ServiceProvisioningChange.ServiceConfigUpdated);
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionEstablished:
-        PLAT_LOG("CHIPoBLE connection established");
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionClosed:
-        PLAT_LOG("CHIPoBLE disconnected");
-        break;
-
-    case DeviceEventType::kThreadStateChange:
-        PLAT_LOG("## Thread stack state change (%x)", event->ThreadStateChange.OpenThread.Flags);
-        break;
-
-    case DeviceEventType::kCommissioningComplete:
-        PLAT_LOG("Commissioning complete for fabric 0x%x", event->CommissioningComplete.fabricIndex);
-        break;
-
-    case DeviceEventType::kOperationalNetworkEnabled:
-        PLAT_LOG("## Operational network enabled");
-        break;
-
-    case DeviceEventType::kDnssdInitialized:
-        PLAT_LOG("## Dnssd platform initialized");
-        break;
-
-    case DeviceEventType::kFailSafeTimerExpired:
-        PLAT_LOG("## Failsafe timer expired...");
-        break;
-
-    case DeviceEventType::kInterfaceIpAddressChanged:
-        PLAT_LOG("*** Interface IP address changed ***");
-        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
-            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
-        {
-            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
-            // will not trigger a 'internet connectivity change' as there is no internet
-            // connectivity. MDNS still wants to refresh its listening interfaces to include the
-            // newly selected address.
-            chip::app::DnssdServer::Instance().StartServer();
-        }
-        break;
-    }
-}
-
-chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCallback(chip::EndpointId endpointId,
-                                                                                      chip::ClusterId clusterId,
-                                                                                      chip::AttributeId attributeId, uint8_t type,
-                                                                                      uint16_t size, uint8_t * value)
-{
-    PLAT_LOG("PreAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
-             endpointId, attributeId);
-
-    switch (clusterId)
-    {
-    case PumpConfigurationAndControl::Id:
-        break;
-
-    case OnOff::Id:
-        break;
-
-    case LevelControl::Id:
-        break;
-
-    default:
-        PLAT_LOG("Unhandled cluster ID: %d", clusterId);
-        break;
-    }
-
-    return chip::Protocols::InteractionModel::Status::Success;
-}
-
-void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
-                                                  uint16_t size, uint8_t * value)
-{
-    PLAT_LOG("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
-             endpointId, attributeId);
-
-    switch (clusterId)
-    {
-    case PumpConfigurationAndControl::Id:
-        break;
-
-    case OnOff::Id:
-        OnOnOffPostAttributeChangeCallback(endpointId, attributeId, value);
-        break;
-
-    case LevelControl::Id:
-        OnLevelControlAttributeChangeCallback(endpointId, attributeId, value);
-        break;
-
-    default:
-        PLAT_LOG("Unhandled cluster ID: %d", clusterId);
-        break;
-    }
-}
-
-void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
-{
-    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
-    {
-        PLAT_LOG("Server ready at: %s:%d", event->InternetConnectivityChange.ipAddress, CHIP_PORT);
-        chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
-    {
-        PLAT_LOG("Lost IPv4 connectivity...");
-    }
-    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
-    {
-        PLAT_LOG("IPv6 Server ready...");
-        chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
-    {
-        PLAT_LOG("Lost IPv6 connectivity...");
-    }
-}
-
-void DeviceCallbacks::OnThreadConnectivityChange(const ChipDeviceEvent * event)
-{
-    if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
-    {
-        PLAT_LOG("## Thread connectivity established...");
-    }
-    else if (event->ThreadConnectivityChange.Result == kConnectivity_Lost)
-    {
-        PLAT_LOG("## Thread connectivity lost...");
-    }
-    else if (event->ThreadConnectivityChange.Result == kConnectivity_NoChange)
-    {
-        PLAT_LOG("## No change in Thread connectivity...");
-    }
-}
-
-void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    VerifyOrExit(attributeId == OnOff::Attributes::OnOff::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    PumpMgr().InitiateAction(0, *value ? PumpManager::START_ACTION : PumpManager::STOP_ACTION);
-
-exit:
-    return;
-}
-
-void DeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    VerifyOrExit(attributeId == LevelControl::Attributes::CurrentLevel::Id,
-                 PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    ChipLogProgress(Zcl, "[pump-app] Cluster LevelControl: attribute CurrentLevel set to %u", *value);
-
-exit:
-    return;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp
deleted file mode 100644
index 0e7e90e27aba40..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "PumpManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "FreeRTOS.h"
-
-#define ACTUATOR_MOVEMENT_PERIOS_MS 500
-
-PumpManager PumpManager::sPump;
-
-int PumpManager::Init()
-{
-    int ret = 0;
-
-    mTimerHandle = xTimerCreate("BLT_TIMER", pdMS_TO_TICKS(ACTUATOR_MOVEMENT_PERIOS_MS), pdFALSE, this, TimerEventHandler);
-    if (NULL == mTimerHandle)
-    {
-        PLAT_LOG("failed to create pump timer");
-        while (true)
-            ;
-    }
-
-    mState               = kState_StopCompleted;
-    mAutoStartTimerArmed = false;
-    mAutoRestart         = false;
-    mAutoStartDuration   = 0;
-
-    return ret;
-}
-
-void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool PumpManager::IsActionInProgress()
-{
-    return (mState == kState_StartInitiated || mState == kState_StopInitiated);
-}
-
-bool PumpManager::IsStopped()
-{
-    return (mState == kState_StopCompleted);
-}
-
-void PumpManager::EnableAutoRestart(bool aOn)
-{
-    mAutoRestart = aOn;
-}
-
-void PumpManager::SetAutoStartDuration(uint32_t aDurationInSecs)
-{
-    mAutoStartDuration = aDurationInSecs;
-}
-
-bool PumpManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Start/Stop Action only when the previous one is complete.
-    if (mState == kState_StartCompleted && aAction == STOP_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StopInitiated;
-    }
-    else if (mState == kState_StopCompleted && aAction == START_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StartInitiated;
-    }
-
-    if (action_initiated)
-    {
-        if (mAutoStartTimerArmed && new_state == kState_StartInitiated)
-        {
-            // If auto start timer has been armed and someone initiates start,
-            // cancel the timer and continue as normal.
-            mAutoStartTimerArmed = false;
-
-            CancelTimer();
-        }
-
-        PumpTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-    return action_initiated;
-}
-
-void PumpManager::PumpTimer(uint32_t aTimeoutMs)
-{
-    xTimerChangePeriod(mTimerHandle, pdMS_TO_TICKS(aTimeoutMs), 100);
-    xTimerStart(mTimerHandle, 100);
-}
-
-void PumpManager::CancelTimer(void)
-{
-    xTimerStop(mTimerHandle, 100);
-}
-
-void PumpManager::TimerEventHandler(TimerHandle_t aTimer)
-{
-    PumpManager * pump = static_cast<PumpManager *>(pvTimerGetTimerID(aTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sPumpTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                   = AppEvent::kEventType_AppEvent;
-    event.PumpStateEvent.Context = static_cast<PumpManager *>(pump);
-    if (pump->mAutoStartTimerArmed)
-    {
-        event.Handler = AutoRestartTimerEventHandler;
-    }
-    else
-    {
-        event.Handler = ActuatorMovementTimerEventHandler;
-    }
-    GetAppTask().PostEvent(&event);
-}
-
-void PumpManager::AutoRestartTimerEventHandler(AppEvent * aEvent)
-{
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-    int32_t actor      = 0;
-
-    // Make sure auto start timer is still armed.
-    if (!pump->mAutoStartTimerArmed)
-    {
-        return;
-    }
-
-    pump->mAutoStartTimerArmed = false;
-
-    PLAT_LOG("Auto Re-Start has been triggered!");
-
-    pump->InitiateAction(actor, START_ACTION);
-}
-
-void PumpManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-
-    if (pump->mState == kState_StartInitiated)
-    {
-        pump->mState    = kState_StartCompleted;
-        actionCompleted = START_ACTION;
-    }
-    else if (pump->mState == kState_StopInitiated)
-    {
-        pump->mState    = kState_StopCompleted;
-        actionCompleted = STOP_ACTION;
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (pump->mActionCompleted_CB)
-        {
-            pump->mActionCompleted_CB(actionCompleted, pump->mCurrentActor);
-        }
-
-        if (pump->mAutoRestart && actionCompleted == STOP_ACTION)
-        {
-            // Start the timer for auto restart
-            pump->PumpTimer(pump->mAutoStartDuration * 1000);
-
-            pump->mAutoStartTimerArmed = true;
-
-            PLAT_LOG("Auto Re-start enabled. Will be triggered in %u seconds", pump->mAutoStartDuration);
-        }
-    }
-}
-
-int16_t PumpManager::GetMaxPressure()
-{
-    // 1.6.1. MaxPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 2000.0 kPa as Max Pressure
-    return 20000;
-}
-
-uint16_t PumpManager::GetMaxSpeed()
-{
-    // 1.6.2. MaxSpeed Attribute
-    // Range 0 RPM to 65534 RPM (steps of 1 RPM)
-    // 65535 is invalid value - perhaps 'null'
-
-    // Return 1000 RPM as MaxSpeed
-    return 1000;
-}
-
-uint16_t PumpManager::GetMaxFlow()
-{
-    // 1.6.3. MaxFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 200.0 m3/h as MaxFlow
-    return 2000;
-}
-
-int16_t PumpManager::GetMinConstPressure()
-{
-    // 1.6.4. MinConstPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return -100.0 kPa as MinConstPressure
-    return -1000;
-}
-
-int16_t PumpManager::GetMaxConstPressure()
-{
-    // 1.6.5. MaxConstPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 100.0 kPa as MaxConstPressure
-    return 1000;
-}
-
-int16_t PumpManager::GetMinCompPressure()
-{
-    // 1.6.6. MinCompPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return -20.0 kPa as MinCompPressure
-    return -200;
-}
-
-int16_t PumpManager::GetMaxCompPressure()
-{
-    // 1.6.7. MaxCompPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 20.0 kPa as MaxCompPressure
-    return 200;
-}
-
-uint16_t PumpManager::GetMinConstSpeed()
-{
-    // 1.6.8. MinConstSpeed Attribute
-    // Range 0 to 65534 RPM (steps of 1 RPM)
-    // 65535 RPM is invalid valud - perhaps 'null'
-
-    // Return 200 RPM as MinConstSpeed
-    return 200;
-}
-
-uint16_t PumpManager::GetMaxConstSpeed()
-{
-    // 1.6.9. MaxConstSpeed Attribute
-    // Range 0 to 65534 RPM (steps of 1 RPM)
-    // 65535 RPM is invalid valud - perhaps 'null'
-
-    // Return 2000 RPM as MaxConstSpeed
-    return 2000;
-}
-
-uint16_t PumpManager::GetMinConstFlow()
-{
-    // 1.6.10. MinConstFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 12.5 m3/h as MinConstFlow
-    return 125;
-}
-
-uint16_t PumpManager::GetMaxConstFlow()
-{
-    // 1.6.11. MaxConstFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 655.7 m3/h as MaxConstFlow
-    return 6557;
-}
-
-int16_t PumpManager::GetMinConstTemp()
-{
-    // 1.6.12. MinConstTemp Attribute
-    // Range -273.15 C to 327.67 C (steps of 0.01 C)
-    // All other values are invalid values - perhaps 'null'
-
-    // Return 30.00 C as MinConstTemp
-    return 3000;
-}
-
-int16_t PumpManager::GetMaxConstTemp()
-{
-    // 1.6.13. MaxConstTemp Attribute
-    // Range -273.15 C to 327.67 C (steps of 0.01 C)
-    // All other values are invalid values - perhaps 'null'
-
-    // Return 56.00 C as MaxConstTemp
-    return 5600;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index 54faa0db6e7314..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "PumpManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    GetAppTask().InitOnOffClusterState();
-}
-
-void emberAfPumpConfigurationAndControlClusterInitCallback(chip::EndpointId endpoint)
-{
-    GetAppTask().InitPCCClusterState();
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index b925344ddb4c9a..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index 3a9c606e95c330..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-        kAppEventButtonType_LongPressed,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } PumpStateEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index 47b4fd56f2d671..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "PumpManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-struct Identify;
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostStartActionRequest(int32_t aActor, PumpManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-    void UpdateClusterState();
-    void InitOnOffClusterState();
-    void InitPCCClusterState();
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(PumpManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PumpManager::Action_t aAction, int32_t aActor);
-
-    static void UpdateCluster(intptr_t context);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-    static void PostEvents(intptr_t context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
deleted file mode 100644
index da1214d2995f6e..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      This file contains definitions for the CHIP DeviceManager Interface
- *
- *      This object will co-ordinate multiple activities such as
- *      initialisation, rendezvous, session mgmt and other such
- *      activities within the CHIP stack. This is a singleton object.
- */
-
-#pragma once
-
-#include <lib/core/CHIPCore.h>
-#include <lib/core/CHIPError.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <lib/support/DLLUtil.h>
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <app/util/af-types.h>
-
-namespace chip {
-namespace DeviceManager {
-
-/**
- * @brief
- *   This class provides a skeleton for all the callback functions. The functions will be
- *   called by other objects within the CHIP stack for specific events.
- *   Applications interested in receiving specific callbacks can specialize this class and handle
- *   these events in their implementation of this class.
- */
-class DLL_EXPORT CHIPDeviceManagerCallbacks
-{
-public:
-    /**
-     * @brief
-     *   Called when CHIP Device events (PublicEventTypes) are triggered.
-     *
-     * @param event   ChipDeviceEvent that occurred
-     * @param arg     arguments specific to the event, if any
-     */
-    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-    /**
-     * @brief
-     *   Called after an attribute has been changed
-     *
-     * @param endpoint           endpoint id
-     * @param clusterID          cluster id
-     * @param attributeId        attribute id that was changed
-     * @param mask               mask of the attribute
-     * @param manufacturerCode   manufacturer code
-     * @param type               attribute type
-     * @param size               size of the attribute
-     * @param value              pointer to the new value
-     */
-    virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t type, uint16_t size, uint8_t * value)
-    {}
-    /**
-     * @brief
-     *   Called just before an attribute will be changed
-     *
-     * @param endpoint           endpoint id
-     * @param clusterID          cluster id
-     * @param attributeId        attribute id that was changed
-     * @param mask               mask of the attribute
-     * @param manufacturerCode   manufacturer code
-     * @param type               attribute type
-     * @param size               size of the attribute
-     * @param value              pointer to the new value
-     *
-     * @return Success if the attribute can be changed, otherwise Failed.
-     */
-    virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpoint,
-                                                                                 chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t type,
-                                                                                 uint16_t size, uint8_t * value)
-    {
-        return chip::Protocols::InteractionModel::Status::Success;
-    }
-    virtual ~CHIPDeviceManagerCallbacks() {}
-};
-
-/**
- * @brief
- *   A common class that drives other components of the CHIP stack
- */
-class DLL_EXPORT CHIPDeviceManager
-{
-public:
-    CHIPDeviceManager(const CHIPDeviceManager &)             = delete;
-    CHIPDeviceManager(const CHIPDeviceManager &&)            = delete;
-    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
-
-    static CHIPDeviceManager & GetInstance()
-    {
-        static CHIPDeviceManager instance;
-        return instance;
-    }
-
-    /**
-     * @brief
-     *   Initialise CHIPDeviceManager
-     *
-     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
-     */
-    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
-    /**
-     * @brief
-     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
-     *
-     */
-    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
-
-    /**
-     * Use internally for registration of the ChipDeviceEvents
-     */
-    static void CommonDeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-
-private:
-    CHIPDeviceManagerCallbacks * mCB = nullptr;
-    CHIPDeviceManager() {}
-};
-
-} // namespace DeviceManager
-} // namespace chip
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index e10a37616e6360..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-// Security and Authentication always enabled
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- *
- * TODO: (#17080) 1 should be OK since almost all commands are synchronous, should be some larger number after we resolved the issue
- * of the large memory footprint of ReadHandler.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- *
- * TODO: (#17080) 1 should be OK since most write requests can be synchronous (not chunked), should be some larger number after we
- * resolved the issue of the large memory footprint of ReadHandler.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
deleted file mode 100644
index 7e2633b54bb9db..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file DeviceCallbacks.h
- *
- * Implementations for the DeviceManager callbacks for this application
- *
- **/
-
-#pragma once
-
-#include "CHIPDeviceManager.h"
-#include <app/util/af-types.h>
-#include <platform/CHIPDeviceLayer.h>
-
-class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
-{
-public:
-    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-    virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpointId,
-                                                                                 chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t type,
-                                                                                 uint16_t size, uint8_t * value);
-    virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t type, uint16_t size, uint8_t * value);
-
-private:
-    void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
-    void OnThreadConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
-    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-};
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h
deleted file mode 100644
index ea742c22acb765..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef PUMP_MANAGER_H
-#define PUMP_MANAGER_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include <FreeRTOS.h>
-#include <timers.h>
-
-class PumpManager
-{
-public:
-    enum Action_t
-    {
-        START_ACTION = 0,
-        STOP_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_StartInitiated = 0,
-        kState_StartCompleted,
-        kState_StopInitiated,
-        kState_StopCompleted,
-    } State;
-
-    int Init();
-    bool IsStopped();
-    void EnableAutoRestart(bool aOn);
-    void SetAutoStartDuration(uint32_t aDurationInSecs);
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    int16_t GetMaxPressure();
-    uint16_t GetMaxSpeed();
-    uint16_t GetMaxFlow();
-    int16_t GetMinConstPressure();
-    int16_t GetMaxConstPressure();
-    int16_t GetMinCompPressure();
-    int16_t GetMaxCompPressure();
-    uint16_t GetMinConstSpeed();
-    uint16_t GetMaxConstSpeed();
-    uint16_t GetMinConstFlow();
-    uint16_t GetMaxConstFlow();
-    int16_t GetMinConstTemp();
-    int16_t GetMaxConstTemp();
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t, int32_t aActor);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-private:
-    friend PumpManager & PumpMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    bool mAutoRestart;
-    uint32_t mAutoStartDuration;
-    bool mAutoStartTimerArmed;
-    TimerHandle_t mTimerHandle;
-    int32_t mCurrentActor;
-
-    void CancelTimer(void);
-    void PumpTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t aTimer);
-    static void AutoRestartTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    static PumpManager sPump;
-};
-
-inline PumpManager & PumpMgr(void)
-{
-    return PumpManager::sPump;
-}
-
-#endif // PUMP_MANAGER_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 2b4be76e9c33da..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xC700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
index 61a6a0fdca18ef..9c46aa697263ce 100644
--- a/examples/pump-app/cc13x4_26x4/README.md
+++ b/examples/pump-app/cc13x4_26x4/README.md
@@ -92,8 +92,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
index 402339bf576071..4450b09bd95e8d 100644
--- a/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-app/cc13x4_26x4/main/AppTask.cpp
@@ -32,7 +32,7 @@
 
 #include <app/EventLogging.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 #include <app/clusters/ota-requestor/BDXDownloader.h>
diff --git a/examples/pump-app/telink/CMakeLists.txt b/examples/pump-app/telink/CMakeLists.txt
index 5c3ad5d3d3f41e..79334332003646 100755
--- a/examples/pump-app/telink/CMakeLists.txt
+++ b/examples/pump-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,47 +19,11 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-pump-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-pump-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,17 +31,23 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/pump-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/PumpManager.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/pump-app/telink/include/AppConfig.h b/examples/pump-app/telink/include/AppConfig.h
index 85792a55a3d316..9f3fae6a270127 100644
--- a/examples/pump-app/telink/include/AppConfig.h
+++ b/examples/pump-app/telink/include/AppConfig.h
@@ -20,14 +20,8 @@
 
 // ---- Pump Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
 
 // Time it takes in ms for the simulated pump to move from one state to another.
 #define PUMP_START_PERIOS_MS 2000
diff --git a/examples/pump-app/telink/include/AppTask.h b/examples/pump-app/telink/include/AppTask.h
index 5d4537b38f54a5..ce6dd797a16cde 100644
--- a/examples/pump-app/telink/include/AppTask.h
+++ b/examples/pump-app/telink/include/AppTask.h
@@ -21,6 +21,8 @@
 #include "AppTaskCommon.h"
 #include "PumpManager.h"
 
+class LedManager;
+
 class AppTask : public AppTaskCommon
 {
 public:
@@ -33,6 +35,7 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkLeds(LedManager & ledManager);
 
     static void ActionInitiated(PumpManager::Action_t action, int32_t actor);
     static void ActionCompleted(PumpManager::Action_t action, int32_t actor);
diff --git a/examples/pump-app/telink/prj.conf b/examples/pump-app/telink/prj.conf
index 13eb622c61a548..2ed082de84ec01 100755
--- a/examples/pump-app/telink/prj.conf
+++ b/examples/pump-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32778 == 0x800A (example pump-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32778
 
diff --git a/examples/pump-app/telink/src/AppTask.cpp b/examples/pump-app/telink/src/AppTask.cpp
index 368702d51ae11f..a7a360b934cd8f 100644
--- a/examples/pump-app/telink/src/AppTask.cpp
+++ b/examples/pump-app/telink/src/AppTask.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "AppTask.h"
+#include "LEDManager.h"
 #include "PumpManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -26,25 +27,16 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 namespace {
 constexpr EndpointId kPccClusterEndpoint   = 1;
 constexpr EndpointId kOnOffClusterEndpoint = 1;
-
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-LEDWidget sPumpStateLED;
-#endif
 } // namespace
 
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(StartActionEventHandler);
-#endif
     InitCommonParts();
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sPumpStateLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios));
-    sPumpStateLED.Set(!PumpMgr().IsStopped());
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, !PumpMgr().IsStopped());
 
     PumpMgr().Init();
     PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
@@ -65,9 +57,7 @@ void AppTask::ActionInitiated(PumpManager::Action_t action, int32_t actor)
         LOG_INF("Pump Stop Action has been initiated");
     }
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sPumpStateLED.Blink(50, 50);
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, 50, 50);
 }
 
 void AppTask::ActionCompleted(PumpManager::Action_t action, int32_t actor)
@@ -78,16 +68,12 @@ void AppTask::ActionCompleted(PumpManager::Action_t action, int32_t actor)
     if (action == PumpManager::START_ACTION)
     {
         LOG_INF("Pump Start Action has been completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sPumpStateLED.Set(true);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, true);
     }
     else if (action == PumpManager::STOP_ACTION)
     {
         LOG_INF("Pump Stop Action has been completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sPumpStateLED.Set(false);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, false);
     }
 
     if (actor == static_cast<uint8_t>(AppEvent::kEventType_Button))
@@ -157,3 +143,13 @@ void AppTask::UpdateClusterState()
             maxPressure, maxSpeed, maxFlow, minConstPress, maxConstPress, minCompPress, maxCompPress, minConstSpeed, maxConstSpeed,
             minConstFlow, maxConstFlow, minConstTemp, maxConstTemp);
 }
+
+void AppTask::LinkLeds(LedManager & ledManager)
+{
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+    ledManager.linkLed(LedManager::EAppLed_Status, 0);
+    ledManager.linkLed(LedManager::EAppLed_App0, 1);
+#else
+    ledManager.linkLed(LedManager::EAppLed_App0, 0);
+#endif // CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  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/BUILD.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 2d66a7f993158b..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/pump-controller-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":pump_controller_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("pump_controller_app") {
-  output_name = "chip-${ti_simplelink_board}-pump-controller-example.out"
-
-  sources = [
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/PumpManager.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/pump-controller-app/pump-controller-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":pump_controller_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index f20a3151e912a2..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,296 +0,0 @@
-# Matter Pump Controller Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Pump Controller Example Application](#matter-pump-controller-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX pump controller example application provides a working
-demonstration of a connected pump controller device. This uses the open-source
-Matter implementation and the Texas Instruments SimpleLink™ CC13XX and CC26XX
-software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The pump example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | BLE Advertisement (Enable/Disable)     |
-| Left Button (`BTN-1`) Press (more than 5000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Toggle pump state                      |
-| Red & Green LED Blinking State                   | Pump transition from either Start/Stop |
-| Red & LED On State                               | Pump is started                        |
-| Red & Green LED Off State                        | Pump stopped                           |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-1`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** Read generic vendor name from Basic cluster
-
-```
-./chip-tool basic read vendor-name 1 0
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-1` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni b/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index d78851719f1fb5..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-#chip_progress_logging = false
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8011"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides b/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg
deleted file mode 100644
index b46e258311e19b..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg
deleted file mode 100644
index 85dc32c0530acc..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg
deleted file mode 100644
index f1563f8933b01c..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg
deleted file mode 100644
index a3d63e4dfcd944..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg
deleted file mode 100644
index ad07cbf180d1d0..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg
deleted file mode 100644
index 43010467f37d95..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg
deleted file mode 100644
index 119886b184c7c5..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg
deleted file mode 100644
index 4bd4776f692973..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg
deleted file mode 100644
index 33cb488a6541ec..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg
deleted file mode 100644
index 66a2855628808b..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg
deleted file mode 100644
index d0270ecaaedf9f..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg
deleted file mode 100644
index 73f21c9a69d118..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg
deleted file mode 100644
index 36a34f4a5e12e3..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg
deleted file mode 100644
index e6a4e04371a369..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg
deleted file mode 100644
index 6a38f067e4fc4c..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg
deleted file mode 100644
index 6a2a9a8a813ce0..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg
deleted file mode 100644
index c6e6dd2249f498..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md
deleted file mode 100644
index ac31ab8bbea1f0..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Programming and Debugging with CCS
-
--   Download and install [Code Composer Studio][ccs].
-
--   Use `xdsdfu` to determine the XDS110 serial number to identify the device.
-    This may be skipped if there is only one LaunchPad connected to your PC, but
-    it is recommended.
-
-    ```
-    C:\>cd \ti\ccs1010\ccs\ccs_base\common\uscif\xds110
-
-    C:\ti\ccs1010\ccs\ccs_base\common\uscif\xds110>xdsdfu.exe -e
-
-    USB Device Firmware Upgrade Utility
-    Copyright (c) 2008-2019 Texas Instruments Incorporated.  All rights reserved.
-
-    Scanning USB buses for supported XDS110 devices...
-    ```
-
-<<<< Device 0 >>>>
-
-VID: 0x0451 PID: 0xbef3 Device Name: XDS110 Embed with CMSIS-DAP Version:
-3.0.0.13 Manufacturer: Texas Instruments Serial Num: L4100652 Mode: Runtime
-Configuration: Standard
-
-Found 1 device.
-
-```
-In this example, my LaunchPad's XDS110 has a serial number of `L4100652`.
-
-- Start a new Code Composer Studio Workspace. This can be named anything you
-would like. But it is recommended that you use a blank workspace.
-
-![CCS step 1](images/ccs-1.jpg)
-
-- Create a new Target Configuration File by selecting `File` >> `New` >>
-`Target Configuration File`. This file can also be exported from UniFlash
-with the `download ccxml` function.
-
-![CCS step 2](images/ccs-2.jpg)
-
-- Name the new ccxml file a useful name. Here I use the XDS110 serial number
-from before. Leave the Location as the shared location and click `Finish` to
-create the file.
-
-![CCS step 3](images/ccs-3.jpg)
-
-- In the new ccxml, select the `Connection` and the `Board or Device`. This may
-be different for your setup, but all LaunchPads will use the `Texas
-Instruments XDS110 USB Debug Probe` for the target connection. And the and a
-`CC1352R1F3` is mounted on the `CC1352R1_LAUNCHXL` LaunchPads. Builds for
-other LaunchPads should use the corresponding SoC name.
-
-![CCS step 4](images/ccs-4.jpg)
-
-- Now set the XDS110 serial number in the advanced tab of the ccxml. First
-select the `Advanced` tab at the bottom of the window. Then select the Debug
-Probe in the connection tree. Then select `Select by serial number` in the
-`Debug Probe Selection`. Then enter the serial number from `xdsdfu` earlier
-in the `Enter the serial number` text field. Finally click `Save` to save
-your ccxml.
-
-![CCS step 5](images/ccs-5.jpg)
-
-- Clicking `Test Connection` with the LaunchPad connected will cause a JTAG
-Integrity scan with the Debug Probe. This is a nice way to check that your
-ccxml is setup correctly.
-
-![CCS step 6](images/ccs-6.jpg)
-
-- Now open the Debug Configurations dialog to setup a new debug configuration.
-Select `Run` >> `Debug Configurations...`.
-
-![CCS step 7](images/ccs-7.jpg)
-
-- Create a new launch configuration from the default CCS launch configuration.
-Select `Code Composer Studio - Device Debugging` and then create a new launch
-configuration with the `New launch configuration` button.
-
-![CCS step 8](images/ccs-8.jpg)
-
-- Name your new configuration. Update the `Target Configuration` field with the
-ccxml you created earlier. Click `Apply` to save the launch configuration.
-
-Once the launch configuration is created you do not need to re-create it
-every time. The Debug session can be started with the `Debug` button in the
-`Debug Configurations` dialog, or by selecting `Run` >> `Debug History` >>
-`<launch configuration name>`.
-
-![CCS step 9](images/ccs-9.jpg)
-
-- Now that the Debug session is started we can connect to the target. Make sure
-that the right Debug Probe is selected in the `Debug` window and click
-`Connect Target`.
-
-![CCS step 9](images/ccs-10.jpg)
-
-- The target MCU is connected. The MCU is halted on connection by default.
-Select the `Load Program...` option to select the ELF image to load.
-
-![CCS step 9](images/ccs-11.jpg)
-
-- Navigate to the ELF file
-(`${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-file) in the `Load Program` dialog. Click `OK` to begin loading the target.
-
-![CCS step 9](images/ccs-12.jpg)
-
-- After locating the source file for `main.cpp` we can step through the code
-as it executes.
-
-![CCS step 9](images/ccs-13.jpg)
-
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-```
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
deleted file mode 100644
index f6b3acb27b9b28..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Programming with UniFlash
-
--   Download and install [UniFlash][uniflash].
-
--   Select the Device Detect option. Then select the device you wish to program.
-    Or you can create a new configuration if you know the debugger serial number
-
-    ![UniFlash step 1](images/uniflash-1.jpg)
-
--   Browse for your build image by clicking the `Browse` button. It will be at
-    `${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-
-    ![UniFlash step 2](images/uniflash-2.jpg)
-
--   Load the image by clicking the `Load Image` button. This will eventually
-    result in a success message in the console below.
-
-    ![UniFlash step 3](images/uniflash-3.jpg)
-
--   Open a terminal to the XDS110 User UART and interact with the example
-    application.
-
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 0650341acbc081..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include <app/server/Server.h>
-
-#include "FreeRTOS.h"
-#include <credentials/DeviceAttestationCredsProvider.h>
-
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <app/util/af-types.h>
-#include <app/util/af.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(chip::Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-static const chip::EndpointId sIdentifyEndpointId = 0;
-static const uint32_t sIdentifyBlinkRateMs        = 500;
-
-::Identify stIdentify = { sIdentifyEndpointId, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    chip::Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-#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");
-        while (true)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGPRESSED;
-    buttonParams.longPressDuration = 5000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Initialize Pump module
-    PLAT_LOG("Initialize Pump");
-    PumpMgr().Init();
-
-    PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGPRESSED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongPressed;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // If the action has been initiated by the pump, update the pump trait
-    // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start initiated");
-        ; // TODO
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Stop initiated");
-        ; // TODO
-    }
-
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void AppTask::ActionCompleted(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // if the action has been completed by the pump, update the pump trait.
-    // Turn on the pump state LED if in a STARTED state OR
-    // Turn off the pump state LED if in an STOPPED state.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Pump stop completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOff(sAppRedHandle);
-    }
-    if (aActor == AppEvent::kEventType_ButtonLeft)
-    {
-        sAppTask.UpdateClusterState();
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle Pump state
-            if (!PumpMgr().IsStopped())
-            {
-                PumpMgr().InitiateAction(0, PumpManager::STOP_ACTION);
-            }
-            else
-            {
-                PumpMgr().InitiateAction(0, PumpManager::START_ACTION);
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisement");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        else if (AppEvent::kAppEventButtonType_LongPressed == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, sIdentifyBlinkRateMs, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        if (!PumpMgr().IsStopped())
-        {
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        }
-        else
-        {
-            LED_setOff(sAppGreenHandle);
-        }
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::UpdateClusterState() {}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp
deleted file mode 100644
index 2afc7fd7b37ded..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "PumpManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "FreeRTOS.h"
-
-#define ACTUATOR_MOVEMENT_PERIOS_MS 500
-
-PumpManager PumpManager::sPump;
-
-int PumpManager::Init()
-{
-    int ret = 0;
-
-    mTimerHandle = xTimerCreate("BLT_TIMER", pdMS_TO_TICKS(ACTUATOR_MOVEMENT_PERIOS_MS), pdFALSE, this, TimerEventHandler);
-    if (NULL == mTimerHandle)
-    {
-        PLAT_LOG("failed to create pump timer");
-        while (true)
-            ;
-    }
-
-    mState               = kState_StopCompleted;
-    mAutoStartTimerArmed = false;
-    mAutoRestart         = false;
-    mAutoStartDuration   = 0;
-
-    return ret;
-}
-
-void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool PumpManager::IsActionInProgress()
-{
-    return (mState == kState_StartInitiated || mState == kState_StopInitiated);
-}
-
-bool PumpManager::IsStopped()
-{
-    return (mState == kState_StopCompleted);
-}
-
-void PumpManager::EnableAutoRestart(bool aOn)
-{
-    mAutoRestart = aOn;
-}
-
-void PumpManager::SetAutoStartDuration(uint32_t aDurationInSecs)
-{
-    mAutoStartDuration = aDurationInSecs;
-}
-
-bool PumpManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Start/Stop Action only when the previous one is complete.
-    if (mState == kState_StartCompleted && aAction == STOP_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_StopInitiated;
-    }
-    else if (mState == kState_StopCompleted && aAction == START_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StartInitiated;
-    }
-
-    if (action_initiated)
-    {
-        if (mAutoStartTimerArmed && new_state == kState_StartInitiated)
-        {
-            // If auto start timer has been armed and someone initiates start,
-            // cancel the timer and continue as normal.
-            mAutoStartTimerArmed = false;
-
-            CancelTimer();
-        }
-
-        PumpTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void PumpManager::PumpTimer(uint32_t aTimeoutMs)
-{
-    xTimerChangePeriod(mTimerHandle, pdMS_TO_TICKS(aTimeoutMs), 100);
-    xTimerStart(mTimerHandle, 100);
-}
-
-void PumpManager::CancelTimer(void)
-{
-    xTimerStop(mTimerHandle, 100);
-}
-
-void PumpManager::TimerEventHandler(TimerHandle_t aTimer)
-{
-    PumpManager * pump = static_cast<PumpManager *>(pvTimerGetTimerID(aTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sPumpTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                   = AppEvent::kEventType_AppEvent;
-    event.PumpStateEvent.Context = static_cast<PumpManager *>(pump);
-    if (pump->mAutoStartTimerArmed)
-    {
-        event.Handler = AutoRestartTimerEventHandler;
-    }
-    else
-    {
-        event.Handler = ActuatorMovementTimerEventHandler;
-    }
-    GetAppTask().PostEvent(&event);
-}
-
-void PumpManager::AutoRestartTimerEventHandler(AppEvent * aEvent)
-{
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-    int32_t actor      = 0;
-
-    // Make sure auto start timer is still armed.
-    if (!pump->mAutoStartTimerArmed)
-    {
-        return;
-    }
-
-    pump->mAutoStartTimerArmed = false;
-
-    PLAT_LOG("Auto Re-Start has been triggered!");
-
-    pump->InitiateAction(actor, START_ACTION);
-}
-
-void PumpManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-
-    if (pump->mState == kState_StartInitiated)
-    {
-        pump->mState    = kState_StartCompleted;
-        actionCompleted = START_ACTION;
-    }
-    else if (pump->mState == kState_StopInitiated)
-    {
-        pump->mState    = kState_StopCompleted;
-        actionCompleted = STOP_ACTION;
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (pump->mActionCompleted_CB)
-        {
-            pump->mActionCompleted_CB(actionCompleted, pump->mCurrentActor);
-        }
-
-        if (pump->mAutoRestart && actionCompleted == STOP_ACTION)
-        {
-            // Start the timer for auto restart
-            pump->PumpTimer(pump->mAutoStartDuration * 1000);
-
-            pump->mAutoStartTimerArmed = true;
-
-            PLAT_LOG("Auto Re-start enabled. Will be triggered in %u seconds", pump->mAutoStartDuration);
-        }
-    }
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index e450a4b233eddb..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "PumpManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id)
-    {
-        PumpMgr().InitiateAction(0, *value ? PumpManager::START_ACTION : PumpManager::STOP_ACTION);
-    }
-    else if (attributePath.mClusterId == LevelControl::Id &&
-             attributePath.mAttributeId == LevelControl::Attributes::CurrentLevel::Id)
-    {
-        ChipLogProgress(Zcl, "[pump-app] Cluster LevelControl: attribute CurrentLevel set to %u", *value);
-    }
-    else
-    {
-        ChipLogProgress(Zcl, "Unknown attribute ID: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mAttributeId));
-        return;
-    }
-}
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    GetAppTask().UpdateClusterState();
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index b925344ddb4c9a..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index 3a9c606e95c330..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-        kAppEventButtonType_LongPressed,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } PumpStateEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index bb815585471add..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "PumpManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-struct Identify;
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostStartActionRequest(int32_t aActor, PumpManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-    void UpdateClusterState();
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(PumpManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PumpManager::Action_t aAction, int32_t aActor);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index e8329c75ae9e29..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-// Security and Authentication always enabled
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
deleted file mode 100644
index 30f5633cc3bc7f..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h
deleted file mode 100644
index 40a3961dd09161..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#ifndef PUMP_MANAGER_H
-#define PUMP_MANAGER_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include <FreeRTOS.h>
-#include <timers.h>
-
-class PumpManager
-{
-public:
-    enum Action_t
-    {
-        START_ACTION = 0,
-        STOP_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_StartInitiated = 0,
-        kState_StartCompleted,
-        kState_StopInitiated,
-        kState_StopCompleted,
-    } State;
-
-    int Init();
-    bool IsStopped();
-    void EnableAutoRestart(bool aOn);
-    void SetAutoStartDuration(uint32_t aDurationInSecs);
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t, int32_t aActor);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-private:
-    friend PumpManager & PumpMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    bool mAutoRestart;
-    uint32_t mAutoStartDuration;
-    bool mAutoStartTimerArmed;
-    TimerHandle_t mTimerHandle;
-    int32_t mCurrentActor;
-
-    void CancelTimer(void);
-    void PumpTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t aTimer);
-    static void AutoRestartTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    static PumpManager sPump;
-};
-
-inline PumpManager & PumpMgr(void)
-{
-    return PumpManager::sPump;
-}
-
-#endif // PUMP_MANAGER_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 2b4be76e9c33da..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xC700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
index d61857024dfc88..bff60fdd3b1169 100644
--- a/examples/pump-controller-app/cc13x4_26x4/README.md
+++ b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
index 2a499a9fd89a54..6c849549343c1d 100644
--- a/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/pump-controller-app/cc13x4_26x4/main/AppTask.cpp
@@ -28,7 +28,6 @@
 #include <examples/platform/cc13x4_26x4/CC13X4_26X4DeviceAttestationCreds.h>
 
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 #include <app/clusters/ota-requestor/BDXDownloader.h>
diff --git a/examples/pump-controller-app/telink/CMakeLists.txt b/examples/pump-controller-app/telink/CMakeLists.txt
index 684bb89776eed5..3aeb7775e0555f 100755
--- a/examples/pump-controller-app/telink/CMakeLists.txt
+++ b/examples/pump-controller-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,47 +19,11 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-pump-controller-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-pump-controller-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,17 +31,23 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/pump-controller-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/PumpManager.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/pump-controller-app/telink/include/AppConfig.h b/examples/pump-controller-app/telink/include/AppConfig.h
index 1650e13ca88d8c..2e7e3af60523d4 100644
--- a/examples/pump-controller-app/telink/include/AppConfig.h
+++ b/examples/pump-controller-app/telink/include/AppConfig.h
@@ -20,14 +20,8 @@
 
 // ---- Pump Controller Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
 
 // Time it takes in ms for the simulated pump to move from one state to another.
 #define PUMP_START_PERIOS_MS 2000
diff --git a/examples/pump-controller-app/telink/include/AppTask.h b/examples/pump-controller-app/telink/include/AppTask.h
index 5d4537b38f54a5..ce6dd797a16cde 100644
--- a/examples/pump-controller-app/telink/include/AppTask.h
+++ b/examples/pump-controller-app/telink/include/AppTask.h
@@ -21,6 +21,8 @@
 #include "AppTaskCommon.h"
 #include "PumpManager.h"
 
+class LedManager;
+
 class AppTask : public AppTaskCommon
 {
 public:
@@ -33,6 +35,7 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkLeds(LedManager & ledManager);
 
     static void ActionInitiated(PumpManager::Action_t action, int32_t actor);
     static void ActionCompleted(PumpManager::Action_t action, int32_t actor);
diff --git a/examples/pump-controller-app/telink/prj.conf b/examples/pump-controller-app/telink/prj.conf
index 3b647100515c62..d84eb8e40bc367 100755
--- a/examples/pump-controller-app/telink/prj.conf
+++ b/examples/pump-controller-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32785 == 0x8011 (example pump-controller-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32785
 
diff --git a/examples/pump-controller-app/telink/src/AppTask.cpp b/examples/pump-controller-app/telink/src/AppTask.cpp
index fa8ed8a11da842..681f0fa4fd799e 100644
--- a/examples/pump-controller-app/telink/src/AppTask.cpp
+++ b/examples/pump-controller-app/telink/src/AppTask.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "AppTask.h"
+#include "LEDManager.h"
 #include "PumpManager.h"
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
@@ -24,25 +25,16 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 namespace {
 constexpr EndpointId kPccClusterEndpoint   = 1;
 constexpr EndpointId kOnOffClusterEndpoint = 1;
-
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-LEDWidget sPumpStateLED;
-#endif
 } // namespace
 
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(StartActionEventHandler);
-#endif
     InitCommonParts();
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sPumpStateLED.Init(GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios));
-    sPumpStateLED.Set(!PumpMgr().IsStopped());
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, !PumpMgr().IsStopped());
 
     PumpMgr().Init();
     PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
@@ -83,9 +75,7 @@ void AppTask::ActionInitiated(PumpManager::Action_t action, int32_t actor)
         LOG_INF("Pump Stop Action has been initiated");
     }
 
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    sPumpStateLED.Blink(50, 50);
-#endif
+    LedManager::getInstance().setLed(LedManager::EAppLed_App0, 50, 50);
 }
 
 void AppTask::ActionCompleted(PumpManager::Action_t action, int32_t actor)
@@ -96,16 +86,12 @@ void AppTask::ActionCompleted(PumpManager::Action_t action, int32_t actor)
     if (action == PumpManager::START_ACTION)
     {
         LOG_INF("Pump Start Action has been completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sPumpStateLED.Set(true);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, true);
     }
     else if (action == PumpManager::STOP_ACTION)
     {
         LOG_INF("Pump Stop Action has been completed");
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-        sPumpStateLED.Set(false);
-#endif
+        LedManager::getInstance().setLed(LedManager::EAppLed_App0, false);
     }
 
     if (actor == static_cast<uint8_t>(AppEvent::kEventType_Button))
@@ -125,3 +111,13 @@ void AppTask::PostStartActionRequest(int32_t actor, PumpManager::Action_t action
 }
 
 void AppTask::UpdateClusterState() {}
+
+void AppTask::LinkLeds(LedManager & ledManager)
+{
+#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+    ledManager.linkLed(LedManager::EAppLed_Status, 0);
+    ledManager.linkLed(LedManager::EAppLed_App0, 1);
+#else
+    ledManager.linkLed(LedManager::EAppLed_App0, 0);
+#endif // CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
+}
diff --git a/examples/refrigerator-app/asr/src/AppTask.cpp b/examples/refrigerator-app/asr/src/AppTask.cpp
index 7e2481ebc05e3f..5ac229c9b99a29 100644
--- a/examples/refrigerator-app/asr/src/AppTask.cpp
+++ b/examples/refrigerator-app/asr/src/AppTask.cpp
@@ -23,6 +23,7 @@
 #include "qrcodegen.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
diff --git a/examples/refrigerator-app/asr/src/DeviceCallbacks.cpp b/examples/refrigerator-app/asr/src/DeviceCallbacks.cpp
index 23e6de9a118b03..9f9e7fd8d3e0e4 100644
--- a/examples/refrigerator-app/asr/src/DeviceCallbacks.cpp
+++ b/examples/refrigerator-app/asr/src/DeviceCallbacks.cpp
@@ -31,7 +31,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <lib/dnssd/Advertiser.h>
diff --git a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
index 3fdce87e109317..9698df8c094cc8 100644
--- a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
+++ b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 
 namespace chip {
diff --git a/examples/rvc-app/linux/RvcAppCommandDelegate.cpp b/examples/rvc-app/linux/RvcAppCommandDelegate.cpp
index 87eb1ee0f75e0b..58610e1b11d112 100644
--- a/examples/rvc-app/linux/RvcAppCommandDelegate.cpp
+++ b/examples/rvc-app/linux/RvcAppCommandDelegate.cpp
@@ -20,6 +20,7 @@
 #include <platform/PlatformManager.h>
 
 #include "rvc-device.h"
+#include <string>
 #include <utility>
 
 using namespace chip;
diff --git a/examples/rvc-app/linux/RvcAppCommandDelegate.h b/examples/rvc-app/linux/RvcAppCommandDelegate.h
index ad7c283bb85f59..366772bf0842ab 100644
--- a/examples/rvc-app/linux/RvcAppCommandDelegate.h
+++ b/examples/rvc-app/linux/RvcAppCommandDelegate.h
@@ -23,6 +23,8 @@
 #include <json/json.h>
 #include <platform/DiagnosticDataProvider.h>
 
+#include <string>
+
 class RvcAppCommandHandler
 {
 public:
diff --git a/examples/rvc-app/linux/main.cpp b/examples/rvc-app/linux/main.cpp
index 4a332123345397..7c5c555b5eb664 100644
--- a/examples/rvc-app/linux/main.cpp
+++ b/examples/rvc-app/linux/main.cpp
@@ -19,6 +19,8 @@
 #include "rvc-device.h"
 #include <AppMain.h>
 
+#include <string>
+
 #define RVC_ENDPOINT 1
 
 using namespace chip;
diff --git a/examples/rvc-app/rvc-common/include/rvc-device.h b/examples/rvc-app/rvc-common/include/rvc-device.h
index f2db0a75a5a23e..f6a33a6199dd23 100644
--- a/examples/rvc-app/rvc-common/include/rvc-device.h
+++ b/examples/rvc-app/rvc-common/include/rvc-device.h
@@ -5,6 +5,8 @@
 #include <app/clusters/mode-base-server/mode-base-server.h>
 #include <app/clusters/operational-state-server/operational-state-server.h>
 
+#include <string>
+
 namespace chip {
 namespace app {
 namespace Clusters {
diff --git a/examples/rvc-app/rvc-common/include/rvc-mode-delegates.h b/examples/rvc-app/rvc-common/include/rvc-mode-delegates.h
index af5e2c451abb83..d926693cf17980 100644
--- a/examples/rvc-app/rvc-common/include/rvc-mode-delegates.h
+++ b/examples/rvc-app/rvc-common/include/rvc-mode-delegates.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app/clusters/mode-base-server/mode-base-server.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <utility>
diff --git a/examples/rvc-app/rvc-common/src/rvc-device.cpp b/examples/rvc-app/rvc-common/src/rvc-device.cpp
index b4e79d673880be..63da53c0e0ee53 100644
--- a/examples/rvc-app/rvc-common/src/rvc-device.cpp
+++ b/examples/rvc-app/rvc-common/src/rvc-device.cpp
@@ -1,5 +1,7 @@
 #include "rvc-device.h"
 
+#include <string>
+
 using namespace chip::app::Clusters;
 
 void RvcDevice::Init()
diff --git a/examples/shell/cc13x2x7_26x2x7/.gn b/examples/shell/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index 540d01ce0b2bfd..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2022 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/BUILD.gn b/examples/shell/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 80e342313aaca6..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2022 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "include" ]
-
-  defines = []
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-
-    # disabled until upstream generation is aligned
-    #"tiop_config.h",
-    #"tiop_config.c",
-
-    # not traditional source files
-    #"ti_utils_build_linker.cmd.genlibs",
-    #"syscfg_c.rov.xs",
-    #"ti_utils_runtime_model.gv",
-    #"ti_utils_runtime_Makefile",
-    #"ti_ble_app_config.opt",
-    #"ti_build_config.opt",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("shell_app") {
-  output_name = "chip-${ti_simplelink_board}-shell-example.out"
-
-  sources = [
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "main/AppTask.cpp",
-    "main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/shell/shell_common:shell_common",
-    "${chip_root}/src/lib",
-    "${chip_root}/src/lib/shell:shell",
-    "${chip_root}/src/setup_payload",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "include",
-    "main",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":shell_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 69fdf781446afd..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Matter Shell Application
-
-A [chip-shell](../README.md) project on the Texas Instruments CC13XX_26XX family
-of Wireless MCUs.
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
-
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-For help with the shell itself, refer to the
-[shell example README](../README.md).
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/shell/cc13x2x7_26x2x7/args.gni b/examples/shell/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 7a2a55a580dd24..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2022 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-is_debug = false
-
-chip_enable_ota_requestor = false
-
-# Disable FTD Build for all-clusters app to save Flash
-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_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-chip_build_libshell = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/shell/cc13x2x7_26x2x7/build_overrides b/examples/shell/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/shell/cc13x2x7_26x2x7/chip.syscfg b/examples/shell/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index ed0e4a5c8d5fd6..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom  = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART_STREAMER";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/shell/cc13x2x7_26x2x7/include/AppTask.h b/examples/shell/cc13x2x7_26x2x7/include/AppTask.h
deleted file mode 100644
index e9426478b5af61..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/AppTask.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include <platform/CHIPDeviceLayer.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-class AppTask
-{
-public:
-    CHIP_ERROR StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    CHIP_ERROR Init();
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 0464c9d043027e..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (256)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 0
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
diff --git a/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h b/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h
deleted file mode 100644
index 2c37beedb2b2db..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 701e86fed40e05..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "AppTask.h"
-#include <app/server/Server.h>
-#include <lib/core/ErrorStr.h>
-
-#include "FreeRTOS.h"
-
-#include <app/server/OnboardingCodesUtil.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <lib/support/ThreadOperationalDataset.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <platform/internal/DeviceNetworkInfo.h>
-
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <lib/shell/Engine.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-
-using namespace ::chip;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-using chip::Shell::Engine;
-
-AppTask AppTask::sAppTask;
-
-static TaskHandle_t sAppTaskHandle;
-
-// Logging
-extern "C" {
-int cc13xx_26xxLogInit(void);
-}
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-CHIP_ERROR AppTask::StartAppTask()
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        while (true)
-            ;
-    }
-
-    return err;
-}
-
-CHIP_ERROR AppTask::Init()
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    Engine::Root().Init();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    return err;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    CHIP_ERROR err = sAppTask.Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    Engine::Root().RunMainLoop();
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/main/main.cpp b/examples/shell/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 884744230dfc56..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/ECJPAKE.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    CHIP_ERROR err;
-
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    ECJPAKE_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    err = GetAppTask().StartAppTask();
-    if (err != CHIP_NO_ERROR)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
index 0292ebb480f308..d3a6bc9374f83b 100644
--- a/examples/shell/cc13x4_26x4/README.md
+++ b/examples/shell/cc13x4_26x4/README.md
@@ -50,8 +50,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1"
     $ ninja -C out/debug
diff --git a/examples/shell/shell_common/cmd_server.cpp b/examples/shell/shell_common/cmd_server.cpp
index cb6b5e558627ce..6c79aae789b541 100644
--- a/examples/shell/shell_common/cmd_server.cpp
+++ b/examples/shell/shell_common/cmd_server.cpp
@@ -25,8 +25,8 @@
 #include <lib/support/CodeUtils.h>
 
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 
 #include <transport/Session.h>
diff --git a/examples/shell/telink/CMakeLists.txt b/examples/shell/telink/CMakeLists.txt
index c5cb3eb65be136..9743b1149a1fc1 100755
--- a/examples/shell/telink/CMakeLists.txt
+++ b/examples/shell/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,19 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 get_filename_component(APP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/.. REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE  prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-shell-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-shell-example)
 
 target_include_directories(app PRIVATE
                            include
diff --git a/examples/shell/telink/prj.conf b/examples/shell/telink/prj.conf
index ef57656abeeb61..7e1f64708f7ec9 100755
--- a/examples/shell/telink/prj.conf
+++ b/examples/shell/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32786 == 0x8012 (example shell-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32786
 
diff --git a/examples/smoke-co-alarm-app/silabs/README.md b/examples/smoke-co-alarm-app/silabs/README.md
index b5548b69f24f54..03ff976deca183 100644
--- a/examples/smoke-co-alarm-app/silabs/README.md
+++ b/examples/smoke-co-alarm-app/silabs/README.md
@@ -384,10 +384,10 @@ features can easily be toggled on or off. Here is a short list of options :
 
 ### Enabling test event trigger
 
-`silabs_test_event_trigger_enabled, silabs_test_event_trigger_enable_key`
+`sl_enable_test_event_trigger`
 
     ```
-    The value of silabs_test_event_trigger_enable_key is specific to each device manufacturer
+    The enable the test event trigger, `sl_enable_test_event_trigger` must be true.
 
-    $ ./scripts/examples/gn_silabs_example.sh ./examples/smoke-co-alarm-app/silabs ./out/smoke-co-alarm-app BRD4164A silabs_test_event_trigger_enabled=true silabs_test_event_trigger_enable_key=\"00112233445566778899aabbccddeeff\"
+    $ ./scripts/examples/gn_silabs_example.sh ./examples/smoke-co-alarm-app/silabs ./out/smoke-co-alarm-app BRD4164A sl_enable_test_event_trigger=true
     ```
diff --git a/examples/smoke-co-alarm-app/silabs/build_for_wifi_args.gni b/examples/smoke-co-alarm-app/silabs/build_for_wifi_args.gni
index 047de7f34492df..0619082413530d 100644
--- a/examples/smoke-co-alarm-app/silabs/build_for_wifi_args.gni
+++ b/examples/smoke-co-alarm-app/silabs/build_for_wifi_args.gni
@@ -21,3 +21,17 @@ import("${chip_root}/src/platform/silabs/wifi_args.gni")
 chip_enable_ota_requestor = true
 app_data_model =
     "${chip_root}/examples/smoke-co-alarm-app/smoke-co-alarm-common"
+
+sl_enable_test_event_trigger = true
+
+# ICD Default configurations
+chip_enable_icd_server = true
+chip_subscription_timeout_resumption = false
+sl_use_subscription_syncing = true
+icd_enforce_sit_slow_poll_limit = true
+chip_enable_icd_lit = true
+
+# ICD Matter Configuration flags
+sl_idle_mode_duration_s = 3600  # 60min Idle Mode Duration
+sl_active_mode_duration_ms = 0  # 0 Active Mode Duration
+sl_active_mode_threshold_ms = 30000  # 30s Active Mode Threshold
diff --git a/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h b/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h
index 423ca1ca7a364f..7b1ebe6e042849 100644
--- a/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h
+++ b/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h
@@ -21,14 +21,17 @@
 #include <stdint.h>
 
 #include "AppEvent.h"
-
+#include <app/TestEventTriggerDelegate.h>
 #include <app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h>
 #include <cmsis_os2.h>
 #include <lib/core/CHIPError.h>
 
-class SmokeCoAlarmManager
+class SmokeCoAlarmManager : public chip::TestEventTriggerHandler
 {
 public:
+    SmokeCoAlarmManager()  = default;
+    ~SmokeCoAlarmManager() = default;
+
     CHIP_ERROR Init();
 
     /**
@@ -37,6 +40,14 @@ class SmokeCoAlarmManager
      */
     void SelfTestingEventHandler();
 
+    /**
+     * @brief Delegates handling to global `emberAfHandleEventTrigger` function. DO NOT EXTEND.
+     *
+     * @param eventTrigger - trigger to process.
+     * @return CHIP_NO_ERROR if properly handled, else another CHIP_ERROR.
+     */
+    CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override;
+
 private:
     friend SmokeCoAlarmManager & AlarmMgr(void);
 
diff --git a/examples/smoke-co-alarm-app/silabs/openthread.gni b/examples/smoke-co-alarm-app/silabs/openthread.gni
index 650b338de86f93..845b2220b4570a 100644
--- a/examples/smoke-co-alarm-app/silabs/openthread.gni
+++ b/examples/smoke-co-alarm-app/silabs/openthread.gni
@@ -25,3 +25,22 @@ chip_enable_openthread = true
 
 openthread_external_platform =
     "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
+
+sl_enable_test_event_trigger = true
+
+# ICD Default configurations
+chip_enable_icd_server = true
+chip_subscription_timeout_resumption = false
+sl_use_subscription_syncing = true
+icd_enforce_sit_slow_poll_limit = true
+chip_icd_report_on_active_mode = true
+chip_enable_icd_lit = true
+
+# Openthread Configuration flags
+sl_ot_idle_interval_ms = 3600000  # 60mins Idle Polling Interval
+sl_ot_active_interval_ms = 1000  # 1000ms Active Polling Interval
+
+# ICD Matter Configuration flags
+sl_idle_mode_duration_s = 3600  # 60min Idle Mode Duration
+sl_active_mode_duration_ms = 0  # 0 Active Mode Duration
+sl_active_mode_threshold_ms = 5000  # 5s Active Mode Threshold
diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
index 9db4af7c127902..c9b4a3ab7281f1 100644
--- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
+++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
@@ -18,25 +18,19 @@
 #include "AppTask.h"
 #include "AppConfig.h"
 #include "AppEvent.h"
-
 #include "LEDWidget.h"
 
 #include <app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
-
 #include <assert.h>
-
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
-
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
-#include <lib/support/CodeUtils.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
 #if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(BRD4325B))
 #define LIGHT_LED 1
 #else
@@ -83,6 +77,9 @@ CHIP_ERROR AppTask::Init()
         appError(err);
     }
 
+    // Register Smoke & Co Test Event Trigger
+    Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&AlarmMgr());
+
     sAlarmLED.Init(LIGHT_LED);
     sAlarmLED.Set(false);
 
diff --git a/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp b/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
index 66eef8a6f188cf..45757c49b73304 100644
--- a/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
+++ b/examples/smoke-co-alarm-app/silabs/src/SmokeCoAlarmManager.cpp
@@ -117,7 +117,7 @@ void SmokeCoAlarmManager::EndSelfTestingEventHandler(AppEvent * aEvent)
     SILABS_LOG("End self-testing!");
 }
 
-bool emberAfHandleEventTrigger(uint64_t eventTrigger)
+CHIP_ERROR SmokeCoAlarmManager::HandleEventTrigger(uint64_t eventTrigger)
 {
     SmokeCOTrigger trigger = static_cast<SmokeCOTrigger>(eventTrigger);
 
@@ -125,32 +125,32 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
     {
     case SmokeCOTrigger::kForceSmokeCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kCritical), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kWarning), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke interconnect (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kWarning), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kCritical), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kWarning), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceCOInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kWarning), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSmokeContaminationHigh:
@@ -171,22 +171,22 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
         break;
     case SmokeCOTrigger::kForceMalfunction:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force malfunction");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, true), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, true), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceLowBatteryWarning:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (warning)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kWarning), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kWarning), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceLowBatteryCritical:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (critical)");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kCritical), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kCritical), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceEndOfLife:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force end-of-life");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kExpired), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kExpired), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kForceSilence:
@@ -195,32 +195,32 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
         break;
     case SmokeCOTrigger::kClearSmoke:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearCO:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearSmokeInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke interconnect");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearCOInterconnect:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO interconnect");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearMalfunction:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear malfunction");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, false), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, false), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearEndOfLife:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear end-of-life");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearSilence:
@@ -229,7 +229,7 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
         break;
     case SmokeCOTrigger::kClearBatteryLevelLow:
         ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear low battery");
-        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kNormal), true);
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kNormal), CHIP_NO_ERROR);
         SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
         break;
     case SmokeCOTrigger::kClearContamination:
@@ -242,8 +242,8 @@ bool emberAfHandleEventTrigger(uint64_t eventTrigger)
         break;
     default:
 
-        return false;
+        return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
-    return true;
+    return CHIP_NO_ERROR;
 }
diff --git a/examples/smoke-co-alarm-app/telink/CMakeLists.txt b/examples/smoke-co-alarm-app/telink/CMakeLists.txt
index 96cb66c2ac19e7..768123896dc3e2 100755
--- a/examples/smoke-co-alarm-app/telink/CMakeLists.txt
+++ b/examples/smoke-co-alarm-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,60 +13,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-smoke-co-alarm-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-smoke-co-alarm-example)
 
 target_include_directories(app PRIVATE
                            include
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/smoke-co-alarm-app
                            ${TELINK_COMMON}/common/include
-                           ${TELINK_COMMON}/util/include)
+                           ${TELINK_COMMON}/util/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -74,10 +40,15 @@ target_sources(app PRIVATE
                src/ZclCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/smoke-co-alarm-app/telink/include/AppConfig.h b/examples/smoke-co-alarm-app/telink/include/AppConfig.h
index f002310df57420..a67196caa83fcc 100644
--- a/examples/smoke-co-alarm-app/telink/include/AppConfig.h
+++ b/examples/smoke-co-alarm-app/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- Smoke Co Sendor App Example Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 1
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/smoke-co-alarm-app/telink/prj.conf b/examples/smoke-co-alarm-app/telink/prj.conf
index 3a6c279a6cb9dd..5fe349fa8b7080 100755
--- a/examples/smoke-co-alarm-app/telink/prj.conf
+++ b/examples/smoke-co-alarm-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32774 == 0x8006 (example smoke-co-alarm-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
 
diff --git a/examples/smoke-co-alarm-app/telink/src/AppTask.cpp b/examples/smoke-co-alarm-app/telink/src/AppTask.cpp
index 94be7e0cdf2bd7..9680cc1db68e6c 100644
--- a/examples/smoke-co-alarm-app/telink/src/AppTask.cpp
+++ b/examples/smoke-co-alarm-app/telink/src/AppTask.cpp
@@ -26,9 +26,7 @@ AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
-#if APP_USE_EXAMPLE_START_BUTTON
     SetExampleButtonCallbacks(SelfTestEventHandler);
-#endif
     InitCommonParts();
 
     CHIP_ERROR err = AlarmMgr().Init();
diff --git a/examples/temperature-measurement-app/asr/src/AppTask.cpp b/examples/temperature-measurement-app/asr/src/AppTask.cpp
index 4d0fd57f527bb6..e55657e45bf095 100755
--- a/examples/temperature-measurement-app/asr/src/AppTask.cpp
+++ b/examples/temperature-measurement-app/asr/src/AppTask.cpp
@@ -24,6 +24,7 @@
 #include "qrcodegen.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
diff --git a/examples/temperature-measurement-app/telink/CMakeLists.txt b/examples/temperature-measurement-app/telink/CMakeLists.txt
index fe847592ed985f..7089f7ca50fb0b 100644
--- a/examples/temperature-measurement-app/telink/CMakeLists.txt
+++ b/examples/temperature-measurement-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,68 +13,20 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(${TLNK_MARS_BOARD} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-  else()
-    unset(MARS_DTC_OVERLAY_FILE)
-  endif()
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-  else()
-    unset(MARS_CONF_OVERLAY_FILE)
-  endif()
-else()
-  unset(MARS_CONF_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-temperature-measurement-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+add_compile_definitions(IDENTIFY_CLUSTER_DISABLED=1)
+
+project(chip-telink-temperature-measurement-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -83,18 +35,22 @@ target_include_directories(app PRIVATE
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
                            ${TELINK_COMMON}/app/include
-                           )
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
-               ${TELINK_COMMON}/util/src/WS2812Device.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/temperature-measurement-app/telink/include/AppConfig.h b/examples/temperature-measurement-app/telink/include/AppConfig.h
index b0e7847e16fdcb..136c5e59390161 100644
--- a/examples/temperature-measurement-app/telink/include/AppConfig.h
+++ b/examples/temperature-measurement-app/telink/include/AppConfig.h
@@ -20,8 +20,5 @@
 
 // ---- Temperature measurement Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
diff --git a/examples/temperature-measurement-app/telink/prj.conf b/examples/temperature-measurement-app/telink/prj.conf
index 01222e4cb6ec07..99ad3993722621 100644
--- a/examples/temperature-measurement-app/telink/prj.conf
+++ b/examples/temperature-measurement-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32781 == 0x800D (example temperature-measurement-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32781
 
diff --git a/examples/thermostat/asr/src/AppTask.cpp b/examples/thermostat/asr/src/AppTask.cpp
index dbdf8a853b3d75..6117fbf972b52c 100755
--- a/examples/thermostat/asr/src/AppTask.cpp
+++ b/examples/thermostat/asr/src/AppTask.cpp
@@ -27,6 +27,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <assert.h>
 #include <platform/ASR/NetworkCommissioningDriver.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/thermostat/linux/main.cpp b/examples/thermostat/linux/main.cpp
index 77de93055e3aa0..b9f82696e8ce79 100644
--- a/examples/thermostat/linux/main.cpp
+++ b/examples/thermostat/linux/main.cpp
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/clusters/identify-server/identify-server.h>
-#include <app/util/af.h>
 
 using namespace chip;
 using namespace chip::app;
diff --git a/examples/thermostat/nxp/common/main/ZclCallbacks.cpp b/examples/thermostat/nxp/common/main/ZclCallbacks.cpp
index 86ea10f4687558..d4be6f1eb89a8c 100644
--- a/examples/thermostat/nxp/common/main/ZclCallbacks.cpp
+++ b/examples/thermostat/nxp/common/main/ZclCallbacks.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 
diff --git a/examples/thermostat/silabs/include/AppEvent.h b/examples/thermostat/silabs/include/AppEvent.h
index d8d7de44079886..03b5e70a101573 100644
--- a/examples/thermostat/silabs/include/AppEvent.h
+++ b/examples/thermostat/silabs/include/AppEvent.h
@@ -18,6 +18,7 @@
  */
 
 #pragma once
+#include <stdint.h>
 
 struct AppEvent;
 typedef void (*EventHandler)(AppEvent *);
diff --git a/examples/thermostat/silabs/include/TemperatureManager.h b/examples/thermostat/silabs/include/TemperatureManager.h
index 1005a6753fe450..ccdae44ee5548a 100644
--- a/examples/thermostat/silabs/include/TemperatureManager.h
+++ b/examples/thermostat/silabs/include/TemperatureManager.h
@@ -18,16 +18,11 @@
 
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
-
 #include "AppEvent.h"
-
-#include "FreeRTOS.h"
-#include "timers.h" // provides FreeRTOS timer support
 #include <app-common/zap-generated/attributes/Accessors.h>
-
 #include <lib/core/CHIPError.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 using namespace chip;
 
diff --git a/examples/thermostat/silabs/src/TemperatureManager.cpp b/examples/thermostat/silabs/src/TemperatureManager.cpp
index f858e438a7449f..d919d71ac12c7e 100644
--- a/examples/thermostat/silabs/src/TemperatureManager.cpp
+++ b/examples/thermostat/silabs/src/TemperatureManager.cpp
@@ -25,7 +25,6 @@
 #include "AppConfig.h"
 #include "AppEvent.h"
 #include "AppTask.h"
-#include "semphr.h"
 
 /**********************************************************
  * Defines and Constants
diff --git a/examples/thermostat/telink/CMakeLists.txt b/examples/thermostat/telink/CMakeLists.txt
index d46ba248bd77bc..74a2565ba4a60e 100755
--- a/examples/thermostat/telink/CMakeLists.txt
+++ b/examples/thermostat/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,68 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(${TLNK_MARS_BOARD} MATCHES y)
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-    set(MARS_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.overlay")
-  else()
-    unset(MARS_DTC_OVERLAY_FILE)
-  endif()
-  if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-    set(MARS_CONF_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}_mars.conf")
-  else()
-    unset(MARS_CONF_OVERLAY_FILE)
-  endif()
-else()
-  unset(MARS_CONF_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${MARS_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE ${MARS_CONF_OVERLAY_FILE} prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-thermostat-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-thermostat-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -82,7 +32,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/thermostat
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -91,11 +42,15 @@ target_sources(app PRIVATE
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/common/src/SensorManagerCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
-               ${TELINK_COMMON}/util/src/WS2812Device.cpp)
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
 
 chip_configure_data_model(app
     INCLUDE_SERVER
diff --git a/examples/thermostat/telink/include/AppConfig.h b/examples/thermostat/telink/include/AppConfig.h
index 9b427c5644145f..b0b6c3459d69b8 100644
--- a/examples/thermostat/telink/include/AppConfig.h
+++ b/examples/thermostat/telink/include/AppConfig.h
@@ -20,11 +20,5 @@
 
 // ---- Thermostat Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_BLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/thermostat/telink/prj.conf b/examples/thermostat/telink/prj.conf
index bc7cd3bd75cb38..e34255837d7b0d 100755
--- a/examples/thermostat/telink/prj.conf
+++ b/examples/thermostat/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022-2023 Project CHIP Authors
+#    Copyright (c) 2022-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32782 == 0x800E (example thermostat)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32782
 
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
index b3160b2ec2fd8b..12e6ba44dfb220 100644
--- a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
+++ b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
@@ -19,7 +19,7 @@
 #include "AccountLoginManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
-#include <app/util/af.h>
+#include <app/util/config.h>
 #include <json/json.h>
 #include <lib/core/DataModelTypes.h>
 
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
index 86eabb83f99066..671daab4b239c4 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -21,6 +21,9 @@
 #include <app/util/config.h>
 #include <json/json.h>
 
+#include <list>
+#include <string>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
index f9e05a1f17a68b..47e6c9f913d2dc 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
@@ -22,6 +22,9 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/clusters/content-launch-server/content-launch-server.h>
 
+#include <list>
+#include <string>
+
 using chip::CharSpan;
 using chip::EndpointId;
 using chip::app::AttributeValueEncoder;
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
index 087f1742c355a0..9f5c2e5d6691ce 100644
--- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
+++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -26,6 +26,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace std;
 using namespace chip;
 using namespace chip::app;
diff --git a/examples/tv-app/android/include/messages/MessagesManager.h b/examples/tv-app/android/include/messages/MessagesManager.h
index d6759061800621..fbc48bf379df38 100644
--- a/examples/tv-app/android/include/messages/MessagesManager.h
+++ b/examples/tv-app/android/include/messages/MessagesManager.h
@@ -18,7 +18,9 @@
 #pragma once
 
 #include <app/clusters/messages-server/messages-server.h>
+
 #include <list>
+#include <string>
 
 class MessagesManager : public chip::app::Clusters::Messages::Delegate
 {
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
index 23cf8058bab068..fe7884227880df 100644
--- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
+++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
@@ -17,8 +17,12 @@
 
 #include "TargetNavigatorManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/util/config.h>
 #include <json/json.h>
 
+#include <list>
+#include <string>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters::TargetNavigator;
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h
index 10db972704daa9..370f843a6af22a 100644
--- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h
+++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h
@@ -20,6 +20,9 @@
 #include "../../java/ContentAppAttributeDelegate.h"
 #include <app/clusters/target-navigator-server/target-navigator-server.h>
 
+#include <list>
+#include <string>
+
 using chip::CharSpan;
 using chip::EndpointId;
 using chip::app::AttributeValueEncoder;
diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
index 1dfae0f8afd3f2..f5dabe617054ee 100644
--- a/examples/tv-app/android/java/AppImpl.cpp
+++ b/examples/tv-app/android/java/AppImpl.cpp
@@ -30,7 +30,7 @@
 #include <app/reporting/reporting.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 #include <cstdio>
 #include <inttypes.h>
 #include <jni.h>
@@ -45,6 +45,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::AppPlatform;
diff --git a/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp b/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp
index 2b85aa15eda4ac..f15ef7bebae54c 100644
--- a/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp
+++ b/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp
@@ -25,6 +25,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 #include <app/app-platform/ContentAppPlatform.h>
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
index c7067132e46e9d..aa31043a3918d3 100644
--- a/examples/tv-app/android/java/ChannelManager.cpp
+++ b/examples/tv-app/android/java/ChannelManager.cpp
@@ -27,6 +27,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters::Channel;
diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
index 00b4ca7a225b2c..651ce4562c94ef 100644
--- a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
@@ -31,6 +31,8 @@
 #include <platform/PlatformManager.h>
 #include <zap-generated/endpoint_config.h>
 
+#include <string>
+
 namespace chip {
 namespace AppPlatform {
 
diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.h b/examples/tv-app/android/java/ContentAppAttributeDelegate.h
index 25d6367762c58f..8a39b004f4f821 100644
--- a/examples/tv-app/android/java/ContentAppAttributeDelegate.h
+++ b/examples/tv-app/android/java/ContentAppAttributeDelegate.h
@@ -28,6 +28,8 @@
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/JniReferences.h>
 
+#include <string>
+
 namespace chip {
 namespace AppPlatform {
 
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index 2e5dcbe0f3b5e1..a4a8d09396ae53 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -34,6 +34,8 @@
 #include <platform/PlatformManager.h>
 #include <zap-generated/endpoint_config.h>
 
+#include <string>
+
 namespace chip {
 namespace AppPlatform {
 
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.h b/examples/tv-app/android/java/ContentAppCommandDelegate.h
index 750aff6d34853c..f033b1afa79189 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.h
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.h
@@ -30,6 +30,8 @@
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/JniReferences.h>
 
+#include <string>
+
 namespace chip {
 namespace AppPlatform {
 
diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp
index f68e1131fa6fb8..449f6d136f9e42 100644
--- a/examples/tv-app/android/java/ContentLauncherManager.cpp
+++ b/examples/tv-app/android/java/ContentLauncherManager.cpp
@@ -20,12 +20,15 @@
 #include "TvApp-JNI.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app/util/config.h>
 #include <jni.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace std;
 using namespace chip;
 using namespace chip::app::DataModel;
diff --git a/examples/tv-app/android/java/DeviceCallbacks.cpp b/examples/tv-app/android/java/DeviceCallbacks.cpp
index a85402a10fef7e..51f57a58d6cc2d 100644
--- a/examples/tv-app/android/java/DeviceCallbacks.cpp
+++ b/examples/tv-app/android/java/DeviceCallbacks.cpp
@@ -26,7 +26,6 @@
 
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <app/util/basic-types.h>
 #include <app/util/util.h>
 #include <jni.h>
diff --git a/examples/tv-app/android/java/LevelManager.cpp b/examples/tv-app/android/java/LevelManager.cpp
index f9be7578e830ab..4fc392dca01314 100644
--- a/examples/tv-app/android/java/LevelManager.cpp
+++ b/examples/tv-app/android/java/LevelManager.cpp
@@ -18,7 +18,7 @@
 #include "TvApp-JNI.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
diff --git a/examples/tv-app/android/java/MediaInputManager.cpp b/examples/tv-app/android/java/MediaInputManager.cpp
index 0f1c922243c2be..0c5565cecc5cf7 100644
--- a/examples/tv-app/android/java/MediaInputManager.cpp
+++ b/examples/tv-app/android/java/MediaInputManager.cpp
@@ -23,6 +23,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app::Clusters::MediaInput;
 
diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp
index 99afaaa02c942b..90d2c76d34d6bc 100644
--- a/examples/tv-app/android/java/MediaPlaybackManager.cpp
+++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp
@@ -28,6 +28,8 @@
 
 #include "MediaPlaybackManager.h"
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::DataModel;
diff --git a/examples/tv-app/android/java/MessagesManager.cpp b/examples/tv-app/android/java/MessagesManager.cpp
index ad214e117d33d8..0be93b8c1d7761 100644
--- a/examples/tv-app/android/java/MessagesManager.cpp
+++ b/examples/tv-app/android/java/MessagesManager.cpp
@@ -27,6 +27,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters::Messages;
diff --git a/examples/tv-app/android/java/OnOffManager.cpp b/examples/tv-app/android/java/OnOffManager.cpp
index db694748e8a11b..203d08d7937b64 100644
--- a/examples/tv-app/android/java/OnOffManager.cpp
+++ b/examples/tv-app/android/java/OnOffManager.cpp
@@ -18,7 +18,7 @@
 #include "TvApp-JNI.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
diff --git a/examples/tv-app/linux/main.cpp b/examples/tv-app/linux/main.cpp
index 859b3f47284929..29fdd69cb36792 100644
--- a/examples/tv-app/linux/main.cpp
+++ b/examples/tv-app/linux/main.cpp
@@ -24,7 +24,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/app-platform/ContentAppPlatform.h>
-#include <app/util/af.h>
+#include <app/util/endpoint-config-api.h>
 
 #if defined(ENABLE_CHIP_SHELL)
 #include "AppTvShellCommands.h"
diff --git a/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp b/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp
index 0f3e5b5036e081..9264553c14d002 100644
--- a/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp
+++ b/examples/tv-app/tv-common/clusters/account-login/AccountLoginManager.cpp
@@ -19,7 +19,7 @@
 #include "AccountLoginManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
-#include <app/util/af.h>
+#include <app/util/config.h>
 
 using namespace std;
 using namespace chip::app::Clusters::AccountLogin;
diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
index 75bb07b5438dd1..23624f3c0ade66 100644
--- a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
+++ b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp
@@ -19,6 +19,7 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/util/config.h>
 
+#include <string>
 #include <vector>
 
 using namespace chip;
diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
index b062c64b95efd6..f0519619c2052a 100644
--- a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
+++ b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp
@@ -20,6 +20,9 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/util/config.h>
 
+#include <list>
+#include <string>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
index 2bc9e7006fc3ff..eb470068386e3e 100644
--- a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
+++ b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app/clusters/content-launch-server/content-launch-server.h>
+#include <string>
 #include <vector>
 
 using chip::CharSpan;
diff --git a/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.cpp b/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.cpp
index 26ec52d1cf3c8c..bd5582efcf0c27 100644
--- a/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.cpp
+++ b/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.cpp
@@ -17,6 +17,8 @@
 
 #include "MediaInputManager.h"
 
+#include <string>
+
 using namespace std;
 using namespace chip;
 using namespace chip::app::Clusters::MediaInput;
diff --git a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
index 456aba87b61b3a..0e79c6b2a3e9a3 100644
--- a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
+++ b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp
@@ -19,6 +19,8 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/util/config.h>
 
+#include <string>
+
 using namespace std;
 using namespace chip::app::DataModel;
 using namespace chip::app::Clusters::MediaPlayback;
diff --git a/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp b/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp
index 461e35524c0736..681cd56d6647fa 100644
--- a/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp
+++ b/examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp
@@ -18,6 +18,7 @@
 #include "MessagesManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <string>
 #include <vector>
 
 using namespace std;
diff --git a/examples/tv-app/tv-common/clusters/messages/MessagesManager.h b/examples/tv-app/tv-common/clusters/messages/MessagesManager.h
index 777f202e28548a..1662731cca4c7b 100644
--- a/examples/tv-app/tv-common/clusters/messages/MessagesManager.h
+++ b/examples/tv-app/tv-common/clusters/messages/MessagesManager.h
@@ -21,6 +21,7 @@
 
 #include <iostream>
 #include <list>
+#include <string>
 #include <vector>
 
 struct CachedMessageOption
diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
index 9b907339df02e4..dced0371fb9f39 100644
--- a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
+++ b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.cpp
@@ -17,6 +17,9 @@
 
 #include "TargetNavigatorManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/util/config.h>
+
+#include <string>
 
 using namespace std;
 using namespace chip::app;
diff --git a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h
index d600f045ff4a4b..5194302415f9e3 100644
--- a/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h
+++ b/examples/tv-app/tv-common/clusters/target-navigator/TargetNavigatorManager.h
@@ -19,6 +19,9 @@
 
 #include <app/clusters/target-navigator-server/target-navigator-server.h>
 
+#include <list>
+#include <string>
+
 using chip::CharSpan;
 using chip::app::AttributeValueEncoder;
 using chip::app::CommandResponseHelper;
diff --git a/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp b/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp
index 6b946766fae60a..ee85cf099ff380 100644
--- a/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp
+++ b/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp
@@ -33,6 +33,8 @@
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <string>
+
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 #include <app/app-platform/ContentAppPlatform.h>
 using namespace chip::AppPlatform;
diff --git a/examples/tv-app/tv-common/src/AppTv.cpp b/examples/tv-app/tv-common/src/AppTv.cpp
index ef2d52111588ed..2bed28e34d5fb8 100644
--- a/examples/tv-app/tv-common/src/AppTv.cpp
+++ b/examples/tv-app/tv-common/src/AppTv.cpp
@@ -30,7 +30,6 @@
 #include <app/CommandHandler.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <controller/CHIPCluster.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/DataModelTypes.h>
@@ -41,6 +40,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 
+#include <string>
+
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
 #include <controller/CHIPDeviceController.h>
 #include <controller/CommissionerDiscoveryController.h>
diff --git a/examples/tv-casting-app/APIs.md b/examples/tv-casting-app/APIs.md
index 5d80fca16fb0bb..12f5fdf30ebc1b 100644
--- a/examples/tv-casting-app/APIs.md
+++ b/examples/tv-casting-app/APIs.md
@@ -158,9 +158,9 @@ client's lifecycle:
     the Matter specification's "Onboarding Payload" section for more details on
     commissioning data.
 
-    On Linux, define a function `InitCommissionableDataProvider` to initialize
-    initialize a `LinuxCommissionableDataProvider` that can provide the required
-    values to the `CastingApp`.
+    On Linux, define a function `InitCommissionableDataProvider` to initialize a
+    `LinuxCommissionableDataProvider` that can provide the required values to
+    the `CastingApp`.
 
     ```c
     CHIP_ERROR InitCommissionableDataProvider(LinuxCommissionableDataProvider & provider, LinuxDeviceOptions & options) {
@@ -917,14 +917,14 @@ On iOS refer to the following platform specific files:
 
 1. For a list of clusters, commands and attributes supported by the Matter TV
    Casting library:
-   [/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h)
+   [darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h)
 2. For the IDs and request / response types to use with the commands:
-   [/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h)
+   [darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h)
    and
-   [/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h)
+   [darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h)
 3. For attribute [read operations](#read-operations) and
    [subscriptions](#subscriptions):
-   [/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h)
+   [darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h)
 
 ### Issuing Commands
 
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
index 2c3001cf5cabea..fd66ba44649cea 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
@@ -324,53 +324,50 @@ CHIP_ERROR convertJDiscoveredNodeDataToCppDiscoveredNodeData(jobject jDiscovered
     jstring jInstanceName         = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getInstanceNameField));
     if (jInstanceName != nullptr)
     {
-        chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.instanceName,
+        chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.instanceName,
                                    chip::Dnssd::Commission::kInstanceNameMaxLength + 1, env->GetStringUTFChars(jInstanceName, 0));
     }
 
     jfieldID jLongDiscriminatorField = env->GetFieldID(jDiscoveredNodeDataClass, "longDiscriminator", "J");
-    outCppDiscoveredNodeData.commissionData.vendorId =
+    outCppDiscoveredNodeData.nodeData.vendorId =
         static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jLongDiscriminatorField));
 
-    jfieldID jVendorIdField = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
-    outCppDiscoveredNodeData.commissionData.vendorId =
-        static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
+    jfieldID jVendorIdField                    = env->GetFieldID(jDiscoveredNodeDataClass, "vendorId", "J");
+    outCppDiscoveredNodeData.nodeData.vendorId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jVendorIdField));
 
-    jfieldID jProductIdField = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
-    outCppDiscoveredNodeData.commissionData.productId =
-        static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
+    jfieldID jProductIdField                    = env->GetFieldID(jDiscoveredNodeDataClass, "productId", "J");
+    outCppDiscoveredNodeData.nodeData.productId = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jProductIdField));
 
     jfieldID jCommissioningModeField = env->GetFieldID(jDiscoveredNodeDataClass, "commissioningMode", "B");
-    outCppDiscoveredNodeData.commissionData.commissioningMode =
+    outCppDiscoveredNodeData.nodeData.commissioningMode =
         static_cast<uint8_t>(env->GetByteField(jDiscoveredNodeData, jCommissioningModeField));
 
-    jfieldID jDeviceTypeField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
-    outCppDiscoveredNodeData.commissionData.deviceType =
-        static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
+    jfieldID jDeviceTypeField                    = env->GetFieldID(jDiscoveredNodeDataClass, "deviceType", "J");
+    outCppDiscoveredNodeData.nodeData.deviceType = static_cast<uint16_t>(env->GetLongField(jDiscoveredNodeData, jDeviceTypeField));
 
     jfieldID getDeviceNameField = env->GetFieldID(jDiscoveredNodeDataClass, "deviceName", "Ljava/lang/String;");
     jstring jDeviceName         = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getDeviceNameField));
     if (jDeviceName != nullptr)
     {
-        chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
+        chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
                                    env->GetStringUTFChars(jDeviceName, 0));
     }
 
     // TODO: map rotating ID
     jfieldID jRotatingIdLenField = env->GetFieldID(jDiscoveredNodeDataClass, "rotatingIdLen", "I");
-    outCppDiscoveredNodeData.commissionData.rotatingIdLen =
+    outCppDiscoveredNodeData.nodeData.rotatingIdLen =
         static_cast<size_t>(env->GetIntField(jDiscoveredNodeData, jRotatingIdLenField));
 
     jfieldID jPairingHintField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingHint", "S");
-    outCppDiscoveredNodeData.commissionData.pairingHint =
+    outCppDiscoveredNodeData.nodeData.pairingHint =
         static_cast<uint16_t>(env->GetShortField(jDiscoveredNodeData, jPairingHintField));
 
     jfieldID getPairingInstructionField = env->GetFieldID(jDiscoveredNodeDataClass, "pairingInstruction", "Ljava/lang/String;");
     jstring jPairingInstruction = static_cast<jstring>(env->GetObjectField(jDiscoveredNodeData, getPairingInstructionField));
     if (jPairingInstruction != nullptr)
     {
-        chip::Platform::CopyString(outCppDiscoveredNodeData.commissionData.pairingInstruction,
-                                   chip::Dnssd::kMaxPairingInstructionLen + 1, env->GetStringUTFChars(jPairingInstruction, 0));
+        chip::Platform::CopyString(outCppDiscoveredNodeData.nodeData.pairingInstruction, chip::Dnssd::kMaxPairingInstructionLen + 1,
+                                   env->GetStringUTFChars(jPairingInstruction, 0));
     }
 
     jfieldID jPortField                          = env->GetFieldID(jDiscoveredNodeDataClass, "port", "I");
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
index f39dc4b04f2d30..ca62ba5f37ee22 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
@@ -18,6 +18,8 @@
 
 #include "MatterCallbackHandler-JNI.h"
 
+#include <string>
+
 using namespace chip;
 
 CHIP_ERROR CallbackBaseJNI::SetUp(JNIEnv * env, jobject inHandler)
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
index a13f231b09b6c0..902e386ae551e1 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/ConversionUtils.mm
@@ -48,20 +48,20 @@ + (CHIP_ERROR)convertToCppDiscoveredNodeDataFrom:(DiscoveredNodeData * _Nonnull)
                            outDiscoveredNodeData:(chip::Dnssd::DiscoveredNodeData &)outDiscoveredNodeData
 {
     // setting CommissionNodeData
-    outDiscoveredNodeData.commissionData.deviceType = objCDiscoveredNodeData.deviceType;
-    outDiscoveredNodeData.commissionData.vendorId = objCDiscoveredNodeData.vendorId;
-    outDiscoveredNodeData.commissionData.productId = objCDiscoveredNodeData.productId;
-    outDiscoveredNodeData.commissionData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
-    outDiscoveredNodeData.commissionData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
-    outDiscoveredNodeData.commissionData.pairingHint = objCDiscoveredNodeData.pairingHint;
-    memset(outDiscoveredNodeData.commissionData.deviceName, '\0', sizeof(outDiscoveredNodeData.commissionData.deviceName));
+    outDiscoveredNodeData.nodeData.deviceType = objCDiscoveredNodeData.deviceType;
+    outDiscoveredNodeData.nodeData.vendorId = objCDiscoveredNodeData.vendorId;
+    outDiscoveredNodeData.nodeData.productId = objCDiscoveredNodeData.productId;
+    outDiscoveredNodeData.nodeData.longDiscriminator = objCDiscoveredNodeData.longDiscriminator;
+    outDiscoveredNodeData.nodeData.commissioningMode = objCDiscoveredNodeData.commissioningMode;
+    outDiscoveredNodeData.nodeData.pairingHint = objCDiscoveredNodeData.pairingHint;
+    memset(outDiscoveredNodeData.nodeData.deviceName, '\0', sizeof(outDiscoveredNodeData.nodeData.deviceName));
     if (objCDiscoveredNodeData.deviceName != nullptr) {
-        chip::Platform::CopyString(outDiscoveredNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
+        chip::Platform::CopyString(outDiscoveredNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
             [objCDiscoveredNodeData.deviceName UTF8String]);
     }
-    outDiscoveredNodeData.commissionData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
+    outDiscoveredNodeData.nodeData.rotatingIdLen = objCDiscoveredNodeData.rotatingIdLen;
     memcpy(
-        outDiscoveredNodeData.commissionData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
+        outDiscoveredNodeData.nodeData.rotatingId, objCDiscoveredNodeData.rotatingId, objCDiscoveredNodeData.rotatingIdLen);
 
     // setting CommonResolutionData
     outDiscoveredNodeData.resolutionData.port = objCDiscoveredNodeData.port;
@@ -121,17 +121,17 @@ + (DiscoveredNodeData *)convertToObjCDiscoveredNodeDataFrom:(const chip::Dnssd::
     DiscoveredNodeData * objCDiscoveredNodeData = [DiscoveredNodeData new];
 
     // from CommissionNodeData
-    objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->commissionData.deviceType;
-    objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->commissionData.vendorId;
-    objCDiscoveredNodeData.productId = cppDiscoveredNodedata->commissionData.productId;
-    objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->commissionData.longDiscriminator;
-    objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->commissionData.commissioningMode;
-    objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->commissionData.pairingHint;
-    objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.deviceName
+    objCDiscoveredNodeData.deviceType = cppDiscoveredNodedata->nodeData.deviceType;
+    objCDiscoveredNodeData.vendorId = cppDiscoveredNodedata->nodeData.vendorId;
+    objCDiscoveredNodeData.productId = cppDiscoveredNodedata->nodeData.productId;
+    objCDiscoveredNodeData.longDiscriminator = cppDiscoveredNodedata->nodeData.longDiscriminator;
+    objCDiscoveredNodeData.commissioningMode = cppDiscoveredNodedata->nodeData.commissioningMode;
+    objCDiscoveredNodeData.pairingHint = cppDiscoveredNodedata->nodeData.pairingHint;
+    objCDiscoveredNodeData.deviceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.deviceName
                                                            encoding:NSUTF8StringEncoding];
-    objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->commissionData.rotatingIdLen;
-    objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->commissionData.rotatingId;
-    objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->commissionData.instanceName
+    objCDiscoveredNodeData.rotatingIdLen = cppDiscoveredNodedata->nodeData.rotatingIdLen;
+    objCDiscoveredNodeData.rotatingId = cppDiscoveredNodedata->nodeData.rotatingId;
+    objCDiscoveredNodeData.instanceName = [NSString stringWithCString:cppDiscoveredNodedata->nodeData.instanceName
                                                              encoding:NSUTF8StringEncoding];
 
     // from CommonResolutionData
diff --git a/examples/tv-casting-app/linux/main.cpp b/examples/tv-casting-app/linux/main.cpp
index 45c53c842568f8..0dde8a2f0d03eb 100644
--- a/examples/tv-casting-app/linux/main.cpp
+++ b/examples/tv-casting-app/linux/main.cpp
@@ -106,6 +106,7 @@ CHIP_ERROR ProcessClusterCommand(int argc, char ** argv)
 
 int main(int argc, char * argv[])
 {
+    ChipLogProgress(AppServer, "chip_casting_simplified = 0"); // this file is built/run only if chip_casting_simplified = 0
     VerifyOrDie(CHIP_NO_ERROR == chip::Platform::MemoryInit());
     VerifyOrDie(CHIP_NO_ERROR == chip::DeviceLayer::PlatformMgr().InitChipStack());
 
diff --git a/examples/tv-casting-app/linux/simple-app.cpp b/examples/tv-casting-app/linux/simple-app.cpp
index 26d35b443c0e67..01e33469e9b73f 100644
--- a/examples/tv-casting-app/linux/simple-app.cpp
+++ b/examples/tv-casting-app/linux/simple-app.cpp
@@ -130,6 +130,7 @@ class CommonCaseDeviceServerInitParamsProvider : public ServerInitParamsProvider
 
 int main(int argc, char * argv[])
 {
+    ChipLogProgress(AppServer, "chip_casting_simplified = 1"); // this file is built/run only if chip_casting_simplified = 1
     // Create AppParameters that need to be passed to CastingApp.Initialize()
     AppParameters appParameters;
     RotatingDeviceIdUniqueIdProvider rotatingDeviceIdUniqueIdProvider;
diff --git a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
index e86942e39ac2b0..878ed250745e38 100644
--- a/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
+++ b/examples/tv-casting-app/tv-casting-common/commands/common/CHIPCommand.cpp
@@ -24,6 +24,8 @@
 #include <lib/support/ScopedBuffer.h>
 #include <lib/support/TestGroupData.h>
 
+#include <string>
+
 #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
 #include "TraceHandlers.h"
 #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
diff --git a/examples/tv-casting-app/tv-casting-common/core/Attribute.h b/examples/tv-casting-app/tv-casting-common/core/Attribute.h
index 958c7ab24bce9b..6e717d33e2d2d0 100644
--- a/examples/tv-casting-app/tv-casting-common/core/Attribute.h
+++ b/examples/tv-casting-app/tv-casting-common/core/Attribute.h
@@ -97,16 +97,19 @@ class Attribute
                                 static_cast<ReadAttributeContext<TypeInfo> *>(__context);
                             ChipLogProgress(AppServer, "<Attribute>::Read() success");
                             Attribute<TypeInfo> * __attr = static_cast<Attribute<TypeInfo> *>(__attributeContext->mAttribute);
-                            __attr->value                = response;
                             if (__attr->hasValue)
                             {
-                                __attributeContext->mSuccessCb(__attributeContext->mClientContext,
-                                                               chip::MakeOptional(__attr->value), response);
+                                typename TypeInfo::DecodableType prevValue = __attr->value;
+                                __attr->value                              = response;
+                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::MakeOptional(prevValue),
+                                                               __attr->value);
                             }
                             else
                             {
                                 __attr->hasValue = true;
-                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::NullOptional, response);
+                                __attr->value    = response;
+                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::NullOptional,
+                                                               __attr->value);
                             }
                             delete __attributeContext;
                         },
@@ -269,17 +272,19 @@ class Attribute
                                 static_cast<SubscribeAttributeContext<TypeInfo> *>(__context);
                             ChipLogProgress(AppServer, "<Attribute>::Subscribe() success");
                             Attribute<TypeInfo> * __attr = static_cast<Attribute<TypeInfo> *>(__attributeContext->mAttribute);
-                            __attr->value                = response;
-                            // TODO: Save old value and then overwrite
                             if (__attr->hasValue)
                             {
-                                __attributeContext->mSuccessCb(__attributeContext->mClientContext,
-                                                               chip::MakeOptional(__attr->value), response);
+                                typename TypeInfo::DecodableType prevValue = __attr->value;
+                                __attr->value                              = response;
+                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::MakeOptional(prevValue),
+                                                               __attr->value);
                             }
                             else
                             {
                                 __attr->hasValue = true;
-                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::NullOptional, response);
+                                __attr->value    = response;
+                                __attributeContext->mSuccessCb(__attributeContext->mClientContext, chip::NullOptional,
+                                                               __attr->value);
                             }
                             delete __attributeContext;
                         },
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
index 402febdb9f6b97..9b26a868efd8c1 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
@@ -83,10 +83,10 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
     CastingPlayerAttributes attributes;
     snprintf(attributes.id, kIdMaxLength + 1, "%s%u", nodeData.resolutionData.hostName, nodeData.resolutionData.port);
 
-    chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.commissionData.deviceName);
+    chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.nodeData.deviceName);
     chip::Platform::CopyString(attributes.hostName, chip::Dnssd::kHostNameMaxLength + 1, nodeData.resolutionData.hostName);
     chip::Platform::CopyString(attributes.instanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
-                               nodeData.commissionData.instanceName);
+                               nodeData.nodeData.instanceName);
 
     attributes.numIPs = (unsigned int) nodeData.resolutionData.numIPs;
     for (unsigned j = 0; j < attributes.numIPs; j++)
@@ -95,9 +95,9 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
     }
     attributes.interfaceId = nodeData.resolutionData.interfaceId;
     attributes.port        = nodeData.resolutionData.port;
-    attributes.productId   = nodeData.commissionData.productId;
-    attributes.vendorId    = nodeData.commissionData.vendorId;
-    attributes.deviceType  = nodeData.commissionData.deviceType;
+    attributes.productId   = nodeData.nodeData.productId;
+    attributes.vendorId    = nodeData.nodeData.vendorId;
+    attributes.deviceType  = nodeData.nodeData.deviceType;
 
     memory::Strong<CastingPlayer> player = std::make_shared<CastingPlayer>(attributes);
 
diff --git a/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h b/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h
index 6a9549e4d1fd9d..74926b00489703 100644
--- a/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h
+++ b/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h
@@ -58,6 +58,13 @@
 #define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_SUBJECTS_PER_ENTRY 20
 #define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 20
 
+/**
+ * For casting, we need to allow for more binding table entries because the Casting App can connect to many Matter Casting Players,
+ * each with many Content Apps. Each Casting Player will set 1 binding per endpoint on it. A Casting Player will have 1 endpoint for
+ * every Matter Content App installed on it + 1 endpoint representing the Casting Player + 1 endpoint representing a speaker.
+ */
+#define MATTER_BINDING_TABLE_SIZE 64
+
 // Enable some test-only interaction model APIs.
 #define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
 
diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
index 4cb72732292a2e..b98647db802050 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -226,20 +226,20 @@ CHIP_ERROR CastingServer::SendUserDirectedCommissioningRequest(Dnssd::Discovered
         getIpAddressForUDCRequest(selectedCommissioner->resolutionData.ipAddress, selectedCommissioner->resolutionData.numIPs);
     ReturnErrorOnFailure(SendUserDirectedCommissioningRequest(chip::Transport::PeerAddress::UDP(
         *ipAddressToUse, selectedCommissioner->resolutionData.port, selectedCommissioner->resolutionData.interfaceId)));
-    mTargetVideoPlayerVendorId   = selectedCommissioner->commissionData.vendorId;
-    mTargetVideoPlayerProductId  = selectedCommissioner->commissionData.productId;
-    mTargetVideoPlayerDeviceType = selectedCommissioner->commissionData.deviceType;
+    mTargetVideoPlayerVendorId   = selectedCommissioner->nodeData.vendorId;
+    mTargetVideoPlayerProductId  = selectedCommissioner->nodeData.productId;
+    mTargetVideoPlayerDeviceType = selectedCommissioner->nodeData.deviceType;
     mTargetVideoPlayerNumIPs     = selectedCommissioner->resolutionData.numIPs;
     for (size_t i = 0; i < mTargetVideoPlayerNumIPs && i < chip::Dnssd::CommonResolutionData::kMaxIPAddresses; i++)
     {
         mTargetVideoPlayerIpAddress[i] = selectedCommissioner->resolutionData.ipAddress[i];
     }
     chip::Platform::CopyString(mTargetVideoPlayerDeviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
-                               selectedCommissioner->commissionData.deviceName);
+                               selectedCommissioner->nodeData.deviceName);
     chip::Platform::CopyString(mTargetVideoPlayerHostName, chip::Dnssd::kHostNameMaxLength + 1,
                                selectedCommissioner->resolutionData.hostName);
     chip::Platform::CopyString(mTargetVideoPlayerInstanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
-                               selectedCommissioner->commissionData.instanceName);
+                               selectedCommissioner->nodeData.instanceName);
     mTargetVideoPlayerPort = selectedCommissioner->resolutionData.port;
     return CHIP_NO_ERROR;
 }
diff --git a/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp b/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
index 322e9d46bec8c4..a57e2548009ada 100644
--- a/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/ConversionUtils.cpp
@@ -23,10 +23,10 @@ CHIP_ERROR ConvertToDiscoveredNodeData(TargetVideoPlayerInfo * inPlayer, chip::D
     if (inPlayer == nullptr)
         return CHIP_ERROR_INVALID_ARGUMENT;
 
-    outNodeData.commissionData.vendorId   = inPlayer->GetVendorId();
-    outNodeData.commissionData.productId  = static_cast<uint16_t>(inPlayer->GetProductId());
-    outNodeData.commissionData.deviceType = inPlayer->GetDeviceType();
-    outNodeData.resolutionData.numIPs     = inPlayer->GetNumIPs();
+    outNodeData.nodeData.vendorId     = inPlayer->GetVendorId();
+    outNodeData.nodeData.productId    = static_cast<uint16_t>(inPlayer->GetProductId());
+    outNodeData.nodeData.deviceType   = inPlayer->GetDeviceType();
+    outNodeData.resolutionData.numIPs = inPlayer->GetNumIPs();
 
     const chip::Inet::IPAddress * ipAddresses = inPlayer->GetIpAddresses();
     if (ipAddresses != nullptr)
@@ -37,8 +37,7 @@ CHIP_ERROR ConvertToDiscoveredNodeData(TargetVideoPlayerInfo * inPlayer, chip::D
         }
     }
 
-    chip::Platform::CopyString(outNodeData.commissionData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1,
-                               inPlayer->GetDeviceName());
+    chip::Platform::CopyString(outNodeData.nodeData.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, inPlayer->GetDeviceName());
     chip::Platform::CopyString(outNodeData.resolutionData.hostName, chip::Dnssd::kHostNameMaxLength + 1, inPlayer->GetHostName());
 
     return CHIP_NO_ERROR;
diff --git a/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp b/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
index 7d9c7d51168eaf..c182856039975a 100644
--- a/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp
@@ -232,6 +232,6 @@ bool TargetVideoPlayerInfo::IsSameAs(const chip::Dnssd::DiscoveredNodeData * dis
         return false;
     }
 
-    return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->commissionData.deviceName,
+    return IsSameAs(discoveredNodeData->resolutionData.hostName, discoveredNodeData->nodeData.deviceName,
                     discoveredNodeData->resolutionData.numIPs, discoveredNodeData->resolutionData.ipAddress);
 }
diff --git a/examples/virtual-device-app/android/App/app/build.gradle.kts b/examples/virtual-device-app/android/App/app/build.gradle.kts
index e5998ddc554d6d..c9b40ccd5abc1d 100644
--- a/examples/virtual-device-app/android/App/app/build.gradle.kts
+++ b/examples/virtual-device-app/android/App/app/build.gradle.kts
@@ -76,7 +76,8 @@ dependencies {
     implementation(project(":core:data"))
     implementation(project(":core:domain"))
     implementation(project(":core:model"))
-    implementation(project(":core:ui"))    
+    implementation(project(":core:ui"))
+    implementation(project(":feature:closure"))
     implementation(project(":feature:control"))
     implementation(project(":feature:main"))
     implementation(project(":feature:qrcode"))
diff --git a/examples/virtual-device-app/android/App/app/src/main/res/navigation/nav_graph.xml b/examples/virtual-device-app/android/App/app/src/main/res/navigation/nav_graph.xml
index a5e06ead94b64c..87d075c431ea82 100644
--- a/examples/virtual-device-app/android/App/app/src/main/res/navigation/nav_graph.xml
+++ b/examples/virtual-device-app/android/App/app/src/main/res/navigation/nav_graph.xml
@@ -7,5 +7,6 @@
     <include app:graph="@navigation/main_nav_graph" />
     <include app:graph="@navigation/setup_nav_graph" />
     <include app:graph="@navigation/qrcode_nav_graph" />
+    <include app:graph="@navigation/closure_nav_graph" />
     <include app:graph="@navigation/control_nav_graph" />
 </navigation>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/DeepLink.kt b/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/DeepLink.kt
index 2e24a9246888b5..8adad6a4495d4d 100644
--- a/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/DeepLink.kt
+++ b/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/DeepLink.kt
@@ -35,6 +35,9 @@ object DeepLink {
         Device.OnOffSwitch ->
           "android-app://com.matter.virtual.device.app.feature.control/onOffSwitchFragment/${setting}"
             .toUri()
+        Device.DoorLock ->
+          "android-app://com.matter.virtual.device.app.feature.closure/doorLockFragment/${setting}"
+            .toUri()
         Device.Unknown -> throw UnsupportedOperationException("Unsupported device")
       }
 
diff --git a/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/Device.kt b/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/Device.kt
index 067898bbd79d93..05b114f3385b70 100644
--- a/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/Device.kt
+++ b/examples/virtual-device-app/android/App/core/common/src/main/java/com/matter/virtual/device/app/core/common/Device.kt
@@ -22,6 +22,10 @@ sealed class Device(
       3841
     )
 
+  @Serializable
+  object DoorLock :
+    Device("doorlock", R.string.matter_door_lock, R.drawable.round_lock_24, 0x000A, 3842)
+
   @Serializable
   object Unknown :
     Device("unknown", R.string.matter_device, R.drawable.round_device_unknown_24, 65535, 3840)
diff --git a/examples/virtual-device-app/android/App/core/common/src/main/res/drawable/round_lock_24.xml b/examples/virtual-device-app/android/App/core/common/src/main/res/drawable/round_lock_24.xml
new file mode 100644
index 00000000000000..74cd8a77ffc307
--- /dev/null
+++ b/examples/virtual-device-app/android/App/core/common/src/main/res/drawable/round_lock_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM9,8L9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8z"/>
+</vector>
diff --git a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MainFragment.kt b/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MainFragment.kt
index 0365727b110d25..623c0bbb978a7d 100644
--- a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MainFragment.kt
+++ b/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MainFragment.kt
@@ -15,10 +15,10 @@ import androidx.navigation.NavOptions
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.matter.virtual.device.app.core.common.DeepLink
+import com.matter.virtual.device.app.core.common.Device
 import com.matter.virtual.device.app.core.common.MatterSettings
 import com.matter.virtual.device.app.core.ui.SharedViewModel
 import com.matter.virtual.device.app.feature.main.databinding.FragmentMainBinding
-import com.matter.virtual.device.app.feature.main.model.Menu
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
@@ -84,15 +84,15 @@ class MainFragment : Fragment() {
           )
         }
         MainUiState.Start -> {
-          val itemList = arrayListOf(Menu.ON_OFF_SWITCH)
+          val itemList = arrayListOf(Device.OnOffSwitch, Device.DoorLock)
 
           val menuAdapter =
             MenuAdapter(
                 object : MenuAdapter.ItemHandler {
-                  override fun onClick(item: Menu) {
+                  override fun onClick(item: Device) {
                     viewModel.consumeUiState()
 
-                    val matterSettings = MatterSettings(device = item.device)
+                    val matterSettings = MatterSettings(device = item)
                     val jsonSettings = Json.encodeToString(matterSettings)
                     try {
                       findNavController()
diff --git a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MenuAdapter.kt b/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MenuAdapter.kt
index c3212333d7ec13..8df42477871afc 100644
--- a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MenuAdapter.kt
+++ b/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/MenuAdapter.kt
@@ -5,17 +5,17 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.matter.virtual.device.app.core.common.Device
 import com.matter.virtual.device.app.feature.main.databinding.ItemMenuBinding
-import com.matter.virtual.device.app.feature.main.model.Menu
 
 internal class MenuAdapter(private val itemHandler: ItemHandler) :
-  ListAdapter<Menu, MenuAdapter.MenuViewHolder>(
-    object : DiffUtil.ItemCallback<Menu>() {
-      override fun areItemsTheSame(oldItem: Menu, newItem: Menu): Boolean {
-        return oldItem.titleResId == newItem.titleResId
+  ListAdapter<Device, MenuAdapter.MenuViewHolder>(
+    object : DiffUtil.ItemCallback<Device>() {
+      override fun areItemsTheSame(oldItem: Device, newItem: Device): Boolean {
+        return oldItem.deviceNameResId == newItem.deviceNameResId
       }
 
-      override fun areContentsTheSame(oldItem: Menu, newItem: Menu): Boolean {
+      override fun areContentsTheSame(oldItem: Device, newItem: Device): Boolean {
         return oldItem == newItem
       }
     }
@@ -23,7 +23,7 @@ internal class MenuAdapter(private val itemHandler: ItemHandler) :
 
   inner class MenuViewHolder(private val binding: ItemMenuBinding) :
     RecyclerView.ViewHolder(binding.root) {
-    fun bind(item: Menu) {
+    fun bind(item: Device) {
       binding.item = item
       binding.itemHandler = itemHandler
     }
@@ -41,6 +41,6 @@ internal class MenuAdapter(private val itemHandler: ItemHandler) :
   }
 
   interface ItemHandler {
-    fun onClick(item: Menu)
+    fun onClick(item: Device)
   }
 }
diff --git a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/model/Menu.kt b/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/model/Menu.kt
deleted file mode 100644
index 67e2658c5bed44..00000000000000
--- a/examples/virtual-device-app/android/App/feature/main/src/main/java/com/matter/virtual/device/app/feature/main/model/Menu.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.matter.virtual.device.app.feature.main.model
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import com.matter.virtual.device.app.core.common.Device
-import com.matter.virtual.device.app.feature.main.R
-
-enum class Menu(
-  @DrawableRes val iconResId: Int,
-  @StringRes val titleResId: Int,
-  val isDim: Boolean = false,
-  val device: Device = Device.Unknown
-) {
-  ON_OFF_SWITCH(
-    R.drawable.round_toggle_on_24,
-    R.string.matter_on_off_switch,
-    device = Device.OnOffSwitch
-  )
-}
diff --git a/examples/virtual-device-app/android/App/feature/main/src/main/res/layout/item_menu.xml b/examples/virtual-device-app/android/App/feature/main/src/main/res/layout/item_menu.xml
index b9b12400969d84..23239f41667e6e 100644
--- a/examples/virtual-device-app/android/App/feature/main/src/main/res/layout/item_menu.xml
+++ b/examples/virtual-device-app/android/App/feature/main/src/main/res/layout/item_menu.xml
@@ -10,15 +10,14 @@
 
         <variable
             name="item"
-            type="com.matter.virtual.device.app.feature.main.model.Menu" />
+            type="com.matter.virtual.device.app.core.common.Device" />
     </data>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:alpha="@{item.isDim == true ? 0.4f : 1f}"
         android:background="@drawable/menu_item_bg"
-        android:clickable="@{item.isDim == true ? false : true}"
+        android:clickable="true"
         android:focusable="true"
         android:onClick="@{() -> itemHandler.onClick(item)}">
 
@@ -35,10 +34,10 @@
                 android:layout_marginTop="@dimen/menu_item_image_margin_top"
                 android:layout_marginBottom="@dimen/menu_item_image_margin_bottom"
                 android:tint="@color/device_image_tint"
+                app:imageSrc="@{item.deviceIconResId}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:imageSrc="@{item.iconResId}" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/menu_item_title"
@@ -49,7 +48,7 @@
                 android:layout_marginEnd="@dimen/menu_item_text_margin_end"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="@{item.titleResId}"
+                android:text="@{item.deviceNameResId}"
                 android:textAlignment="viewStart"
                 android:textSize="@dimen/menu_item_title_size"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -58,4 +57,3 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 </layout>
-
diff --git a/examples/virtual-device-app/android/java/ColorControlManager.cpp b/examples/virtual-device-app/android/java/ColorControlManager.cpp
index 1a4dfbe26c09f6..ed9ba0774d7a13 100644
--- a/examples/virtual-device-app/android/java/ColorControlManager.cpp
+++ b/examples/virtual-device-app/android/java/ColorControlManager.cpp
@@ -18,7 +18,8 @@
 #include "DeviceApp-JNI.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
diff --git a/examples/virtual-device-app/android/java/DoorLockManager.cpp b/examples/virtual-device-app/android/java/DoorLockManager.cpp
index b3e245ea75dac2..712156c19d67cc 100644
--- a/examples/virtual-device-app/android/java/DoorLockManager.cpp
+++ b/examples/virtual-device-app/android/java/DoorLockManager.cpp
@@ -21,7 +21,7 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
+#include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
diff --git a/examples/virtual-device-app/android/java/OnOffManager.cpp b/examples/virtual-device-app/android/java/OnOffManager.cpp
index c058e99a91c111..65b3d6f3bef5a9 100644
--- a/examples/virtual-device-app/android/java/OnOffManager.cpp
+++ b/examples/virtual-device-app/android/java/OnOffManager.cpp
@@ -18,7 +18,7 @@
 #include "DeviceApp-JNI.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
diff --git a/examples/virtual-device-app/android/java/PowerSourceManager.cpp b/examples/virtual-device-app/android/java/PowerSourceManager.cpp
index e71a5bb1eec692..3a8d78e9b43476 100644
--- a/examples/virtual-device-app/android/java/PowerSourceManager.cpp
+++ b/examples/virtual-device-app/android/java/PowerSourceManager.cpp
@@ -22,7 +22,7 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
+#include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
index a190ff6d15e4ab..12ca71b573185f 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -2688,6 +2688,159 @@ cluster DoorLock = 257 {
   timed command access(invoke: administer) ClearAliroReaderConfig(): DefaultSuccess = 41;
 }
 
+/** Provides an interface for controlling and adjusting automatic window coverings. */
+cluster WindowCovering = 258 {
+  revision 5;
+
+  enum EndProductType : enum8 {
+    kRollerShade = 0;
+    kRomanShade = 1;
+    kBalloonShade = 2;
+    kWovenWood = 3;
+    kPleatedShade = 4;
+    kCellularShade = 5;
+    kLayeredShade = 6;
+    kLayeredShade2D = 7;
+    kSheerShade = 8;
+    kTiltOnlyInteriorBlind = 9;
+    kInteriorBlind = 10;
+    kVerticalBlindStripCurtain = 11;
+    kInteriorVenetianBlind = 12;
+    kExteriorVenetianBlind = 13;
+    kLateralLeftCurtain = 14;
+    kLateralRightCurtain = 15;
+    kCentralCurtain = 16;
+    kRollerShutter = 17;
+    kExteriorVerticalScreen = 18;
+    kAwningTerracePatio = 19;
+    kAwningVerticalScreen = 20;
+    kTiltOnlyPergola = 21;
+    kSwingingShutter = 22;
+    kSlidingShutter = 23;
+    kUnknown = 255;
+  }
+
+  enum Type : enum8 {
+    kRollerShade = 0;
+    kRollerShade2Motor = 1;
+    kRollerShadeExterior = 2;
+    kRollerShadeExterior2Motor = 3;
+    kDrapery = 4;
+    kAwning = 5;
+    kShutter = 6;
+    kTiltBlindTiltOnly = 7;
+    kTiltBlindLiftAndTilt = 8;
+    kProjectorScreen = 9;
+    kUnknown = 255;
+  }
+
+  bitmap ConfigStatus : bitmap8 {
+    kOperational = 0x1;
+    kOnlineReserved = 0x2;
+    kLiftMovementReversed = 0x4;
+    kLiftPositionAware = 0x8;
+    kTiltPositionAware = 0x10;
+    kLiftEncoderControlled = 0x20;
+    kTiltEncoderControlled = 0x40;
+  }
+
+  bitmap Feature : bitmap32 {
+    kLift = 0x1;
+    kTilt = 0x2;
+    kPositionAwareLift = 0x4;
+    kAbsolutePosition = 0x8;
+    kPositionAwareTilt = 0x10;
+  }
+
+  bitmap Mode : bitmap8 {
+    kMotorDirectionReversed = 0x1;
+    kCalibrationMode = 0x2;
+    kMaintenanceMode = 0x4;
+    kLedFeedback = 0x8;
+  }
+
+  bitmap OperationalStatus : bitmap8 {
+    kGlobal = 0x3;
+    kLift = 0xC;
+    kTilt = 0x30;
+  }
+
+  bitmap SafetyStatus : bitmap16 {
+    kRemoteLockout = 0x1;
+    kTamperDetection = 0x2;
+    kFailedCommunication = 0x4;
+    kPositionFailure = 0x8;
+    kThermalProtection = 0x10;
+    kObstacleDetected = 0x20;
+    kPower = 0x40;
+    kStopInput = 0x80;
+    kMotorJammed = 0x100;
+    kHardwareFailure = 0x200;
+    kManualOperation = 0x400;
+    kProtection = 0x800;
+  }
+
+  readonly attribute Type type = 0;
+  readonly attribute optional int16u physicalClosedLimitLift = 1;
+  readonly attribute optional int16u physicalClosedLimitTilt = 2;
+  readonly attribute optional nullable int16u currentPositionLift = 3;
+  readonly attribute optional nullable int16u currentPositionTilt = 4;
+  readonly attribute optional int16u numberOfActuationsLift = 5;
+  readonly attribute optional int16u numberOfActuationsTilt = 6;
+  readonly attribute ConfigStatus configStatus = 7;
+  readonly attribute optional nullable percent currentPositionLiftPercentage = 8;
+  readonly attribute optional nullable percent currentPositionTiltPercentage = 9;
+  readonly attribute OperationalStatus operationalStatus = 10;
+  readonly attribute optional nullable percent100ths targetPositionLiftPercent100ths = 11;
+  readonly attribute optional nullable percent100ths targetPositionTiltPercent100ths = 12;
+  readonly attribute EndProductType endProductType = 13;
+  readonly attribute optional nullable percent100ths currentPositionLiftPercent100ths = 14;
+  readonly attribute optional nullable percent100ths currentPositionTiltPercent100ths = 15;
+  readonly attribute optional int16u installedOpenLimitLift = 16;
+  readonly attribute optional int16u installedClosedLimitLift = 17;
+  readonly attribute optional int16u installedOpenLimitTilt = 18;
+  readonly attribute optional int16u installedClosedLimitTilt = 19;
+  attribute access(write: manage) Mode mode = 23;
+  readonly attribute optional SafetyStatus safetyStatus = 26;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct GoToLiftValueRequest {
+    int16u liftValue = 0;
+  }
+
+  request struct GoToLiftPercentageRequest {
+    percent100ths liftPercent100thsValue = 0;
+  }
+
+  request struct GoToTiltValueRequest {
+    int16u tiltValue = 0;
+  }
+
+  request struct GoToTiltPercentageRequest {
+    percent100ths tiltPercent100thsValue = 0;
+  }
+
+  /** Moves window covering to InstalledOpenLimitLift and InstalledOpenLimitTilt */
+  command UpOrOpen(): DefaultSuccess = 0;
+  /** Moves window covering to InstalledClosedLimitLift and InstalledCloseLimitTilt */
+  command DownOrClose(): DefaultSuccess = 1;
+  /** Stop any adjusting of window covering */
+  command StopMotion(): DefaultSuccess = 2;
+  /** Go to lift value specified */
+  command GoToLiftValue(GoToLiftValueRequest): DefaultSuccess = 4;
+  /** Go to lift percentage specified */
+  command GoToLiftPercentage(GoToLiftPercentageRequest): DefaultSuccess = 5;
+  /** Go to tilt value specified */
+  command GoToTiltValue(GoToTiltValueRequest): DefaultSuccess = 7;
+  /** Go to tilt percentage specified */
+  command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
+}
+
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 cluster ColorControl = 768 {
   revision 6;
@@ -3505,6 +3658,45 @@ endpoint 1 {
     handle command ClearCredential;
   }
 
+  server cluster WindowCovering {
+    ram      attribute type default = 0x00;
+    ram      attribute physicalClosedLimitLift default = 0x0000;
+    ram      attribute physicalClosedLimitTilt default = 0x0000;
+    ram      attribute currentPositionLift;
+    ram      attribute currentPositionTilt;
+    ram      attribute numberOfActuationsLift default = 0x0000;
+    ram      attribute numberOfActuationsTilt default = 0x0000;
+    ram      attribute configStatus default = 0x03;
+    ram      attribute currentPositionLiftPercentage;
+    ram      attribute currentPositionTiltPercentage;
+    ram      attribute operationalStatus default = 0x00;
+    ram      attribute targetPositionLiftPercent100ths;
+    ram      attribute targetPositionTiltPercent100ths;
+    ram      attribute endProductType default = 0x00;
+    ram      attribute currentPositionLiftPercent100ths;
+    ram      attribute currentPositionTiltPercent100ths;
+    ram      attribute installedOpenLimitLift default = 0x0000;
+    ram      attribute installedClosedLimitLift default = 0xFFFF;
+    ram      attribute installedOpenLimitTilt default = 0x0000;
+    ram      attribute installedClosedLimitTilt default = 0xFFFF;
+    ram      attribute mode default = 0x00;
+    ram      attribute safetyStatus default = 0x0000;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 5;
+
+    handle command UpOrOpen;
+    handle command DownOrClose;
+    handle command StopMotion;
+    handle command GoToLiftValue;
+    handle command GoToLiftPercentage;
+    handle command GoToTiltValue;
+    handle command GoToTiltPercentage;
+  }
+
   server cluster ColorControl {
     ram      attribute currentHue default = 0x00;
     ram      attribute currentSaturation default = 0x00;
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
index 144c21afd7d90b..af20ff3733f846 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
@@ -5748,6 +5748,522 @@
             }
           ]
         },
+        {
+          "name": "Window Covering",
+          "code": 258,
+          "mfgCode": null,
+          "define": "WINDOW_COVERING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "UpOrOpen",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "DownOrClose",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "StopMotion",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GoToLiftValue",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GoToLiftPercentage",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GoToTiltValue",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GoToTiltPercentage",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Type",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Type",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitLift",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PhysicalClosedLimitTilt",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLift",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTilt",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfActuationsLift",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfActuationsTilt",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConfigStatus",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ConfigStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x03",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLiftPercentage",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTiltPercentage",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationalStatus",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OperationalStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetPositionLiftPercent100ths",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent100ths",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetPositionTiltPercent100ths",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent100ths",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EndProductType",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "EndProductType",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionLiftPercent100ths",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent100ths",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentPositionTiltPercent100ths",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent100ths",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledOpenLimitLift",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledClosedLimitLift",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledOpenLimitTilt",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InstalledClosedLimitTilt",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0xFFFF",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Mode",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "Mode",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SafetyStatus",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SafetyStatus",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Color Control",
           "code": 768,
diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp
index aa0e2654a5e4d3..fffa68462e9bbc 100644
--- a/examples/window-app/common/src/WindowApp.cpp
+++ b/examples/window-app/common/src/WindowApp.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/window-app/common/src/ZclCallbacks.cpp b/examples/window-app/common/src/ZclCallbacks.cpp
index ae2416576bb009..e02869186704d1 100644
--- a/examples/window-app/common/src/ZclCallbacks.cpp
+++ b/examples/window-app/common/src/ZclCallbacks.cpp
@@ -32,7 +32,6 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/window-covering-server/window-covering-server.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters::WindowCovering;
diff --git a/examples/window-app/nrfconnect/main/WindowCovering.cpp b/examples/window-app/nrfconnect/main/WindowCovering.cpp
index 4d200ffa3c919e..f0cf55b775b0a8 100644
--- a/examples/window-app/nrfconnect/main/WindowCovering.cpp
+++ b/examples/window-app/nrfconnect/main/WindowCovering.cpp
@@ -22,7 +22,6 @@
 #include <dk_buttons_and_leds.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/util/af.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
diff --git a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
index 12e95a7f566788..9262518104df4d 100644
--- a/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
+++ b/examples/window-app/nrfconnect/main/ZclCallbacks.cpp
@@ -31,7 +31,6 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/window-covering-server/window-covering-server.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters::WindowCovering;
diff --git a/examples/window-app/silabs/openthread.gni b/examples/window-app/silabs/openthread.gni
index d3d50ab878b211..9fd09bd510a840 100644
--- a/examples/window-app/silabs/openthread.gni
+++ b/examples/window-app/silabs/openthread.gni
@@ -29,7 +29,7 @@ openthread_external_platform =
 chip_enable_icd_server = true
 enable_synchronized_sed = true
 chip_subscription_timeout_resumption = false
-sl_use_subscription_synching = true
+sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
 sl_ot_idle_interval_ms = 1000  # 1s Idle Intervals
diff --git a/examples/window-app/silabs/src/WindowManager.cpp b/examples/window-app/silabs/src/WindowManager.cpp
index 197836f486a112..af607fdbee7a64 100644
--- a/examples/window-app/silabs/src/WindowManager.cpp
+++ b/examples/window-app/silabs/src/WindowManager.cpp
@@ -20,7 +20,6 @@
 #include <AppConfig.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/examples/window-app/silabs/src/ZclCallbacks.cpp b/examples/window-app/silabs/src/ZclCallbacks.cpp
index 4e2a688383da31..f658a45230a023 100644
--- a/examples/window-app/silabs/src/ZclCallbacks.cpp
+++ b/examples/window-app/silabs/src/ZclCallbacks.cpp
@@ -32,7 +32,6 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/window-covering-server/window-covering-server.h>
-#include <app/util/af.h>
 
 using namespace ::chip;
 using namespace ::chip::app::Clusters::WindowCovering;
diff --git a/examples/window-app/telink/CMakeLists.txt b/examples/window-app/telink/CMakeLists.txt
index 629a0a06779dcc..a5ff986798de1e 100644
--- a/examples/window-app/telink/CMakeLists.txt
+++ b/examples/window-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,53 +13,18 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 cmake_minimum_required(VERSION 3.13.1)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-  set(LOCAL_DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD}.overlay")
-else()
-  unset(LOCAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-  set(GLOBAL_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${BOARD}.overlay")
-else()
-  unset(GLOBAL_DTC_OVERLAY_FILE)
-endif()
-
-if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
-  message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
-else()
-  set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
-  message(STATUS "Flash memory size is set to: 2mb")
-endif()
-
-if(DTC_OVERLAY_FILE)
-  set(DTC_OVERLAY_FILE
-    "${DTC_OVERLAY_FILE} ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE}"
-    CACHE STRING "" FORCE
-  )
-else()
-  set(DTC_OVERLAY_FILE ${GLOBAL_DTC_OVERLAY_FILE} ${FLASH_DTC_OVERLAY_FILE} ${LOCAL_DTC_OVERLAY_FILE})
-endif()
-
-set(CONF_FILE prj.conf)
-
-# Load NCS/Zephyr build system
-list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/telink/chip-module)
-find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
-
-project(chip-telink-window-app-example)
-
+include(${TELINK_COMMON}/common.cmake)
 include(${CHIP_ROOT}/config/telink/app/enable-gnu-std.cmake)
 include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
-target_compile_options(app PRIVATE -fpermissive)
+project(chip-telink-window-app-example)
 
 target_include_directories(app PRIVATE
                            include
@@ -67,7 +32,8 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/window-app
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           ${TELINK_COMMON}/zephyr_ext)
 
 target_sources(app PRIVATE
                src/AppTask.cpp
@@ -75,10 +41,15 @@ target_sources(app PRIVATE
                src/WindowCovering.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
-               ${TELINK_COMMON}/util/src/LEDWidget.cpp
+               ${TELINK_COMMON}/util/src/LEDManager.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
-               ${TELINK_COMMON}/util/src/PWMDevice.cpp
+               ${TELINK_COMMON}/util/src/PWMManager.cpp
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_matrix.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_key_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_led_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_pwm_pool.c
+               ${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c
                )
 
 chip_configure_data_model(app
@@ -94,158 +65,5 @@ endif()
 add_compile_options(-Wno-error=unused-parameter)
 
 if (CONFIG_CHIP_PW_RPC)
-
-# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
-link_libraries($<BUILD_INTERFACE:zephyr_interface>)
-
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.telink)
-pw_set_backend(pw_trace pw_trace_tokenized)
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/telink/pw_sys_io)
-
-pw_proto_library(attributes_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
-  PREFIX
-    attributes_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(button_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
-  PREFIX
-    button_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(descriptor_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
-  PREFIX
-    descriptor_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(device_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
-  PREFIX
-    device_service
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(lighting_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    lighting_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(ot_cli_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    ot_cli_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(thread_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    thread_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-target_sources(app PRIVATE
-  ../../common/pigweed/RpcService.cpp
-  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
-  ${TELINK_COMMON}/Rpc.cpp
-  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
-)
-
-target_include_directories(app PRIVATE
-  ${PIGWEED_ROOT}/pw_sys_io/public
-  ${CHIP_ROOT}/src/lib/support
-  ${CHIP_ROOT}/src/system
-  ${TELINK_COMMON}
-  ../../common
-  ../../common/pigweed
-  ../../common/pigweed/telink)
-
-target_compile_options(app PRIVATE
-                       "-DPW_RPC_ATTRIBUTE_SERVICE=1"
-                       "-DPW_RPC_BUTTON_SERVICE=1"
-                       "-DPW_RPC_DESCRIPTOR_SERVICE=1"
-                       "-DPW_RPC_DEVICE_SERVICE=1"
-                       "-DPW_RPC_LIGHTING_SERVICE=1"
-                       "-DPW_RPC_THREAD_SERVICE=1"
-                       "-DPW_RPC_TRACING_SERVICE=1"
-                       "-DPW_TRACE_BACKEND_SET=1")
-
-target_link_libraries(app PRIVATE
-  attributes_service.nanopb_rpc
-  button_service.nanopb_rpc
-  descriptor_service.nanopb_rpc
-  device_service.nanopb_rpc
-  lighting_service.nanopb_rpc
-  thread_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_log
-  pw_rpc.server
-  pw_trace_tokenized
-  pw_trace_tokenized.trace_buffer
-  pw_trace_tokenized.rpc_service
-  pw_trace_tokenized.protos.nanopb_rpc
-)
-
-target_link_options(app
-  PUBLIC
-    "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld"
-    "-L${PIGWEED_ROOT}/pw_tokenizer"
-)
-
+  include(${TELINK_COMMON}/Rpc.cmake)
 endif(CONFIG_CHIP_PW_RPC)
diff --git a/examples/window-app/telink/include/AppConfig.h b/examples/window-app/telink/include/AppConfig.h
index f0ace63aecd608..dcf944921bc9e2 100644
--- a/examples/window-app/telink/include/AppConfig.h
+++ b/examples/window-app/telink/include/AppConfig.h
@@ -20,10 +20,5 @@
 
 // ---- Window App Example Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON 0
-#define APP_USE_THREAD_START_BUTTON 0
 #define APP_SET_DEVICE_INFO_PROVIDER 1
 #define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
-#if defined(CONFIG_BOARD_TLSR9518ADK80D) || defined(CONFIG_BOARD_TLSR9528A)
-#define APP_USE_IDENTIFY_PWM 1
-#endif
diff --git a/examples/window-app/telink/include/AppTask.h b/examples/window-app/telink/include/AppTask.h
index 05a356f4531226..07dafb26c376c7 100644
--- a/examples/window-app/telink/include/AppTask.h
+++ b/examples/window-app/telink/include/AppTask.h
@@ -35,6 +35,7 @@ class AppTask : public AppTaskCommon
     friend class AppTaskCommon;
 
     CHIP_ERROR Init(void);
+    void LinkButtons(ButtonManager & buttonManager);
 
     static void OpenActionAndToggleMoveTypeButtonEventHandler(void);
     static void CloseActionButtonEventHandler(void);
diff --git a/examples/window-app/telink/include/WindowCovering.h b/examples/window-app/telink/include/WindowCovering.h
index 872e3c5c083284..aee1fdde82e633 100644
--- a/examples/window-app/telink/include/WindowCovering.h
+++ b/examples/window-app/telink/include/WindowCovering.h
@@ -17,8 +17,7 @@
 
 #pragma once
 
-#include "LEDWidget.h"
-#include "PWMDevice.h"
+#include "LEDManager.h"
 
 #include <app/clusters/window-covering-server/window-covering-delegate.h>
 #include <app/clusters/window-covering-server/window-covering-server.h>
@@ -30,6 +29,15 @@ using namespace chip::app::Clusters::WindowCovering;
 class WindowCovering
 {
 public:
+    enum Action_t : uint8_t
+    {
+        ON_ACTION = 0,
+        OFF_ACTION,
+        LEVEL_ACTION,
+
+        INVALID_ACTION
+    };
+
     struct AttributeUpdateData
     {
         chip::EndpointId mEndpoint;
@@ -43,9 +51,6 @@ class WindowCovering
         return sInstance;
     }
 
-    PWMDevice & GetLiftIndicator() { return mLiftIndicator; }
-    PWMDevice & GetTiltIndicator() { return mTiltIndicator; }
-
     void StartMove(WindowCoveringType aMoveType);
     void SetSingleStepTarget(OperationalState aDirection);
     void SetMoveType(WindowCoveringType aMoveType) { mCurrentUIMoveType = aMoveType; }
@@ -71,8 +76,6 @@ class WindowCovering
 
     WindowCoveringType mCurrentUIMoveType;
 
-    PWMDevice mLiftIndicator;
-    PWMDevice mTiltIndicator;
     bool mInLiftMove{ false };
     bool mInTiltMove{ false };
 };
diff --git a/examples/window-app/telink/prj.conf b/examples/window-app/telink/prj.conf
index 8c44d9f0c8fe36..63b50805b4e176 100644
--- a/examples/window-app/telink/prj.conf
+++ b/examples/window-app/telink/prj.conf
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2023 Project CHIP Authors
+#    Copyright (c) 2023-2024 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 #    limitations under the License.
 #
 
-# This sample uses sample-defaults.conf to set options common for all
+# This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample
 # or overrides of default values.
 
@@ -22,10 +22,6 @@
 CONFIG_CHIP=y
 CONFIG_STD_CPP17=y
 
-# CHIP configuration
-CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
-CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
-
 # 32784 == 0x8010 (example window-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
 
diff --git a/examples/window-app/telink/src/AppTask.cpp b/examples/window-app/telink/src/AppTask.cpp
index 9817b474a8840a..15f134183375b0 100644
--- a/examples/window-app/telink/src/AppTask.cpp
+++ b/examples/window-app/telink/src/AppTask.cpp
@@ -27,22 +27,6 @@ constexpr int kToggleMoveTypeTriggerTimeout = 700;
 
 k_timer sToggleMoveTypeTimer;
 
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-#define OPEN_WINDOW_BUTTON GPIO_DT_SPEC_GET(DT_NODELABEL(key_4), gpios)
-#define CLOSE_WINDOW_BUTTON GPIO_DT_SPEC_GET(DT_NODELABEL(key_3), gpios)
-
-const struct gpio_dt_spec sOpenWindowButtonDt  = OPEN_WINDOW_BUTTON;
-const struct gpio_dt_spec sCloseWindowButtonDt = CLOSE_WINDOW_BUTTON;
-#else
-const struct gpio_dt_spec sButtonCol1Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_col1), gpios);
-const struct gpio_dt_spec sButtonCol2Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_col2), gpios);
-const struct gpio_dt_spec sButtonRow1Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_row1), gpios);
-const struct gpio_dt_spec sButtonRow2Dt = GPIO_DT_SPEC_GET(DT_NODELABEL(key_matrix_row2), gpios);
-#endif
-
-Button sOpenButton;
-Button sCloseButton;
-
 bool sIsToggleMoveTypeTimerActive = false;
 } // namespace
 
@@ -52,16 +36,6 @@ CHIP_ERROR AppTask::Init(void)
 {
     InitCommonParts();
 
-#if CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE
-    sOpenButton.Configure(&sOpenWindowButtonDt, OpenActionAndToggleMoveTypeButtonEventHandler);
-    sCloseButton.Configure(&sCloseWindowButtonDt, CloseActionButtonEventHandler);
-#else
-    sOpenButton.Configure(&sButtonRow1Dt, &sButtonCol2Dt, OpenActionAndToggleMoveTypeButtonEventHandler);
-    sCloseButton.Configure(&sButtonRow2Dt, &sButtonCol1Dt, CloseActionButtonEventHandler);
-#endif
-    ButtonManagerInst().AddButton(sOpenButton);
-    ButtonManagerInst().AddButton(sCloseButton);
-
     // Initialize ToggleMoveType timer
     k_timer_init(&sToggleMoveTypeTimer, &AppTask::OpenTimerTimeoutCallback, nullptr);
     k_timer_user_data_set(&sToggleMoveTypeTimer, this);
@@ -153,3 +127,11 @@ void AppTask::ToggleMoveType()
         LOG_INF("Window covering move: lift");
     }
 }
+
+void AppTask::LinkButtons(ButtonManager & buttonManager)
+{
+    buttonManager.addCallback(FactoryResetButtonEventHandler, 0, true);
+    buttonManager.addCallback(ExampleActionButtonEventHandler, 1, true);
+    buttonManager.addCallback(OpenActionAndToggleMoveTypeButtonEventHandler, 2, true);
+    buttonManager.addCallback(CloseActionButtonEventHandler, 3, true);
+}
diff --git a/examples/window-app/telink/src/WindowCovering.cpp b/examples/window-app/telink/src/WindowCovering.cpp
index 5c1b8d10559c33..302eecc77d1800 100644
--- a/examples/window-app/telink/src/WindowCovering.cpp
+++ b/examples/window-app/telink/src/WindowCovering.cpp
@@ -17,10 +17,9 @@
 
 #include "WindowCovering.h"
 #include "AppConfig.h"
-#include "PWMDevice.h"
+#include "PWMManager.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/util/af.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
@@ -31,9 +30,6 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 using namespace chip::app::Clusters::WindowCovering;
 
-static const struct pwm_dt_spec sLiftPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0));
-static const struct pwm_dt_spec sTiltPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led1));
-
 static constexpr uint32_t sMoveTimeoutMs{ 200 };
 constexpr uint16_t sPercentDelta   = 500;
 constexpr uint8_t kDefaultMinLevel = 0;
@@ -41,16 +37,8 @@ constexpr uint8_t kDefaultMaxLevel = 254;
 
 WindowCovering::WindowCovering()
 {
-    if (mLiftIndicator.Init(&sLiftPwmDevice, kDefaultMinLevel, kDefaultMaxLevel, kDefaultMinLevel) != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Cannot initialize the lift indicator");
-    }
-    if (mTiltIndicator.Init(&sTiltPwmDevice, kDefaultMinLevel, kDefaultMaxLevel, kDefaultMinLevel) != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Cannot initialize the tilt indicator");
-    }
-    mLiftIndicator.InitiateAction(PWMDevice::ON_ACTION, 0, nullptr);
-    mTiltIndicator.InitiateAction(PWMDevice::ON_ACTION, 0, nullptr);
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, false);
+    PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, false);
 }
 
 void WindowCovering::DriveCurrentLiftPosition(intptr_t)
@@ -275,11 +263,11 @@ void WindowCovering::SetBrightness(WindowCoveringType aMoveType, uint16_t aPosit
     uint8_t brightness = PositionToBrightness(aPosition, aMoveType);
     if (aMoveType == WindowCoveringType::Lift)
     {
-        mLiftIndicator.InitiateAction(PWMDevice::LEVEL_ACTION, 0, &brightness);
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Red, (((uint32_t) brightness * 1000) / UINT8_MAX));
     }
     else if (aMoveType == WindowCoveringType::Tilt)
     {
-        mTiltIndicator.InitiateAction(PWMDevice::LEVEL_ACTION, 0, &brightness);
+        PwmManager::getInstance().setPwm(PwmManager::EAppPwm_Green, (((uint32_t) brightness * 1000) / UINT8_MAX));
     }
 }
 
@@ -289,13 +277,13 @@ uint8_t WindowCovering::PositionToBrightness(uint16_t aPosition, WindowCoveringT
 
     if (aMoveType == WindowCoveringType::Lift)
     {
-        pwmLimits.open   = mLiftIndicator.GetMinLevel();
-        pwmLimits.closed = mLiftIndicator.GetMaxLevel();
+        pwmLimits.open   = kDefaultMinLevel;
+        pwmLimits.closed = kDefaultMaxLevel;
     }
     else if (aMoveType == WindowCoveringType::Tilt)
     {
-        pwmLimits.open   = mTiltIndicator.GetMinLevel();
-        pwmLimits.closed = mTiltIndicator.GetMaxLevel();
+        pwmLimits.open   = kDefaultMinLevel;
+        pwmLimits.closed = kDefaultMaxLevel;
     }
 
     return Percent100thsToValue(pwmLimits, aPosition);
diff --git a/examples/window-app/telink/src/ZclCallbacks.cpp b/examples/window-app/telink/src/ZclCallbacks.cpp
index 844e58e317dc20..dc7f5376de90de 100644
--- a/examples/window-app/telink/src/ZclCallbacks.cpp
+++ b/examples/window-app/telink/src/ZclCallbacks.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "AppTask.h"
-#include "PWMDevice.h"
 #include "WindowCovering.h"
 #include <AppConfig.h>
 
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 4a3655c403bff0..5a7e98ca56c8d3 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@ steps:
               git config --global --add safe.directory "*"
               python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android 
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
       #       jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
       env:
@@ -23,7 +23,7 @@ steps:
           - name: pwenv
             path: /pwenv
       timeout: 900s
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -38,7 +38,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 659c8be7274a94..5003d089257366 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@ steps:
               git config --global --add safe.directory "*"
               python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android 
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
       #       jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
       env:
@@ -24,7 +24,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@ steps:
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -66,7 +66,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -88,7 +88,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -141,7 +141,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:41"
+    - name: "ghcr.io/project-chip/chip-build-vscode:47"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index 3cdc06375c2eb2..20e7ff0d5a702b 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-46 : [ESP32] Updated the QEMU Dockerfile.
+47 : [Telink] Update Docker image (Zephyr update)
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
index 9bddf431fb5a3d..46a1409fb6176d 100644
--- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -12,7 +12,7 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr
-ARG ZEPHYR_REVISION=65dc1812431bf946dfc110682298acf83d63e27a
+ARG ZEPHYR_REVISION=047fe473eb7e407d9905c7f1f24533e12f534280
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install -U --no-cache-dir west \
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 2c3d2b95232474..3f5fc57a616901 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -497,25 +497,6 @@ def BuildNxpTarget():
     return target
 
 
-def BuildCC13x2x7Target():
-    target = BuildTarget('ti', TIBuilder)
-
-    # board
-    target.AppendFixedTargets([
-        TargetPart('cc13x2x7_26x2x7', board=TIBoard.LP_CC2652R7),
-    ])
-
-    target.AppendFixedTargets([
-        TargetPart('lighting', app=TIApp.LIGHTING),
-        TargetPart('lock', app=TIApp.LOCK),
-        TargetPart('pump', app=TIApp.PUMP),
-        TargetPart('pump-controller', app=TIApp.PUMP_CONTROLLER),
-    ])
-    target.AppendModifier(name="mtd", openthread_ftd=False)
-
-    return target
-
-
 def BuildCC13x4Target():
     target = BuildTarget('ti', TIBuilder)
 
@@ -790,7 +771,6 @@ def BuildOpenIotSdkTargets():
     BuildAndroidTarget(),
     BuildBouffalolabTarget(),
     Buildcc32xxTarget(),
-    BuildCC13x2x7Target(),
     BuildCC13x4Target(),
     BuildCyw30739Target(),
     BuildEfr32Target(),
diff --git a/scripts/build/builders/cc13x2x7_26x2x7.py b/scripts/build/builders/cc13x2x7_26x2x7.py
deleted file mode 100644
index 907d92fe1575b4..00000000000000
--- a/scripts/build/builders/cc13x2x7_26x2x7.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from enum import Enum, auto
-
-from .gn import GnBuilder
-
-
-class cc13x2x7_26x2x7App(Enum):
-    LOCK = auto()
-    PUMP = auto()
-    PUMP_CONTROLLER = auto()
-    ALL_CLUSTERS = auto()
-    ALL_CLUSTERS_MINIMAL = auto()
-    SHELL = auto()
-
-    def ExampleName(self):
-        if self == cc13x2x7_26x2x7App.LOCK:
-            return 'lock-app'
-        elif self == cc13x2x7_26x2x7App.PUMP:
-            return 'pump-app'
-        elif self == cc13x2x7_26x2x7App.PUMP_CONTROLLER:
-            return 'pump-controller-app'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
-            return 'all-clusters-app'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
-            return 'all-clusters-minimal-app'
-        elif self == cc13x2x7_26x2x7App.SHELL:
-            return 'shell'
-        else:
-            raise Exception('Unknown app type: %r' % self)
-
-    def AppNamePrefix(self):
-        if self == cc13x2x7_26x2x7App.LOCK:
-            return 'chip-LP_CC2652R7-lock-example'
-        elif self == cc13x2x7_26x2x7App.PUMP:
-            return 'chip-LP_CC2652R7-pump-example'
-        elif self == cc13x2x7_26x2x7App.PUMP_CONTROLLER:
-            return 'chip-LP_CC2652R7-pump-controller-example'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
-            return 'chip-LP_CC2652R7-all-clusters-example'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
-            return 'chip-LP_CC2652R7-all-clusters-minimal-example'
-        elif self == cc13x2x7_26x2x7App.SHELL:
-            return 'chip-LP_CC2652R7-shell-example'
-        else:
-            raise Exception('Unknown app type: %r' % self)
-
-    def BuildRoot(self, root):
-        return os.path.join(root, 'examples', self.ExampleName(), 'cc13x2x7_26x2x7')
-
-
-class cc13x2x7_26x2x7Builder(GnBuilder):
-
-    def __init__(self,
-                 root,
-                 runner,
-                 app: cc13x2x7_26x2x7App = cc13x2x7_26x2x7App.LOCK,
-                 openthread_ftd: bool = None):
-        super(cc13x2x7_26x2x7Builder, self).__init__(
-            root=app.BuildRoot(root),
-            runner=runner)
-        self.code_root = root
-        self.app = app
-        self.openthread_ftd = openthread_ftd
-
-    def GnBuildArgs(self):
-        args = [
-            'ti_sysconfig_root="%s"' % os.environ['TI_SYSCONFIG_ROOT'],
-        ]
-
-        if self.openthread_ftd is None:
-            pass
-        elif self.openthread_ftd:
-            args.append('chip_openthread_ftd=true')
-            args.append('chip_progress_logging=false')
-        else:
-            args.append('chip_openthread_ftd=false')
-
-        return args
-
-    def build_outputs(self):
-        items = {}
-        if (self.app == cc13x2x7_26x2x7App.LOCK
-                or self.app == cc13x2x7_26x2x7App.PUMP
-                or self.app == cc13x2x7_26x2x7App.PUMP_CONTROLLER):
-            extensions = [".out", ".bin", ".out.map", "-bim.hex"]
-
-        elif self.app == cc13x2x7_26x2x7App.ALL_CLUSTERS or cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL or self.app == cc13x2x7_26x2x7App.SHELL:
-            extensions = [".out", ".out.map"]
-
-        else:
-            raise Exception('Unknown app type: %r' % self.app)
-
-        for extension in extensions:
-            name = '%s%s' % (self.app.AppNamePrefix(), extension)
-            items[name] = os.path.join(self.output_dir, name)
-
-        return items
diff --git a/scripts/build/builders/ti.py b/scripts/build/builders/ti.py
index 0f49cd44d06a90..5decd75cc058e0 100644
--- a/scripts/build/builders/ti.py
+++ b/scripts/build/builders/ti.py
@@ -69,21 +69,16 @@ def BuildRoot(self, root, board):
 
 
 class TIBoard(Enum):
-    LP_CC2652R7 = auto()
     LP_EM_CC1354P10_6 = auto()
 
     def BoardName(self):
-        if self == TIBoard.LP_CC2652R7:
-            return 'LP_CC2652R7'
-        elif self == TIBoard.LP_EM_CC1354P10_6:
+        if self == TIBoard.LP_EM_CC1354P10_6:
             return 'LP_EM_CC1354P10_6'
         else:
             raise Exception('Unknown board type: %r' % self)
 
     def FamilyName(self):
-        if self == TIBoard.LP_CC2652R7:
-            return 'cc13x2x7_26x2x7'
-        elif self == TIBoard.LP_EM_CC1354P10_6:
+        if self == TIBoard.LP_EM_CC1354P10_6:
             return 'cc13x4_26x4'
         else:
             raise Exception('Unknown board type: %r' % self)
@@ -94,7 +89,7 @@ class TIBuilder(GnBuilder):
     def __init__(self,
                  root,
                  runner,
-                 board=TIBoard.LP_CC2652R7,
+                 board=TIBoard.LP_EM_CC1354P10_6,
                  app: TIApp = TIApp.LOCK,
                  openthread_ftd: Optional[bool] = None):
         super(TIBuilder, self).__init__(
@@ -121,11 +116,12 @@ def GnBuildArgs(self):
 
     def build_outputs(self):
         items = {}
-        if (self.board == TIBoard.LP_CC2652R7):
+        if (self.board == TIBoard.LP_EM_CC1354P10_6):
             if (self.app == TIApp.LOCK
-                    or self.app == TIApp.PUMP
+                or self.app == TIApp.LIGHTING
+                or self.app == TIApp.PUMP
                     or self.app == TIApp.PUMP_CONTROLLER):
-                extensions = [".out", ".bin", ".out.map", "-bim.hex"]
+                extensions = [".out", ".out.map", "-mcuboot.hex"]
 
             else:
                 extensions = [".out", ".out.map"]
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index f258645fcbe554..a1d6a46755e938 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -3,7 +3,6 @@ asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-
 android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,kotlin-matter-controller,virtual-device-app}[-no-debug]
 bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor][-mot]
 cc32xx-{lock,air-purifier}
-ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
 ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]
 cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor,switch}
 efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a,brd4338a}-{window-covering,switch,unit-test,light,lock,thermostat,pump}[-rpc][-with-ota-requestor][-icd][-low-power][-shell][-no-logging][-openthread-mtd][-heap-monitoring][-no-openthread-cli][-show-qr-code][-wifi][-rs9116][-wf200][-siwx917][-ipv4][-additional-data-advertising][-use-ot-lib][-use-ot-coap-lib][-no-version][-skip-rps-generation]
diff --git a/scripts/py_matter_yamltests/matter_yamltests/constraints.py b/scripts/py_matter_yamltests/matter_yamltests/constraints.py
index 69a04b190f6fe5..54f56a5c572a72 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/constraints.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/constraints.py
@@ -801,14 +801,15 @@ def get_reason(self, value, value_type_name) -> str:
 
 class _ConstraintNotValue(BaseConstraint):
     def __init__(self, context, not_value):
-        super().__init__(context, types=[], is_null_allowed=True)
+        # NOTE: do not use is_null_allowed=True here, because 'notValue: null' needs to work.
+        super().__init__(context, types=[])
         self._not_value = not_value
 
     def check_response(self, value, value_type_name) -> bool:
         return value != self._not_value
 
     def get_reason(self, value, value_type_name) -> str:
-        return f'The response value "{value}" should differs from the constraint.'
+        return f'The response value "{value}" should differ from the constraint.'
 
 
 class _ConstraintAnyOf(BaseConstraint):
diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py
index 9612d5749d085b..7d8558df89e185 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/parser.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py
@@ -1223,7 +1223,8 @@ def _config_variable_substitution(self, value):
             # But some other tests were relying on the fact that the expression was put 'as if' in
             # the generated code and was resolved before being sent over the wire. For such
             # expressions (e.g 'myVar + 1') we need to compute it before sending it over the wire.
-            tokens = value.split()
+            delimiter_regex = "(\ |\(|\)|\+|\-|\*|\/|\%)"
+            tokens = re.split(delimiter_regex, value)
             if len(tokens) == 0:
                 return value
 
@@ -1240,7 +1241,7 @@ def _config_variable_substitution(self, value):
                 return tokens[0]
 
             tokens = [str(token) for token in tokens]
-            value = ' '.join(tokens)
+            value = ''.join(tokens)
             # TODO we should move away from eval. That will mean that we will need to do extra
             # parsing, but it would be safer then just blindly running eval.
             return value if not substitution_occured else eval(value)
diff --git a/scripts/py_matter_yamltests/test_yaml_parser.py b/scripts/py_matter_yamltests/test_yaml_parser.py
index 27472572a96d6b..01784ec7465dd0 100644
--- a/scripts/py_matter_yamltests/test_yaml_parser.py
+++ b/scripts/py_matter_yamltests/test_yaml_parser.py
@@ -48,6 +48,9 @@
       <attribute side="server" code="0x0024" type="TestEnum" writable="true" optional="false">test_enum</attribute>
 
       <command source="client" code="1" name="test"></command>
+      <command source="client" code="2" name="IntTest">
+        <arg name="arg" type="int8u"/>
+      </command>
     </cluster>
   </configurator>
 '''
@@ -175,6 +178,81 @@
           value: TestEnum.UnknownEnumValue(0)
 '''
 
+_BASIC_ARITHMETIC_ARG_RESULTS = [6, 6, 2, 2, 8, 8, 2, 2, 1]
+basic_arithmetic_yaml = '''
+name: Test Cluster Tests
+
+config:
+    nodeId: 0x12344321
+    cluster: "Test"
+    endpoint: 1
+    myVariable: 4
+
+tests:
+    - label: "Add 2"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable + 2
+
+    - label: "Add 2 with no space"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable+2
+
+    - label: "Minus 2"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable - 2
+
+    - label: "Minus 2 with no space"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable-2
+
+    - label: "Multiply by 2"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable * 2
+
+    - label: "Multiply by 2 with no space"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable*2
+
+    - label: "Divide by 2"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable / 2
+
+    - label: "Divide by 2 with no space"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: myVariable/2
+
+    - label: "Arithmetic with parentheses"
+      command: "IntTest"
+      arguments:
+          values:
+              - name: "arg"
+                value: (myVariable +3)/7
+'''
+
 
 def mock_open_with_parameter_content(content):
     file_object = mock_open(read_data=content).return_value
@@ -207,6 +285,17 @@ def test_config(self):
             self.assertEqual(test_step.cluster, 'Test')
             self.assertEqual(test_step.endpoint, 1)
 
+    def test_basic_arithmetic(self):
+        parser_config = TestParserConfig(None, self._definitions)
+
+        yaml_parser = TestParser(basic_arithmetic_yaml, parser_config)
+        for idx, test_step in enumerate(yaml_parser.tests):
+            values = test_step.arguments['values']
+            self.assertEqual(len(values), 1)
+            value = values[0]
+            self.assertEqual(value['name'], 'arg')
+            self.assertEqual(value['value'], _BASIC_ARITHMETIC_ARG_RESULTS[idx])
+
     def test_config_override(self):
         config_override = {'nodeId': 12345,
                            'cluster': 'TestOverride', 'endpoint': 4}
diff --git a/scripts/setup/bootstrap.sh b/scripts/setup/bootstrap.sh
index 0a2a898eaf02c5..16e1f6064c5b90 100644
--- a/scripts/setup/bootstrap.sh
+++ b/scripts/setup/bootstrap.sh
@@ -56,6 +56,29 @@ _install_additional_pip_requirements() {
     unset _SETUP_PLATFORM
 }
 
+_submodules_need_updating() {
+  # Validates if a set of submodules that should always be checked out are up to date.
+
+  # Pigweed will be up to date on an initial setup, however it may change over time.
+  # The rest are a small subset of things that are always checked out (have no platform attachment).
+  _SUBMODULE_PATHS=(
+    "third_party/pigweed/repo"
+    "third_party/openthread/repo"
+    "third_party/editline/repo"
+  )
+
+  for submodule_path in "${_SUBMODULE_PATHS[@]}"; do
+    if git submodule status "$submodule_path" | grep -E '^-' >/dev/null 2>&1; then 
+      echo "git shows that $submodule_path has changes"
+      unset _SUBMODULE_PATHS
+      return 0 # Success
+    fi
+  done
+
+  unset _SUBMODULE_PATHS
+  return 1 # Failure
+}
+
 _bootstrap_or_activate() {
     if [ -n "$BASH" ]; then
         local _BOOTSTRAP_PATH="${BASH_SOURCE[0]}"
@@ -113,7 +136,7 @@ _bootstrap_or_activate() {
     local _PIGWEED_CIPD_JSON="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json"
     mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT"
     local _GENERATED_PIGWEED_CIPD_JSON="$_PW_ACTUAL_ENVIRONMENT_ROOT/pigweed.json"
-    scripts/setup/gen_pigweed_cipd_json.py -i $_PIGWEED_CIPD_JSON -o $_GENERATED_PIGWEED_CIPD_JSON
+    $_CHIP_ROOT/scripts/setup/gen_pigweed_cipd_json.py -i $_PIGWEED_CIPD_JSON -o $_GENERATED_PIGWEED_CIPD_JSON
 
     if test -n "$GITHUB_ACTION"; then
         tee <<EOF >"${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip.conf"
@@ -144,8 +167,20 @@ EOF
 # bootstrap or run_in_build_env.sh can be executed in a build env
 _ORIGINAL_PW_ENVIRONMENT_ROOT="$PW_ENVIRONMENT_ROOT"
 
+# pigweed does not seem to handle pwd involving symlinks very well.
+original_pwd=$PWD
+if hash realpath 2>/dev/null; then
+    realpwd="$(realpath "$PWD")"
+    if [ "$realpwd" != "$PWD" ]; then
+        echo "Warning: $PWD contains symlinks, using $realpwd instead"
+        cd "$realpwd"
+    fi
+fi
+
 _bootstrap_or_activate "$0"
 
+cd $original_pwd
+
 if [ "$_ACTION_TAKEN" = "bootstrap" ]; then
     # By default, install all extra pip dependencies even if slow. -p/--platform
     # arguments may override this default.
@@ -164,6 +199,20 @@ unset -f _install_additional_pip_requirements
 
 pw_cleanup
 
+if _submodules_need_updating; then
+  # yellow output
+  if which tput >/dev/null; then tput setaf 3; fi
+
+  echo "Some submodules seem out of date."
+  echo "For a clean checkout, consider running:"
+  echo "   ./scripts/checkout_submodules.py --shallow --platform <your-platform>"
+  echo "OR for a full checkout:"
+  echo "   git submodules update -f --init --recursive"
+
+  # reset output
+  if which tput >/dev/null; then tput sgr0; fi
+fi
+
 unset _ACTION_TAKEN
 unset _CHIP_ROOT
 unset PW_CIPD_INSTALL_DIR
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index ecfd98be618480..623017e2e2dd97 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -276,7 +276,9 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
 def _GetPurposefulFailureTests() -> Set[str]:
     """Tests that fail in YAML on purpose."""
     return {
-        "TestPurposefulFailureEqualities.yaml"
+        "TestPurposefulFailureEqualities.yaml",
+        "TestPurposefulFailureExtraReportingOnToggle.yaml",
+        "TestPurposefulFailureNotNullConstraint.yaml",
     }
 
 
diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py
index 0d9a7df82015be..227d65a99877c6 100644
--- a/scripts/tools/check_includes_config.py
+++ b/scripts/tools/check_includes_config.py
@@ -121,8 +121,10 @@
     'src/platform/mbed/MbedEventTimeout.h': {'chrono'},
 
     'src/app/app-platform/ContentApp.h': {'list', 'string'},
-    'src/app/clusters/application-basic-server/application-basic-delegate.h': {'list'},
-    'src/app/clusters/application-basic-server/application-basic-server.cpp': {'list'},
+    'src/app/app-platform/ContentAppPlatform.cpp': {'string'},
+    'src/app/clusters/application-basic-server/application-basic-delegate.h': {'list', 'string'},
+    'src/app/clusters/application-basic-server/application-basic-server.cpp': {'list', 'string'},
+    'src/app/clusters/application-launcher-server/application-launcher-server.cpp': {'string'},
     'src/app/clusters/application-launcher-server/application-launcher-delegate.h': {'list'},
     'src/app/clusters/audio-output-server/audio-output-delegate.h': {'list'},
     'src/app/clusters/channel-server/channel-delegate.h': {'list'},
@@ -136,13 +138,15 @@
     'src/credentials/attestation_verifier/FileAttestationTrustStore.cpp': {'string'},
 
     'src/setup_payload/AdditionalDataPayload.h': {'string'},
-    'src/setup_payload/AdditionalDataPayloadParser.cpp': {'vector'},
+    'src/setup_payload/AdditionalDataPayloadParser.cpp': {'vector', 'string'},
     'src/setup_payload/Base38Decode.h': {'string', 'vector'},
     'src/setup_payload/ManualSetupPayloadGenerator.h': {'string'},
     'src/setup_payload/ManualSetupPayloadParser.cpp': {'string', 'vector'},
     'src/setup_payload/ManualSetupPayloadParser.h': {'string'},
     'src/setup_payload/QRCodeSetupPayloadParser.cpp': {'vector'},
     'src/setup_payload/QRCodeSetupPayloadParser.h': {'string'},
+    'src/setup_payload/QRCodeSetupPayloadGenerator.cpp': {'string'},
+    'src/setup_payload/QRCodeSetupPayloadGenerator.h': {'string'},
     'src/setup_payload/SetupPayloadHelper.cpp': {'fstream'},
     'src/setup_payload/SetupPayloadHelper.h': {'string'},
     'src/setup_payload/SetupPayload.h': {'map', 'string', 'vector'},
@@ -154,11 +158,11 @@
     # of a list of discovered things.
     'src/controller/SetUpCodePairer.h': {'deque'},
 
-    'src/controller/ExamplePersistentStorage.cpp': {'fstream'},
+    'src/controller/ExamplePersistentStorage.cpp': {'fstream', 'string', 'map'},
 
     # Library meant for non-embedded
     'src/tracing/json/json_tracing.cpp': {'string', 'sstream'},
-    'src/tracing/json/json_tracing.h': {'fstream', 'unordered_map'},
+    'src/tracing/json/json_tracing.h': {'fstream', 'unordered_map', 'string'},
 
     # esp32 tracing
     'src/tracing/esp32_trace/esp32_tracing.h': {'unordered_map'},
@@ -175,5 +179,7 @@
     'src/lib/support/jsontlv/TextFormat.h': {'string'},
     'src/app/icd/client/DefaultICDClientStorage.cpp': {'vector'},
     'src/app/icd/client/DefaultICDClientStorage.h': {'vector'},
-    'src/app/icd/client/DefaultICDStorageKey.h': {'vector'}
+    'src/app/icd/client/DefaultICDStorageKey.h': {'vector'},
+    'src/controller/CHIPDeviceController.cpp': {'string'},
+    'src/qrcodetool/setup_payload_commands.cpp': {'string'},
 }
diff --git a/scripts/tools/memory/platform/cc13x2_26x2.cfg b/scripts/tools/memory/platform/cc13x2_26x2.cfg
deleted file mode 100644
index ab9a4ba741394b..00000000000000
--- a/scripts/tools/memory/platform/cc13x2_26x2.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Memory tools default configuation for TI CC13x2/CC26x2
-
-{
-    'section': {
-        # By default, only these sections will be included
-        # when operating by sections.
-        'default': ['.text', '.rodata', '.data', '.bss']
-    },
-    'symbol': {
-        'free': {
-            # These symbols mark the start or end of areas where memory that
-            # does not belong to any symbol is considered unused (rather than
-            # a gap that may be in use for some non-symbol purpose, e.g. string
-            # constants or alignment).
-            'start': ['_stack'],
-            'end': ['_stack_end', '__stack_end'],
-        }
-    },
-    'region': {
-        # Regions are sets of sections that can be used for aggregate reports.
-        'sections': {
-            'FLASH': [
-                '.text',
-                '.rodata',
-                '.resetVecs',
-                '.ccfg',
-                '.ARM.exidx',
-            ],
-            'RAM': [
-                '.bss',
-                '.data',
-                '.heap',
-                '.nvs',
-                '.stack',
-                'vtable_ram',
-            ],
-        }
-    },
-    'collect': {
-        # Strip these prefixes from compilation unit paths.
-        'prefix': [
-            r'C:\\.conan\\1233bc\\1\\source\\ti\\',
-        ],
-        'prefix-file': True,
-    },
-}
diff --git a/scripts/tools/memory/platform/cc13x4_26x4.cfg b/scripts/tools/memory/platform/cc13x4_26x4.cfg
index ab9a4ba741394b..590797c960e696 100644
--- a/scripts/tools/memory/platform/cc13x4_26x4.cfg
+++ b/scripts/tools/memory/platform/cc13x4_26x4.cfg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Memory tools default configuation for TI CC13x2/CC26x2
+# Memory tools default configuation for TI CC13x4/CC26x4
 
 {
     'section': {
diff --git a/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py b/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
index 724484058029d1..78212cefd81e6e 100644
--- a/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
+++ b/scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
@@ -28,6 +28,7 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.serialization import load_der_private_key
+from nrfconnect_generate_partition import PartitionCreator
 
 try:
     import qrcode
@@ -228,6 +229,10 @@ def __init__(self, arguments) -> None:
         self._factory_data = list()
         self._user_data = dict()
 
+        # If .json extension is included in the output path, remove it, as script adds it automatically.
+        if self._args.output.endswith(".json"):
+            self._args.output = self._args.output[:-len(".json")]
+
         try:
             self._validate_args()
         except AssertionError as e:
@@ -244,8 +249,6 @@ def _validate_args(self):
             "Cannot find Spake2+ verifier, to generate a new one please provide passcode (--passcode)"
         assert ((self._args.gen_certs and self._args.chip_cert_path) or (self._args.dac_cert and self._args.pai_cert and self._args.dac_key)), \
             "Cannot find paths to DAC or PAI certificates .der files. To generate a new ones please provide a path to chip-cert executable (--chip_cert_path) and add --gen_certs argument"
-        assert self._args.output.endswith(".json"), \
-            "Output path doesn't contain .json file path. ({})".format(self._args.output)
         assert self._args.passcode not in INVALID_PASSCODES, \
             "Provided invalid passcode!"
 
@@ -310,9 +313,9 @@ def generate_json(self):
             sys.exit(-1)
 
         try:
-            json_file = open(self._args.output, "w+")
+            json_file = open(self._args.output+".json", "w+")
         except FileNotFoundError:
-            print("Cannot create JSON file in this location: {}".format(self._args.output))
+            print("Cannot create JSON file in this location: {}".format(self._args.output+".json"))
             sys.exit(-1)
         with json_file:
             # serialize data
@@ -422,11 +425,11 @@ def _generate_onboarding_data(self):
                                      flow=CommissioningFlow.Standard,
                                      vid=self._args.vendor_id,
                                      pid=self._args.product_id)
-        with open(self._args.output[:-len(".json")] + ".txt", "w") as manual_code_file:
+        with open(self._args.output + ".txt", "w") as manual_code_file:
             manual_code_file.write("Manualcode : " + setup_payload.generate_manualcode() + "\n")
             manual_code_file.write("QRCode : " + setup_payload.generate_qrcode())
         qr = qrcode.make(setup_payload.generate_qrcode())
-        qr.save(self._args.output[:-len(".json")] + ".png")
+        qr.save(self._args.output + ".png")
 
 
 def main():
@@ -441,7 +444,10 @@ def base64_str(s): return base64.b64decode(s)
     parser.add_argument("-s", "--schema", type=str,
                         help="JSON schema file to validate JSON output data")
     parser.add_argument("-o", "--output", type=str, required=True,
-                        help="Output path to store .json file, e.g. my_dir/output.json")
+                        help="Output path to store .json file, e.g. my_dir/output."
+                             "The .json extension will be automatically added by the script and does not need to be provided."
+                             "If provided, an extension will not be added."
+                             "If optional --size and --offset arguments are provided, the script also generates .hex file with factory data.")
     parser.add_argument("-v", "--verbose", action="store_true",
                         help="Run this script with DEBUG logging level")
     parser.add_argument("--include_passcode", action="store_true",
@@ -543,6 +549,10 @@ def base64_str(s): return base64.b64decode(s)
                                     help="[string] Provide one of the product finishes")
     optional_arguments.add_argument("--product_color", type=str, choices=PRODUCT_COLOR_ENUM.keys(),
                                     help="[string] Provide one of the product colors.")
+    optional_arguments.add_argument("--offset", type=allow_any_int,
+                                    help="Partition offset - an address in device's NVM memory, where factory data will be stored.")
+    optional_arguments.add_argument("--size", type=allow_any_int,
+                                    help="The maximum partition size.")
     args = parser.parse_args()
 
     if args.verbose:
@@ -551,9 +561,9 @@ def base64_str(s): return base64.b64decode(s)
         log.basicConfig(format='[%(levelname)s] %(message)s', level=log.INFO)
 
     # check if json file already exist
-    if (exists(args.output) and not args.overwrite):
+    if (exists(args.output + ".json") and not args.overwrite):
         log.error(("Output file: {} already exist, to create a new one add argument '--overwrite'. "
-                  "By default overwriting is disabled").format(args.output))
+                  "By default overwriting is disabled").format(args.output+".json"))
         return
 
     if args.schema and no_jsonschema_module:
@@ -572,6 +582,13 @@ def base64_str(s): return base64.b64decode(s)
     generator = FactoryDataGenerator(args)
     generator.generate_json()
 
+    # If optional partition's offset and size were provided, generate factory data output .hex file.
+    if args.offset and args.size:
+        partition_creator = PartitionCreator(args.offset, args.size, args.output + ".json", args.output)
+        cbor_data = partition_creator.generate_cbor()
+        partition_creator.create_hex(cbor_data)
+        partition_creator.create_bin()
+
 
 if __name__ == "__main__":
     main()
diff --git a/src/app/AttributeAccessInterfaceRegistry.cpp b/src/app/AttributeAccessInterfaceRegistry.cpp
new file mode 100644
index 00000000000000..b2c885fc4b2e2b
--- /dev/null
+++ b/src/app/AttributeAccessInterfaceRegistry.cpp
@@ -0,0 +1,126 @@
+/**
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <app/AttributeAccessInterfaceRegistry.h>
+
+#include <app/AttributeAccessInterfaceCache.h>
+
+using namespace chip::app;
+
+namespace {
+
+AttributeAccessInterface * gAttributeAccessOverrides = nullptr;
+AttributeAccessInterfaceCache gAttributeAccessInterfaceCache;
+
+// shouldUnregister returns true if the given AttributeAccessInterface should be
+// unregistered.
+template <typename F>
+void UnregisterMatchingAttributeAccessInterfaces(F shouldUnregister)
+{
+    AttributeAccessInterface * prev = nullptr;
+    AttributeAccessInterface * cur  = gAttributeAccessOverrides;
+    while (cur)
+    {
+        AttributeAccessInterface * next = cur->GetNext();
+        if (shouldUnregister(cur))
+        {
+            // Remove it from the list
+            if (prev)
+            {
+                prev->SetNext(next);
+            }
+            else
+            {
+                gAttributeAccessOverrides = next;
+            }
+
+            cur->SetNext(nullptr);
+
+            // Do not change prev in this case.
+        }
+        else
+        {
+            prev = cur;
+        }
+        cur = next;
+    }
+}
+
+} // namespace
+
+void unregisterAttributeAccessOverride(AttributeAccessInterface * attrOverride)
+{
+    gAttributeAccessInterfaceCache.Invalidate();
+    UnregisterMatchingAttributeAccessInterfaces([attrOverride](AttributeAccessInterface * entry) { return entry == attrOverride; });
+}
+
+void unregisterAllAttributeAccessOverridesForEndpoint(EmberAfDefinedEndpoint * definedEndpoint)
+{
+    UnregisterMatchingAttributeAccessInterfaces(
+        [endpoint = definedEndpoint->endpoint](AttributeAccessInterface * entry) { return entry->MatchesEndpoint(endpoint); });
+}
+
+bool registerAttributeAccessOverride(AttributeAccessInterface * attrOverride)
+{
+    gAttributeAccessInterfaceCache.Invalidate();
+    for (auto * cur = gAttributeAccessOverrides; cur; cur = cur->GetNext())
+    {
+        if (cur->Matches(*attrOverride))
+        {
+            ChipLogError(InteractionModel, "Duplicate attribute override registration failed");
+            return false;
+        }
+    }
+    attrOverride->SetNext(gAttributeAccessOverrides);
+    gAttributeAccessOverrides = attrOverride;
+    return true;
+}
+
+namespace chip {
+namespace app {
+
+app::AttributeAccessInterface * GetAttributeAccessOverride(EndpointId endpointId, ClusterId clusterId)
+{
+    using CacheResult = AttributeAccessInterfaceCache::CacheResult;
+
+    AttributeAccessInterface * cached = nullptr;
+    CacheResult result                = gAttributeAccessInterfaceCache.Get(endpointId, clusterId, &cached);
+    switch (result)
+    {
+    case CacheResult::kDefinitelyUnused:
+        return nullptr;
+    case CacheResult::kDefinitelyUsed:
+        return cached;
+    case CacheResult::kCacheMiss:
+    default:
+        // Did not cache yet, search set of AAI registered, and cache if found.
+        for (app::AttributeAccessInterface * cur = gAttributeAccessOverrides; cur; cur = cur->GetNext())
+        {
+            if (cur->Matches(endpointId, clusterId))
+            {
+                gAttributeAccessInterfaceCache.MarkUsed(endpointId, clusterId, cur);
+                return cur;
+            }
+        }
+
+        // Did not find AAI registered: mark as definitely not using.
+        gAttributeAccessInterfaceCache.MarkUnused(endpointId, clusterId);
+    }
+
+    return nullptr;
+}
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/AttributeAccessInterfaceRegistry.h b/src/app/AttributeAccessInterfaceRegistry.h
new file mode 100644
index 00000000000000..f8452214cbf5f9
--- /dev/null
+++ b/src/app/AttributeAccessInterfaceRegistry.h
@@ -0,0 +1,54 @@
+/**
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <app/AttributeAccessInterface.h>
+#include <app/util/af-types.h>
+
+/**
+ * Register an attribute access override.  It will remain registered until the
+ * endpoint it's registered for is disabled (or until shutdown if it's
+ * registered for all endpoints) or until it is explicitly unregistered.
+ * Registration will fail if there is an already-registered override for the
+ * same set of attributes.
+ *
+ * @return false if there is an existing override that the new one would
+ *               conflict with.  In this case the override is not registered.
+ * @return true if registration was successful.
+ */
+bool registerAttributeAccessOverride(chip::app::AttributeAccessInterface * attrOverride);
+
+/**
+ * Unregister an attribute access override (for example if the object
+ * implementing AttributeAccessInterface is being destroyed).
+ */
+void unregisterAttributeAccessOverride(chip::app::AttributeAccessInterface * attrOverride);
+
+/**
+ * Unregister all attribute access interfaces that match this given endpoint.
+ */
+void unregisterAllAttributeAccessOverridesForEndpoint(EmberAfDefinedEndpoint * definedEndpoint);
+
+namespace chip {
+namespace app {
+
+/**
+ *  Get the registered attribute access override. nullptr when attribute access override is not found.
+ */
+AttributeAccessInterface * GetAttributeAccessOverride(EndpointId aEndpointId, ClusterId aClusterId);
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/AttributePathExpandIterator.cpp b/src/app/AttributePathExpandIterator.cpp
index 00a69552263f29..9be7ab495a4267 100644
--- a/src/app/AttributePathExpandIterator.cpp
+++ b/src/app/AttributePathExpandIterator.cpp
@@ -23,6 +23,7 @@
 #include <app/EventManagement.h>
 #include <app/GlobalAttributes.h>
 #include <app/util/att-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/TLVDebug.h>
 #include <lib/support/CodeUtils.h>
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 87508380a08083..f368f068445d39 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -146,6 +146,10 @@ source_set("constants") {
   ]
 }
 
+source_set("test-event-trigger") {
+  sources = [ "TestEventTriggerDelegate.h" ]
+}
+
 # interaction-model is a static-library because it currently requires global functions (app/util/...) that are stubbed in different test files that depend on the app static_library
 # which in tern depens on the interaction-model.
 # Using source_set prevents the unit test to build correctly.
@@ -250,6 +254,7 @@ static_library("interaction-model") {
     public_deps += [
       ":global-attributes",
       "${chip_root}/src/access",
+      "${chip_root}/src/app/dynamic_server:mock-codegen-includes",
     ]
 
     public_configs += [ ":config-controller-dynamic-server" ]
@@ -259,12 +264,34 @@ static_library("interaction-model") {
 source_set("events") {
   sources = [
     "EventHeader.h",
+    "EventLoggingDelegate.h",
     "EventLoggingTypes.h",
   ]
 
   deps = [
     ":paths",
     "${chip_root}/src/access:types",
+    "${chip_root}/src/lib/core",
+  ]
+}
+
+static_library("attribute-access") {
+  sources = [
+    "AttributeAccessInterface.cpp",
+    "AttributeAccessInterface.h",
+    "AttributeAccessInterfaceCache.h",
+    "AttributeAccessInterfaceRegistry.cpp",
+    "AttributeAccessInterfaceRegistry.h",
+  ]
+
+  deps = [
+    ":paths",
+    "${chip_root}/src/access:types",
+    "${chip_root}/src/app/MessageDef",
+    "${chip_root}/src/app/data-model",
+    "${chip_root}/src/app/util:af-types",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
   ]
 }
 
@@ -274,8 +301,6 @@ static_library("app") {
   output_name = "libCHIPDataModel"
 
   sources = [
-    "AttributeAccessInterface.cpp",
-    "AttributeAccessInterfaceCache.h",
     "AttributePathExpandIterator.cpp",
     "AttributePathExpandIterator.h",
     "AttributePersistenceProvider.h",
@@ -290,7 +315,6 @@ static_library("app") {
     "DeferredAttributePersistenceProvider.cpp",
     "DeferredAttributePersistenceProvider.h",
     "EventLogging.h",
-    "EventLoggingDelegate.h",
     "EventManagement.cpp",
     "EventManagement.h",
     "FailSafeContext.cpp",
@@ -309,15 +333,11 @@ static_library("app") {
     # "CommandHandler._h"
     # "ReadHandler._h",
     # "WriteHandler._h"
-
-    # TODO: the following items cannot be included due to platform includes not being
-    #       able to depend on src/app
-    #       Name with _ so that linter does not recognize it
-    # "_AttributeAccessInterface._h",
   ]
 
   public_deps = [
     ":app_config",
+    ":attribute-access",
     ":constants",
     ":global-attributes",
     ":interaction-model",
diff --git a/src/app/CommandResponseHelper.h b/src/app/CommandResponseHelper.h
index 48d36d1ea82013..a0209acbe32194 100644
--- a/src/app/CommandResponseHelper.h
+++ b/src/app/CommandResponseHelper.h
@@ -20,7 +20,6 @@
 
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
 #include <protocols/interaction_model/Constants.h>
 
 namespace chip {
diff --git a/src/app/EventLoggingDelegate.h b/src/app/EventLoggingDelegate.h
index 7cb1fd46eb85e7..2f86a334de7f2a 100644
--- a/src/app/EventLoggingDelegate.h
+++ b/src/app/EventLoggingDelegate.h
@@ -23,10 +23,7 @@
 
 #pragma once
 
-#include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
-#include <messaging/ExchangeContext.h>
-#include <system/SystemPacketBuffer.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
index d0b020caf96315..64c06f92354f48 100644
--- a/src/app/InteractionModelEngine.cpp
+++ b/src/app/InteractionModelEngine.cpp
@@ -31,6 +31,7 @@
 #include "access/SubjectDescriptor.h"
 #include <app/AppConfig.h>
 #include <app/RequiredPrivilege.h>
+#include <app/util/IMClusterCommandHandler.h>
 #include <app/util/af-types.h>
 #include <app/util/ember-compatibility-functions.h>
 #include <app/util/endpoint-config-api.h>
diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
index 935bca002b0dd1..baf02c6af73d1c 100644
--- a/src/app/InteractionModelEngine.h
+++ b/src/app/InteractionModelEngine.h
@@ -712,15 +712,5 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
     uint32_t mMagic = 0;
 };
 
-void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, chip::TLV::TLVReader & aReader,
-                                  CommandHandler * apCommandObj);
-
-/**
- *  Get the registered attribute access override. nullptr when attribute access override is not found.
- *
- * TODO(#16806): This function and registerAttributeAccessOverride can be member functions of InteractionModelEngine.
- */
-AttributeAccessInterface * GetAttributeAccessOverride(EndpointId aEndpointId, ClusterId aClusterId);
-
 } // namespace app
 } // namespace chip
diff --git a/src/app/WriteHandler.cpp b/src/app/WriteHandler.cpp
index 911c2f594095cd..f7f3ee1c8ae7ae 100644
--- a/src/app/WriteHandler.cpp
+++ b/src/app/WriteHandler.cpp
@@ -18,6 +18,7 @@
 
 #include "messaging/ExchangeContext.h"
 #include <app/AppConfig.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
 #include <app/MessageDef/EventPathIB.h>
 #include <app/StatusResponse.h>
diff --git a/src/app/app-platform/ContentApp.h b/src/app/app-platform/ContentApp.h
index 34b1dd5ef41893..4260263caaf921 100644
--- a/src/app/app-platform/ContentApp.h
+++ b/src/app/app-platform/ContentApp.h
@@ -36,6 +36,8 @@
 #include <controller/CHIPDeviceController.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#include <string>
+
 namespace chip {
 namespace AppPlatform {
 
diff --git a/src/app/app-platform/ContentAppPlatform.cpp b/src/app/app-platform/ContentAppPlatform.cpp
index 3d17a521996b65..5365cf17f30467 100644
--- a/src/app/app-platform/ContentAppPlatform.cpp
+++ b/src/app/app-platform/ContentAppPlatform.cpp
@@ -23,7 +23,9 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/app-platform/ContentAppPlatform.h>
 #include <app/server/Server.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
+#include <app/util/endpoint-config-api.h>
 #include <controller/CHIPCluster.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/DataModelTypes.h>
@@ -34,6 +36,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#include <string>
+
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
 using namespace chip;
diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp
index a5f49cb7c39aa1..316825bc91848c 100644
--- a/src/app/clusters/access-control-server/access-control-server.cpp
+++ b/src/app/clusters/access-control-server/access-control-server.cpp
@@ -20,13 +20,13 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
 #include <app/data-model/Encode.h>
 #include <app/server/AclStorage.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 
 using namespace chip;
diff --git a/src/app/clusters/account-login-server/account-login-delegate.h b/src/app/clusters/account-login-server/account-login-delegate.h
index 8b8a1c4ca28196..36458db98e66d8 100644
--- a/src/app/clusters/account-login-server/account-login-delegate.h
+++ b/src/app/clusters/account-login-server/account-login-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
index 684558eec0f0bc..95d94fe9b995a5 100644
--- a/src/app/clusters/account-login-server/account-login-server.cpp
+++ b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -26,11 +26,11 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
 #include <app/data-model/Encode.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
index 739b9ae13a1efa..83a0b04281b1ad 100644
--- a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
+++ b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
@@ -22,11 +22,11 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/air-quality-server/air-quality-server.cpp b/src/app/clusters/air-quality-server/air-quality-server.cpp
index f9ff17bc4fe53f..811c4722c94fec 100644
--- a/src/app/clusters/air-quality-server/air-quality-server.cpp
+++ b/src/app/clusters/air-quality-server/air-quality-server.cpp
@@ -18,6 +18,7 @@
 
 #include "app-common/zap-generated/ids/Clusters.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/clusters/air-quality-server/air-quality-server.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/application-basic-server/application-basic-delegate.h b/src/app/clusters/application-basic-server/application-basic-delegate.h
index 82696b5b77a674..e128963bc4a410 100644
--- a/src/app/clusters/application-basic-server/application-basic-delegate.h
+++ b/src/app/clusters/application-basic-server/application-basic-delegate.h
@@ -21,8 +21,10 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/AttributeAccessInterface.h>
-#include <app/util/af.h>
+#include <lib/support/CHIPMemString.h>
+
 #include <list>
+#include <string>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp
index d0c63b3112b1ff..3841b81873660b 100644
--- a/src/app/clusters/application-basic-server/application-basic-server.cpp
+++ b/src/app/clusters/application-basic-server/application-basic-server.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/application-basic-server/application-basic-server.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/data-model/Encode.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
@@ -36,6 +37,7 @@
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
 #include <list>
+#include <string>
 
 using namespace chip;
 using namespace chip::app::Clusters;
diff --git a/src/app/clusters/application-launcher-server/application-launcher-delegate.h b/src/app/clusters/application-launcher-server/application-launcher-delegate.h
index 1a945e8714db71..0d4276d1e1b35e 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-delegate.h
+++ b/src/app/clusters/application-launcher-server/application-launcher-delegate.h
@@ -22,7 +22,6 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
index 18a30bb1190659..ed6265e47c485b 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp
+++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -29,6 +29,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
@@ -36,6 +37,8 @@
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <string>
+
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 #include <app/app-platform/ContentAppPlatform.h>
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
diff --git a/src/app/clusters/audio-output-server/audio-output-delegate.h b/src/app/clusters/audio-output-server/audio-output-delegate.h
index 9d4f5fae029ca2..1477121e957c9f 100644
--- a/src/app/clusters/audio-output-server/audio-output-delegate.h
+++ b/src/app/clusters/audio-output-server/audio-output-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/AttributeAccessInterface.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp
index 297d1ea9d8d8b3..19d34b0ebb5718 100644
--- a/src/app/clusters/audio-output-server/audio-output-server.cpp
+++ b/src/app/clusters/audio-output-server/audio-output-server.cpp
@@ -27,6 +27,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
index 99bd0621ba793d..da7d23e7038933 100644
--- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp
+++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <lib/support/TypeTraits.h>
 
diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
index 91eef9d9dae899..b550026b5f1cd7 100644
--- a/src/app/clusters/basic-information/basic-information.cpp
+++ b/src/app/clusters/basic-information/basic-information.cpp
@@ -20,6 +20,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
 #include <app/SpecificationDefinedRevisions.h>
diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp
index 7e0f3ce306da32..63b085d7ee6de4 100644
--- a/src/app/clusters/bindings/bindings.cpp
+++ b/src/app/clusters/bindings/bindings.cpp
@@ -23,10 +23,10 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/bindings/bindings.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp b/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp
index b302f468aa38e4..3eb3b1216a38c7 100644
--- a/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp
+++ b/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp
@@ -23,12 +23,14 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
 #include <app/SafeAttributePersistenceProvider.h>
 #include <app/data-model/Encode.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/CHIPDeviceConfig.h>
diff --git a/src/app/clusters/channel-server/channel-delegate.h b/src/app/clusters/channel-server/channel-delegate.h
index c92ada4adda08a..24c42ebc2df053 100644
--- a/src/app/clusters/channel-server/channel-delegate.h
+++ b/src/app/clusters/channel-server/channel-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp
index 13743d875cfb42..01a1af2d3710de 100644
--- a/src/app/clusters/channel-server/channel-server.cpp
+++ b/src/app/clusters/channel-server/channel-server.cpp
@@ -17,6 +17,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/channel-server/channel-delegate.h>
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 3e883cf5165e3a..508f4b691bb0d1 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -19,7 +19,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceLayer.h>
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
index 5c13c5619c82cf..72dabb5600ff33 100644
--- a/src/app/clusters/color-control-server/color-control-server.h
+++ b/src/app/clusters/color-control-server/color-control-server.h
@@ -22,7 +22,7 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/basic-types.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
diff --git a/src/app/clusters/concentration-measurement-server/concentration-measurement-server.h b/src/app/clusters/concentration-measurement-server/concentration-measurement-server.h
index c2799fd822cdf9..c903b21c2306fd 100644
--- a/src/app/clusters/concentration-measurement-server/concentration-measurement-server.h
+++ b/src/app/clusters/concentration-measurement-server/concentration-measurement-server.h
@@ -20,9 +20,9 @@
 
 #include "concentration-measurement-cluster-objects.h"
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/data-model/Nullable.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/IntrusiveList.h>
 #include <type_traits>
diff --git a/src/app/clusters/content-app-observer/content-app-observer-delegate.h b/src/app/clusters/content-app-observer/content-app-observer-delegate.h
index d206f19ff1c174..13b6dd53da2f52 100644
--- a/src/app/clusters/content-app-observer/content-app-observer-delegate.h
+++ b/src/app/clusters/content-app-observer/content-app-observer-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/content-app-observer/content-app-observer.cpp b/src/app/clusters/content-app-observer/content-app-observer.cpp
index 08ed95c10aa679..d595b058126924 100644
--- a/src/app/clusters/content-app-observer/content-app-observer.cpp
+++ b/src/app/clusters/content-app-observer/content-app-observer.cpp
@@ -28,7 +28,7 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 
diff --git a/src/app/clusters/content-control-server/content-control-delegate.h b/src/app/clusters/content-control-server/content-control-delegate.h
index b587c3a7610a3c..e03f39f44113b7 100644
--- a/src/app/clusters/content-control-server/content-control-delegate.h
+++ b/src/app/clusters/content-control-server/content-control-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/content-control-server/content-control-server.cpp b/src/app/clusters/content-control-server/content-control-server.cpp
index 60c30f4b71845a..8c9d076a71d7c5 100644
--- a/src/app/clusters/content-control-server/content-control-server.cpp
+++ b/src/app/clusters/content-control-server/content-control-server.cpp
@@ -28,7 +28,7 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 
diff --git a/src/app/clusters/content-launch-server/content-launch-delegate.h b/src/app/clusters/content-launch-server/content-launch-delegate.h
index 8fcf70560d6179..e2a66dd559c581 100644
--- a/src/app/clusters/content-launch-server/content-launch-delegate.h
+++ b/src/app/clusters/content-launch-server/content-launch-delegate.h
@@ -22,7 +22,6 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
index 3b0a5d7f633983..2e4fb7435c0be9 100644
--- a/src/app/clusters/content-launch-server/content-launch-server.cpp
+++ b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -20,10 +20,10 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp
index 2336d7cd96d5aa..514051226fdcf5 100644
--- a/src/app/clusters/descriptor/descriptor.cpp
+++ b/src/app/clusters/descriptor/descriptor.cpp
@@ -24,7 +24,9 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 
diff --git a/src/app/clusters/device-energy-management-server/device-energy-management-server.cpp b/src/app/clusters/device-energy-management-server/device-energy-management-server.cpp
index 7836e91295412f..da1fd23d151987 100644
--- a/src/app/clusters/device-energy-management-server/device-energy-management-server.cpp
+++ b/src/app/clusters/device-energy-management-server/device-energy-management-server.cpp
@@ -17,6 +17,7 @@
 #include "device-energy-management-server.h"
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/InteractionModelEngine.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
index 83beb46484bb71..8744582c35becd 100644
--- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
+++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
@@ -17,7 +17,7 @@
 
 #include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
 
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <lib/support/ScopedBuffer.h>
 #include <protocols/bdx/DiagnosticLogs.h>
diff --git a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-delegate.h b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-delegate.h
index 5f4e77242a49e7..0de17f679eac4d 100644
--- a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-delegate.h
+++ b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp
index 40321f8c53297c..ca0fc231d6cc94 100644
--- a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp
+++ b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp
@@ -23,6 +23,7 @@
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/support/BitFlags.h>
 
 using namespace chip;
diff --git a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
index 64ab48232c4f40..cedaf4f3acc6a9 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
@@ -26,7 +26,6 @@
 #include <app-common/zap-generated/callback.h>
 #include <app/EventLogging.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <cinttypes>
 
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
index 0e65644eb935be..742afee28480f3 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -25,10 +25,11 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <cinttypes>
 
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h
index f50a666ca67721..fa7f4183723b45 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.h
+++ b/src/app/clusters/door-lock-server/door-lock-server.h
@@ -29,7 +29,7 @@
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/StatusCode.h>
diff --git a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp
index 7e9bc3d72c7d27..4f527882c7284d 100644
--- a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp
+++ b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp
@@ -20,9 +20,11 @@
 #include <protocols/interaction_model/StatusCode.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 
 using chip::Protocols::InteractionModel::Status;
 
diff --git a/src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.cpp b/src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.cpp
index 5f124a3128df05..0ac1ec956f1dab 100644
--- a/src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.cpp
+++ b/src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.cpp
@@ -20,6 +20,7 @@
 #include <protocols/interaction_model/StatusCode.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/energy-evse-server/energy-evse-server.cpp b/src/app/clusters/energy-evse-server/energy-evse-server.cpp
index b3cbbf334a2e4c..2e2f6867e094c1 100644
--- a/src/app/clusters/energy-evse-server/energy-evse-server.cpp
+++ b/src/app/clusters/energy-evse-server/energy-evse-server.cpp
@@ -17,6 +17,7 @@
 #include "energy-evse-server.h"
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/InteractionModelEngine.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/energy-preference-server/energy-preference-server.cpp b/src/app/clusters/energy-preference-server/energy-preference-server.cpp
index c3c645f3108982..789ab4ce0e7299 100644
--- a/src/app/clusters/energy-preference-server/energy-preference-server.cpp
+++ b/src/app/clusters/energy-preference-server/energy-preference-server.cpp
@@ -17,6 +17,7 @@
 
 #include "energy-preference-server.h"
 
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h> // Needed for registerAttributeAccessOverride
 
 #include <app-common/zap-generated/attributes/Accessors.h>
diff --git a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
index 5d73f36ca12b8c..7bd7043d7c7e51 100644
--- a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
+++ b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
@@ -20,9 +20,9 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/Optional.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/app/clusters/fan-control-server/fan-control-delegate.h b/src/app/clusters/fan-control-server/fan-control-delegate.h
index 8b70a046268742..4879a9836f1eb2 100644
--- a/src/app/clusters/fan-control-server/fan-control-delegate.h
+++ b/src/app/clusters/fan-control-server/fan-control-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/fan-control-server/fan-control-server.cpp b/src/app/clusters/fan-control-server/fan-control-server.cpp
index b297acdd1e80cf..d8e80b8f86f429 100644
--- a/src/app/clusters/fan-control-server/fan-control-server.cpp
+++ b/src/app/clusters/fan-control-server/fan-control-server.cpp
@@ -32,6 +32,7 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/fan-control-server/fan-control-server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <protocols/interaction_model/StatusCode.h>
diff --git a/src/app/clusters/fault-injection-server/fault-injection-server.cpp b/src/app/clusters/fault-injection-server/fault-injection-server.cpp
index 0b7385e39dd98e..ed4382b30649d6 100644
--- a/src/app/clusters/fault-injection-server/fault-injection-server.cpp
+++ b/src/app/clusters/fault-injection-server/fault-injection-server.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 
diff --git a/src/app/clusters/fixed-label-server/fixed-label-server.cpp b/src/app/clusters/fixed-label-server/fixed-label-server.cpp
index 22cca831167352..bd952f148647fc 100644
--- a/src/app/clusters/fixed-label-server/fixed-label-server.cpp
+++ b/src/app/clusters/fixed-label-server/fixed-label-server.cpp
@@ -24,6 +24,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
index 536ac205454862..776441ffc9ae75 100644
--- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
+++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -23,11 +23,11 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/Span.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index 0bd3fe0af9332f..fa3d9da3177d53 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -28,6 +28,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h
index 144bae3264e8ad..dfb5993874fad8 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <platform/GeneralFaults.h>
 
 namespace chip {
diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
index cba03ef005360d..c3cf09eb283f63 100644
--- a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
+++ b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
@@ -18,10 +18,10 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <app/util/attribute-storage.h>
 #include <credentials/GroupDataProvider.h>
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 6434edf7cfd734..add0261927c621 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <app/util/config.h>
 #include <credentials/GroupDataProvider.h>
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
index 0f71345a38d0f1..f6ab59d9f2efb0 100644
--- a/src/app/clusters/icd-management-server/icd-management-server.cpp
+++ b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -23,9 +23,9 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/icd/server/ICDNotifier.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 
 using namespace chip;
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
index 6ea8a34ca4db33..4be1133b184ee2 100644
--- a/src/app/clusters/identify-server/identify-server.cpp
+++ b/src/app/clusters/identify-server/identify-server.cpp
@@ -24,7 +24,6 @@
 #include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <tracing/macros.h>
diff --git a/src/app/clusters/keypad-input-server/keypad-input-delegate.h b/src/app/clusters/keypad-input-server/keypad-input-delegate.h
index 24c0a3fd7f4ac9..bc94ad9fd8bc97 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-delegate.h
+++ b/src/app/clusters/keypad-input-server/keypad-input-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
index e298a2cb3f2392..a9903b754591a4 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp
+++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -26,10 +26,10 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
diff --git a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp
index 7a3d47f823c409..9870c858eca766 100644
--- a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp
+++ b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 
diff --git a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h
index 5a7123c0ee78e0..933e3cdde1b479 100644
--- a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h
+++ b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h
@@ -20,7 +20,6 @@
 #include "laundry-dryer-controls-delegate.h"
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
-#include <app/util/af.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 namespace chip {
diff --git a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
index 4e58236e9b2cad..6f0f84fae808bc 100644
--- a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
+++ b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 
diff --git a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h
index c19b6f88518bf8..cbf5f146d30bcc 100644
--- a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h
+++ b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h
@@ -20,7 +20,6 @@
 #include "laundry-washer-controls-delegate.h"
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
-#include <app/util/af.h>
 
 #include <protocols/interaction_model/StatusCode.h>
 
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index 0077c59509edc9..b93bf50927c5eb 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -25,7 +25,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <app/util/util.h>
 
diff --git a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp
index 88283325c7c380..1b26542df3ed55 100644
--- a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp
+++ b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp
@@ -25,6 +25,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -208,7 +209,7 @@ void emberAfLocalizationConfigurationClusterServerInitCallback(EndpointId endpoi
 
         it->Release();
 
-        if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
+        if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND && validLocaleCached)
         {
             // If initial value is not one of the allowed values, write the valid value it.
             status = ActiveLocale::Set(endpoint, validLocale);
diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp
index fab5217908afea..76f7e6dc7415d2 100644
--- a/src/app/clusters/low-power-server/low-power-server.cpp
+++ b/src/app/clusters/low-power-server/low-power-server.cpp
@@ -27,7 +27,7 @@
 
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/StatusCode.h>
diff --git a/src/app/clusters/media-input-server/media-input-delegate.h b/src/app/clusters/media-input-server/media-input-delegate.h
index 609c66bef69ed9..f010b5a0c2b597 100644
--- a/src/app/clusters/media-input-server/media-input-delegate.h
+++ b/src/app/clusters/media-input-server/media-input-delegate.h
@@ -20,7 +20,6 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp
index 3fe13985b1ff06..267f4e987a1da1 100644
--- a/src/app/clusters/media-input-server/media-input-server.cpp
+++ b/src/app/clusters/media-input-server/media-input-server.cpp
@@ -26,6 +26,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
diff --git a/src/app/clusters/media-playback-server/media-playback-delegate.h b/src/app/clusters/media-playback-server/media-playback-delegate.h
index 12e89b25efecdc..b54948924e26dd 100644
--- a/src/app/clusters/media-playback-server/media-playback-delegate.h
+++ b/src/app/clusters/media-playback-server/media-playback-delegate.h
@@ -22,7 +22,6 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
index 9140cf58044456..b13a46d0101dd7 100644
--- a/src/app/clusters/media-playback-server/media-playback-server.cpp
+++ b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -27,6 +27,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
diff --git a/src/app/clusters/messages-server/messages-delegate.h b/src/app/clusters/messages-server/messages-delegate.h
index 6be09de781d340..7d33627ab30ae7 100644
--- a/src/app/clusters/messages-server/messages-delegate.h
+++ b/src/app/clusters/messages-server/messages-delegate.h
@@ -22,7 +22,6 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/messages-server/messages-server.cpp b/src/app/clusters/messages-server/messages-server.cpp
index 66594ae732a522..0c03c95572dc74 100644
--- a/src/app/clusters/messages-server/messages-server.cpp
+++ b/src/app/clusters/messages-server/messages-server.cpp
@@ -20,6 +20,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
diff --git a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp
index cae604c625f0cb..4a736cecd01ac6 100644
--- a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp
+++ b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/microwave-oven-control-server/microwave-oven-control-server.h>
 #include <app/clusters/mode-base-server/mode-base-server.h>
diff --git a/src/app/clusters/mode-base-server/mode-base-server.cpp b/src/app/clusters/mode-base-server/mode-base-server.cpp
index 76bd195376e9b0..bb6aac6837c0bf 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.cpp
+++ b/src/app/clusters/mode-base-server/mode-base-server.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
 #include <app/SafeAttributePersistenceProvider.h>
 #include <app/clusters/mode-base-server/mode-base-server.h>
diff --git a/src/app/clusters/mode-base-server/mode-base-server.h b/src/app/clusters/mode-base-server/mode-base-server.h
index bf7b82a79bf169..f787e9fc19f11f 100644
--- a/src/app/clusters/mode-base-server/mode-base-server.h
+++ b/src/app/clusters/mode-base-server/mode-base-server.h
@@ -22,7 +22,6 @@
 #include <app/AttributeAccessInterface.h>
 #include <app/AttributePersistenceProvider.h>
 #include <app/CommandHandlerInterface.h>
-#include <app/util/af.h>
 #include <lib/support/IntrusiveList.h>
 
 namespace chip {
diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp
index 105d1985e3990d..dceb72767bfb14 100644
--- a/src/app/clusters/mode-select-server/mode-select-server.cpp
+++ b/src/app/clusters/mode-select-server/mode-select-server.cpp
@@ -20,10 +20,10 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/mode-select-server/supported-modes-manager.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
index 8212ea9f8008dc..41741c70d266a4 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.cpp
+++ b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -22,6 +22,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/general-commissioning-server/general-commissioning-server.h>
@@ -491,12 +492,17 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw
     }
     else if (mFeatureFlags.Has(Feature::kThreadNetworkInterface))
     {
+        // NOTE: the following lines were commented out due to issue #32875. In short, a popular
+        // commissioner is passing a null SSID argument and this logic breaks interoperability as a result.
+        // The spec has some inconsistency on this which also needs to be fixed. The commissioner maker is
+        // fixing its code and will return to un-comment this code, with that work tracked by Issue #32887.
+        //
         // SSID present on Thread violates the `[WI]` conformance.
-        if (req.ssid.HasValue())
-        {
-            ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
-            return;
-        }
+        // if (req.ssid.HasValue())
+        // {
+        //     ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
+        //     return;
+        // }
 
         mCurrentOperationBreadcrumb = req.breadcrumb;
         mAsyncCommandHandle         = CommandHandler::Handle(&ctx.mCommandHandler);
diff --git a/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp b/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
index 51cc04b0f4ec24..50056387e3c359 100644
--- a/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
+++ b/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
@@ -17,8 +17,6 @@
 
 #include "occupancy-sensor-server.h"
 
-#include <app/util/af.h>
-
 #include <app-common/zap-generated/attributes/Accessors.h>
 
 #include "occupancy-hal.h"
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
index e4ba82bb8bdc2f..bc71044ae44075 100644
--- a/src/app/clusters/on-off-server/on-off-server.cpp
+++ b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -20,7 +20,7 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/data-model/Nullable.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <app/util/util.h>
 #include <protocols/interaction_model/StatusCode.h>
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index 452e6d49816c46..12fe1c43de0baf 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -25,6 +25,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
@@ -32,7 +33,6 @@
 #include <app/reporting/reporting.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <credentials/CHIPCert.h>
 #include <credentials/CertificationDeclaration.h>
diff --git a/src/app/clusters/operational-state-server/operational-state-server.cpp b/src/app/clusters/operational-state-server/operational-state-server.cpp
index 896cc0ca3856b6..50b4cd0178a8af 100644
--- a/src/app/clusters/operational-state-server/operational-state-server.cpp
+++ b/src/app/clusters/operational-state-server/operational-state-server.cpp
@@ -22,6 +22,7 @@
 #include "operational-state-server.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/reporting.h>
diff --git a/src/app/clusters/operational-state-server/operational-state-server.h b/src/app/clusters/operational-state-server/operational-state-server.h
index 5a461c272177ba..c1640cb99e9ce7 100644
--- a/src/app/clusters/operational-state-server/operational-state-server.h
+++ b/src/app/clusters/operational-state-server/operational-state-server.h
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandlerInterface.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/ota-provider/ota-provider-delegate.h b/src/app/clusters/ota-provider/ota-provider-delegate.h
index 3da8668908064c..2990977ce6ab47 100644
--- a/src/app/clusters/ota-provider/ota-provider-delegate.h
+++ b/src/app/clusters/ota-provider/ota-provider-delegate.h
@@ -22,7 +22,6 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/DecodableList.h>
-#include <app/util/af.h>
 #include <lib/core/Optional.h>
 
 namespace chip {
diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp
index 3da02b62cec9a8..80144b6e8f53a3 100644
--- a/src/app/clusters/ota-provider/ota-provider.cpp
+++ b/src/app/clusters/ota-provider/ota-provider.cpp
@@ -20,7 +20,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/Constants.h>
diff --git a/src/app/clusters/ota-requestor/ota-requestor-server.cpp b/src/app/clusters/ota-requestor/ota-requestor-server.cpp
index 8f5d1326aaf70a..b95a6d9ba24742 100644
--- a/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+++ b/src/app/clusters/ota-requestor/ota-requestor-server.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/EventLogging.h>
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
diff --git a/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp b/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp
index 7e9804286f07ef..a8a9d4e80e8189 100644
--- a/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp
+++ b/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp
@@ -25,6 +25,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp
index 717c610830b8fb..43ca1827515731 100644
--- a/src/app/clusters/power-source-server/power-source-server.cpp
+++ b/src/app/clusters/power-source-server/power-source-server.cpp
@@ -23,7 +23,7 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
-#include <app/util/af.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <lib/support/CodeUtils.h>
diff --git a/src/app/clusters/power-topology-server/power-topology-server.cpp b/src/app/clusters/power-topology-server/power-topology-server.cpp
index 3aff74760343bc..0b7072ce8eb51b 100644
--- a/src/app/clusters/power-topology-server/power-topology-server.cpp
+++ b/src/app/clusters/power-topology-server/power-topology-server.cpp
@@ -20,6 +20,7 @@
 #include <protocols/interaction_model/StatusCode.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/EventLogging.h>
 #include <app/reporting/reporting.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp b/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp
index f1adbc7d52c804..041ecc0bfa7f18 100644
--- a/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp
+++ b/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp
@@ -15,8 +15,6 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
 #include <app/CommandHandler.h>
 #include <app/util/attribute-storage.h>
 
diff --git a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
index eea313c3eb31db..5996cfe01f9eff 100644
--- a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
+++ b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
 #include <app/util/util.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
diff --git a/src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp b/src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp
index 8f79f39d5d5767..25a0be188ad7af 100644
--- a/src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp
+++ b/src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteClusterPath.h>
@@ -26,7 +27,6 @@
 #include <app/clusters/resource-monitoring-server/resource-monitoring-server.h>
 #include <app/data-model/Nullable.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CodeUtils.h>
diff --git a/src/app/clusters/sample-mei-server/sample-mei-server.cpp b/src/app/clusters/sample-mei-server/sample-mei-server.cpp
index 25bcb2aaf77b13..afeca910b455fe 100644
--- a/src/app/clusters/sample-mei-server/sample-mei-server.cpp
+++ b/src/app/clusters/sample-mei-server/sample-mei-server.cpp
@@ -4,13 +4,14 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Commands.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <app/util/util.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/clusters/scenes-server/SceneHandlerImpl.h b/src/app/clusters/scenes-server/SceneHandlerImpl.h
index 91935d2816f0e4..554ba2d7ad4893 100644
--- a/src/app/clusters/scenes-server/SceneHandlerImpl.h
+++ b/src/app/clusters/scenes-server/SceneHandlerImpl.h
@@ -17,6 +17,7 @@
 
 #include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/types_stub.h>
 #include <lib/core/DataModelTypes.h>
 
 namespace chip {
diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
index d05d7da84f9a53..860e29236fa868 100644
--- a/src/app/clusters/scenes-server/scenes-server.cpp
+++ b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -19,12 +19,14 @@
 #include "scenes-server.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/scenes-server/SceneTableImpl.h>
 #include <app/reporting/reporting.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <credentials/GroupDataProvider.h>
 #include <lib/support/CommonIterator.h>
 #include <lib/support/Span.h>
diff --git a/src/app/clusters/scenes-server/scenes-server.h b/src/app/clusters/scenes-server/scenes-server.h
index 86459fb8e82c67..81c7d41f65000c 100644
--- a/src/app/clusters/scenes-server/scenes-server.h
+++ b/src/app/clusters/scenes-server/scenes-server.h
@@ -24,6 +24,8 @@
 #include <app/clusters/scenes-server/SceneTableImpl.h>
 #include <app/data-model/DecodableList.h>
 #include <app/data-model/Nullable.h>
+#include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <credentials/GroupDataProvider.h>
 
 namespace chip {
diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
index 42efc49ee8e092..68b048e29bf5aa 100644
--- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
+++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h
@@ -25,7 +25,6 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandler.h>
-#include <app/util/af.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 /**
diff --git a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
index e024d74d61b4b8..2c0d76f79b649b 100644
--- a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
+++ b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
@@ -21,12 +21,12 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
 #include <app/InteractionModelEngine.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/Optional.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/app/clusters/switch-server/switch-server.cpp b/src/app/clusters/switch-server/switch-server.cpp
index 64cce040f0adb3..7a9dd1c0957101 100644
--- a/src/app/clusters/switch-server/switch-server.cpp
+++ b/src/app/clusters/switch-server/switch-server.cpp
@@ -24,7 +24,6 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/Optional.h>
 #include <platform/DeviceControlServer.h>
diff --git a/src/app/clusters/switch-server/switch-server.h b/src/app/clusters/switch-server/switch-server.h
index c88701620740b2..5eb12056bddd69 100644
--- a/src/app/clusters/switch-server/switch-server.h
+++ b/src/app/clusters/switch-server/switch-server.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/target-navigator-server/target-navigator-delegate.h b/src/app/clusters/target-navigator-server/target-navigator-delegate.h
index f3be65c818fbdd..dd0d80cce91cc9 100644
--- a/src/app/clusters/target-navigator-server/target-navigator-delegate.h
+++ b/src/app/clusters/target-navigator-server/target-navigator-delegate.h
@@ -22,7 +22,6 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 #include <list>
 
 namespace chip {
diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
index a6c4d3911ca70c..42c852b81c8c5a 100644
--- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp
+++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/target-navigator-server/target-navigator-server.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
diff --git a/src/app/clusters/temperature-control-server/temperature-control-server.cpp b/src/app/clusters/temperature-control-server/temperature-control-server.cpp
index 9194c168fb236a..85035c642d4092 100644
--- a/src/app/clusters/temperature-control-server/temperature-control-server.cpp
+++ b/src/app/clusters/temperature-control-server/temperature-control-server.cpp
@@ -18,6 +18,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
index 8d23cd3075db54..0d805347f792f9 100644
--- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp
+++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -24,6 +24,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Commands.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
diff --git a/src/app/clusters/thermostat-client/thermostat-client.cpp b/src/app/clusters/thermostat-client/thermostat-client.cpp
index bdd4b1a1f8394d..9b66eaf5bbe355 100644
--- a/src/app/clusters/thermostat-client/thermostat-client.cpp
+++ b/src/app/clusters/thermostat-client/thermostat-client.cpp
@@ -15,8 +15,6 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
 #include <app/CommandHandler.h>
 #include <app/util/attribute-storage.h>
 
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index c0e43593316816..214594667b9eb8 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -15,8 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
diff --git a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
index 25e0edc034a855..1325d5042caf12 100644
--- a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
+++ b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
@@ -15,10 +15,9 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/ConcreteAttributePath.h>
+#include <app/util/attribute-metadata.h>
 #include <lib/core/CHIPEncoding.h>
 
 using namespace chip::app;
diff --git a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
index cae2948e8e970e..59115c0971cffb 100644
--- a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
+++ b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp
@@ -20,10 +20,10 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-provider.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/CHIPEncoding.h>
 #include <lib/core/Optional.h>
diff --git a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
index 08e90207760603..7e61e340f1fab1 100644
--- a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
+++ b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp
@@ -26,6 +26,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -78,6 +79,12 @@ class AutoReleaseIterator
 
 TimeFormatLocalizationAttrAccess gAttrAccess;
 
+bool HasFeature(EndpointId endpoint, Feature feature)
+{
+    uint32_t featureMap;
+    return FeatureMap::Get(endpoint, &featureMap) == Status::Success ? (featureMap & to_underlying(feature)) : false;
+}
+
 CHIP_ERROR TimeFormatLocalizationAttrAccess::ReadSupportedCalendarTypes(AttributeValueEncoder & aEncoder)
 {
     DeviceLayer::DeviceInfoProvider * provider = DeviceLayer::GetDeviceInfoProvider();
@@ -202,6 +209,10 @@ Protocols::InteractionModel::Status MatterTimeFormatLocalizationClusterServerPre
 
 void emberAfTimeFormatLocalizationClusterServerInitCallback(EndpointId endpoint)
 {
+    if (!HasFeature(endpoint, Feature::kCalendarFormat))
+    {
+        return;
+    }
     CalendarTypeEnum calendarType;
     CalendarTypeEnum validType;
     Status status = ActiveCalendarType::Get(endpoint, &calendarType);
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
index 3578e2be6eb8eb..d03d7842911d51 100644
--- a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
+++ b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -24,6 +24,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/EventLogging.h>
 #include <app/server/Server.h>
diff --git a/src/app/clusters/user-label-server/user-label-server.cpp b/src/app/clusters/user-label-server/user-label-server.cpp
index 49a557b778baa2..5131ed44aaca2b 100644
--- a/src/app/clusters/user-label-server/user-label-server.cpp
+++ b/src/app/clusters/user-label-server/user-label-server.cpp
@@ -24,6 +24,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
 #include <credentials/FabricTable.h>
diff --git a/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp b/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp
index 120cd2b3dd8416..82dd45464cfde4 100644
--- a/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp
+++ b/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp
@@ -31,6 +31,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
diff --git a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
index ec989bbc588372..3141094d1fa3c7 100644
--- a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
+++ b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
@@ -26,6 +26,7 @@
 #include <app/clusters/wake-on-lan-server/wake-on-lan-server.h>
 
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Encode.h>
diff --git a/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp b/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
index 3cf9239ddff59e..d24bc02227b272 100644
--- a/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
+++ b/src/app/clusters/wifi-network-diagnostics-server/wifi-network-diagnostics-server.cpp
@@ -20,10 +20,10 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/core/Optional.h>
 #include <platform/DiagnosticDataProvider.h>
diff --git a/src/app/clusters/window-covering-server/window-covering-delegate.h b/src/app/clusters/window-covering-server/window-covering-delegate.h
index dac189e7f9e564..4b8b4e88401206 100644
--- a/src/app/clusters/window-covering-server/window-covering-delegate.h
+++ b/src/app/clusters/window-covering-server/window-covering-delegate.h
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
index ba7d74c56583a5..bfa5e1e97fa588 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.cpp
+++ b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -23,7 +23,6 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/reporting/reporting.h>
 #include <app/util/af-types.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <lib/support/TypeTraits.h>
diff --git a/config/cc13x2_26x2/toolchain/BUILD.gn b/src/app/dynamic_server/BUILD.gn
similarity index 53%
rename from config/cc13x2_26x2/toolchain/BUILD.gn
rename to src/app/dynamic_server/BUILD.gn
index 5655b6579f0469..5955512da74188 100644
--- a/config/cc13x2_26x2/toolchain/BUILD.gn
+++ b/src/app/dynamic_server/BUILD.gn
@@ -12,20 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
-import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
+# This config is to allow ota-provider or similar to include
+# `_attribute-storage.h` (underscore to make linter not recognize this as a
+# reference) for overriden function access that are overriden by
+# DynamicDispatcher
+#
+# This feels awkward and should be cleaned up once we manage to isolate
+# generated code more.
+config("mock-codegen-config") {
+  include_dirs = [ "mock_includes" ]
+}
+
+source_set("mock-codegen-includes") {
+  sources = [ "mock_includes/zap-generated/endpoint_config.h" ]
 
-arm_toolchain("cc13x2x7_26x2x7_lock_app") {
-  toolchain_args = {
-    current_os = "freertos"
-    import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
-  }
-  arm_toolchain("cc13x2x7_26x2x7_all_clusters_app") {
-    toolchain_args = {
-      current_os = "freertos"
-      import("${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni")
-    }
-  }
+  public_configs = [ ":mock-codegen-config" ]
 }
diff --git a/src/app/dynamic_server/DynamicDispatcher.cpp b/src/app/dynamic_server/DynamicDispatcher.cpp
index c54e7d87b96a0c..5f9476aa6fd40a 100644
--- a/src/app/dynamic_server/DynamicDispatcher.cpp
+++ b/src/app/dynamic_server/DynamicDispatcher.cpp
@@ -23,7 +23,6 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
-#include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
@@ -189,13 +188,6 @@ CHIP_ERROR WriteSingleClusterData(const SubjectDescriptor & aSubjectDescriptor,
     return aWriteHandler->AddStatus(aPath, status);
 }
 
-// No attribute access overrides on iOS and Android for now.
-// TODO (#16806): This function can be moved to InteractionModelEngine.
-AttributeAccessInterface * GetAttributeAccessOverride(EndpointId endpointId, ClusterId clusterId)
-{
-    return nullptr;
-}
-
 void DispatchSingleClusterCommand(const ConcreteCommandPath & aPath, TLV::TLVReader & aReader, CommandHandler * aCommandObj)
 {
     // This command passed ServerClusterCommandExists so we know it's one of our
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/src/app/dynamic_server/mock_includes/zap-generated/endpoint_config.h
similarity index 57%
rename from examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
rename to src/app/dynamic_server/mock_includes/zap-generated/endpoint_config.h
index 30f5633cc3bc7f..80fa88048d1782 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ b/src/app/dynamic_server/mock_includes/zap-generated/endpoint_config.h
@@ -1,8 +1,5 @@
 /*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
+ *    Copyright (c) 2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,14 +13,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
 #pragma once
 
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
+#include <app/util/endpoint-config-defines.h>
+#include <lib/core/CHIPConfig.h>
+
+// Some overrides to see that this is not used as a real "endpoint_config" that contains data
+#define GENERATED_DEFAULTS #error "Not a real codegen. This is a temporary include for dynamic-overrides only"
+#define GENERATED_CLUSTERS #error "Not a real codegen. This is a temporary include for dynamic-overrides only"
diff --git a/src/app/icd/server/BUILD.gn b/src/app/icd/server/BUILD.gn
index a6c5096dde7d0c..c100cc7d041e84 100644
--- a/src/app/icd/server/BUILD.gn
+++ b/src/app/icd/server/BUILD.gn
@@ -81,6 +81,7 @@ source_set("manager") {
     ":notifier",
     ":observer",
     "${chip_root}/src/app:subscription-info-provider",
+    "${chip_root}/src/app:test-event-trigger",
     "${chip_root}/src/credentials:credentials",
     "${chip_root}/src/messaging",
   ]
diff --git a/src/app/icd/server/ICDManager.cpp b/src/app/icd/server/ICDManager.cpp
index f4442e85972ee2..5f93946fa8eebf 100644
--- a/src/app/icd/server/ICDManager.cpp
+++ b/src/app/icd/server/ICDManager.cpp
@@ -26,7 +26,14 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/LockTracker.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
-#include <stdlib.h>
+
+namespace {
+enum class ICDTestEventTriggerEvent : uint64_t
+{
+    kAddActiveModeReq    = 0x0046'0000'00000001,
+    kRemoveActiveModeReq = 0x0046'0000'00000002,
+};
+} // namespace
 
 namespace chip {
 namespace app {
@@ -643,6 +650,27 @@ void ICDManager::ExtendActiveMode(Milliseconds16 extendDuration)
     }
 }
 
+CHIP_ERROR ICDManager::HandleEventTrigger(uint64_t eventTrigger)
+{
+    ICDTestEventTriggerEvent trigger = static_cast<ICDTestEventTriggerEvent>(eventTrigger);
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
+
+    switch (trigger)
+    {
+    case ICDTestEventTriggerEvent::kAddActiveModeReq:
+        SetKeepActiveModeRequirements(KeepActiveFlag::kTestEventTriggerActiveMode, true);
+        break;
+    case ICDTestEventTriggerEvent::kRemoveActiveModeReq:
+        SetKeepActiveModeRequirements(KeepActiveFlag::kTestEventTriggerActiveMode, false);
+        break;
+    default:
+        err = CHIP_ERROR_INVALID_ARGUMENT;
+        break;
+    }
+
+    return err;
+}
+
 ICDManager::ObserverPointer * ICDManager::RegisterObserver(ICDStateObserver * observer)
 {
     return mStateObserverPool.CreateObject(observer);
diff --git a/src/app/icd/server/ICDManager.h b/src/app/icd/server/ICDManager.h
index 058285802eb309..69dfdbf6a88863 100644
--- a/src/app/icd/server/ICDManager.h
+++ b/src/app/icd/server/ICDManager.h
@@ -16,28 +16,28 @@
  */
 #pragma once
 
-#include <app-common/zap-generated/cluster-enums.h>
-
 #include <app/icd/server/ICDServerConfig.h>
 
-#if CHIP_CONFIG_ENABLE_ICD_CIP
-#include <app/icd/server/ICDCheckInSender.h>   // nogncheck
-#include <app/icd/server/ICDMonitoringTable.h> // nogncheck
-#endif                                         // CHIP_CONFIG_ENABLE_ICD_CIP
-
+#include <app-common/zap-generated/cluster-enums.h>
+#include <app/AppConfig.h>
 #include <app/SubscriptionsInfoProvider.h>
+#include <app/TestEventTriggerDelegate.h>
 #include <app/icd/server/ICDConfigurationData.h>
 #include <app/icd/server/ICDNotifier.h>
 #include <app/icd/server/ICDStateObserver.h>
 #include <credentials/FabricTable.h>
 #include <crypto/SessionKeystore.h>
-#include <functional>
 #include <lib/support/BitFlags.h>
 #include <messaging/ExchangeMgr.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <system/SystemClock.h>
 
+#if CHIP_CONFIG_ENABLE_ICD_CIP
+#include <app/icd/server/ICDCheckInSender.h>   // nogncheck
+#include <app/icd/server/ICDMonitoringTable.h> // nogncheck
+#endif                                         // CHIP_CONFIG_ENABLE_ICD_CIP
+
 namespace chip {
 namespace Crypto {
 using SymmetricKeystore = SessionKeystore;
@@ -54,7 +54,7 @@ class TestICDManager;
 /**
  * @brief ICD Manager is responsible of processing the events and triggering the correct action for an ICD
  */
-class ICDManager : public ICDListener
+class ICDManager : public ICDListener, public TestEventTriggerHandler
 {
 public:
     // This structure is used for the creation an ObjectPool of ICDStateObserver pointers
@@ -129,6 +129,15 @@ class ICDManager : public ICDListener
      */
     uint32_t StayActiveRequest(uint32_t stayActiveDuration);
 
+    /**
+     * @brief TestEventTriggerHandler for the ICD feature set
+     *
+     * @param eventTrigger Event trigger to handle.
+     * @return CHIP_ERROR CHIP_NO_ERROR - No erros during the processing
+     *                    CHIP_ERROR_INVALID_ARGUMENT - eventTrigger isn't a valid value
+     */
+    CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override;
+
 #if CHIP_CONFIG_ENABLE_ICD_CIP
     void SendCheckInMsgs();
 
@@ -165,14 +174,14 @@ class ICDManager : public ICDListener
     void OnSubscriptionReport() override;
 
 protected:
+    friend class TestICDManager;
+
     /**
      * @brief Hepler function that extends the Active Mode duration as well as the Active Mode Jitter timer for the transition to
      * iddle mode.
      */
     void ExtendActiveMode(System::Clock::Milliseconds16 extendDuration);
 
-    friend class TestICDManager;
-
     static void OnIdleModeDone(System::Layer * aLayer, void * appState);
     static void OnActiveModeDone(System::Layer * aLayer, void * appState);
 
diff --git a/src/app/icd/server/ICDNotifier.h b/src/app/icd/server/ICDNotifier.h
index 5db14503a296d7..785fd1e08c9879 100644
--- a/src/app/icd/server/ICDNotifier.h
+++ b/src/app/icd/server/ICDNotifier.h
@@ -39,11 +39,12 @@ class ICDListener
 public:
     enum class KeepActiveFlagsValues : uint8_t
     {
-        kCommissioningWindowOpen = 0x01,
-        kFailSafeArmed           = 0x02,
-        kExchangeContextOpen     = 0x04,
-        kCheckInInProgress       = 0x08,
-        kInvalidFlag             = 0x10, // Move up when adding more flags
+        kCommissioningWindowOpen    = 0x01,
+        kFailSafeArmed              = 0x02,
+        kExchangeContextOpen        = 0x04,
+        kCheckInInProgress          = 0x08,
+        kTestEventTriggerActiveMode = 0x10,
+        kInvalidFlag                = 0x20, // Move up when adding more flags
     };
 
     enum class ICDManagementEvents : uint8_t
diff --git a/src/app/reporting/reporting.cpp b/src/app/reporting/reporting.cpp
index 8ed06a8e13c857..0ee0ca954aaf6c 100644
--- a/src/app/reporting/reporting.cpp
+++ b/src/app/reporting/reporting.cpp
@@ -18,7 +18,7 @@
 
 #include <app/AttributePathParams.h>
 #include <app/InteractionModelEngine.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <platform/LockTracker.h>
 
 using namespace chip;
diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn
index 7c661464bbaea3..51a259c86d2552 100644
--- a/src/app/server/BUILD.gn
+++ b/src/app/server/BUILD.gn
@@ -52,6 +52,7 @@ static_library("server") {
 
   public_deps = [
     "${chip_root}/src/app",
+    "${chip_root}/src/app:test-event-trigger",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/app/icd/server:observer",
     "${chip_root}/src/lib/address_resolve",
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index eff11222bfae7b..57abf8087f59ca 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -348,6 +348,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 
     mICDManager.Init(mDeviceStorage, &GetFabricTable(), mSessionKeystore, &mExchangeMgr,
                      chip::app::InteractionModelEngine::GetInstance());
+
+    // Register Test Event Trigger Handler
+    mTestEventTriggerDelegate->AddHandler(&mICDManager);
+
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     // This code is necessary to restart listening to existing groups after a reboot
@@ -592,6 +596,8 @@ void Server::Shutdown()
     Access::ResetAccessControlToDefault();
     Credentials::SetGroupDataProvider(nullptr);
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
+    // Remove Test Event Trigger Handler
+    mTestEventTriggerDelegate->RemoveHandler(&mICDManager);
     mICDManager.Shutdown();
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     mAttributePersister.Shutdown();
diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp
index c88b459742de16..c314421d4e3a9a 100644
--- a/src/app/tests/TestCommissionManager.cpp
+++ b/src/app/tests/TestCommissionManager.cpp
@@ -15,6 +15,7 @@
  *    limitations under the License.
  */
 
+#include <app/TestEventTriggerDelegate.h>
 #include <app/TimerDelegates.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/server/CommissioningWindowManager.h>
@@ -100,6 +101,8 @@ void InitializeChip(nlTestSuite * suite)
     static chip::app::DefaultTimerDelegate sTimerDelegate;
     static chip::app::reporting::ReportSchedulerImpl sReportScheduler(&sTimerDelegate);
     initParams.reportScheduler = &sReportScheduler;
+    static chip::SimpleTestEventTriggerDelegate sSimpleTestEventTriggerDelegate;
+    initParams.testEventTriggerDelegate = &sSimpleTestEventTriggerDelegate;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     err = chip::Server::GetInstance().Init(initParams);
 
diff --git a/src/app/tests/TestICDManager.cpp b/src/app/tests/TestICDManager.cpp
index ac8c220351fd86..fd93a146cf2755 100644
--- a/src/app/tests/TestICDManager.cpp
+++ b/src/app/tests/TestICDManager.cpp
@@ -17,6 +17,7 @@
  */
 #include <app/EventManagement.h>
 #include <app/SubscriptionsInfoProvider.h>
+#include <app/TestEventTriggerDelegate.h>
 #include <app/icd/server/ICDConfigurationData.h>
 #include <app/icd/server/ICDManager.h>
 #include <app/icd/server/ICDNotifier.h>
@@ -66,6 +67,13 @@ constexpr uint8_t kKeyBuffer2b[] = {
     0xf2, 0xe2, 0xd2, 0xc2, 0xb2, 0xa2, 0x92, 0x82, 0x72, 0x62, 0x52, 0x42, 0x32, 0x22, 0x12, 0x02
 };
 
+// Taken from the ICDManager Implementation
+enum class ICDTestEventTriggerEvent : uint64_t
+{
+    kAddActiveModeReq    = 0x0046'0000'00000001,
+    kRemoveActiveModeReq = 0x0046'0000'00000002,
+};
+
 class TestICDStateObserver : public app::ICDStateObserver
 {
 public:
@@ -115,6 +123,7 @@ class TestContext : public chip::Test::AppContext
     // Performs setup for each individual test in the test suite
     CHIP_ERROR SetUp() override
     {
+
         ReturnErrorOnFailure(chip::Test::AppContext::SetUp());
         mICDManager.Init(&testStorage, &GetFabricTable(), &mKeystore, &GetExchangeManager(), &mSubInfoProvider);
         mICDManager.RegisterObserver(&mICDStateObserver);
@@ -692,6 +701,26 @@ class TestICDManager
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.ShouldCheckInMsgsBeSentAtActiveModeFunction(kTestFabricIndex1, kClientNodeId11));
     }
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
+
+    static void TestHandleTestEventTriggerActiveModeReq(nlTestSuite * aSuite, void * aContext)
+    {
+        TestContext * ctx = static_cast<TestContext *>(aContext);
+
+        // Verify That ICDManager starts in Idle
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
+
+        // Add ActiveMode req for the Test event trigger event
+        ctx->mICDManager.HandleEventTrigger(static_cast<uint64_t>(ICDTestEventTriggerEvent::kAddActiveModeReq));
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
+
+        // Advance clock by the ActiveModeDuration and check that the device is still in ActiveMode
+        AdvanceClockAndRunEventLoop(ctx, ICDConfigurationData::GetInstance().GetActiveModeDuration() + 1_ms32);
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
+
+        // Remove req and device should go to IdleMode
+        ctx->mICDManager.HandleEventTrigger(static_cast<uint64_t>(ICDTestEventTriggerEvent::kRemoveActiveModeReq));
+        NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
+    }
 };
 
 } // namespace app
@@ -710,6 +739,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("TestICDCounter", TestICDManager::TestICDCounter),
     NL_TEST_DEF("TestICDStayActive", TestICDManager::TestICDMStayActive),
     NL_TEST_DEF("TestShouldCheckInMsgsBeSentAtActiveModeFunction", TestICDManager::TestShouldCheckInMsgsBeSentAtActiveModeFunction),
+    NL_TEST_DEF("TestHandleTestEventTriggerActiveModeReq", TestICDManager::TestHandleTestEventTriggerActiveModeReq),
     NL_TEST_SENTINEL(),
 };
 
diff --git a/src/app/tests/TestPowerSourceCluster.cpp b/src/app/tests/TestPowerSourceCluster.cpp
index e9983368d57d65..46371b332a1804 100644
--- a/src/app/tests/TestPowerSourceCluster.cpp
+++ b/src/app/tests/TestPowerSourceCluster.cpp
@@ -19,7 +19,7 @@
 #include "lib/support/CHIPMem.h"
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/clusters/power-source-server/power-source-server.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVDebug.h>
@@ -31,7 +31,6 @@
 #include <messaging/Flags.h>
 #include <nlunit-test.h>
 #include <protocols/interaction_model/Constants.h>
-#include <type_traits>
 
 #include <vector>
 
diff --git a/src/app/tests/suites/TestPurposefulFailureExtraReportingOnToggle.yaml b/src/app/tests/suites/TestPurposefulFailureExtraReportingOnToggle.yaml
new file mode 100644
index 00000000000000..46345752aace08
--- /dev/null
+++ b/src/app/tests/suites/TestPurposefulFailureExtraReportingOnToggle.yaml
@@ -0,0 +1,58 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name:
+    Test that "passes" if turning on On/Off cluster reports Level Control things
+
+config:
+    nodeId: 0x12344321
+    cluster: "On/Off"
+    endpoint: 1
+    # We expect our test to time out, so set a timeout that's not too long, but
+    # long enough that if the server does report the attribute change we will
+    # almost certianly see it.
+    timeout: 5
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Turn off the light"
+      command: "Off"
+
+    - label: "Subscribe LevelControl RemainingTime Attribute"
+      command: "subscribeAttribute"
+      cluster: "LevelControl"
+      attribute: "RemainingTime"
+      minInterval: 0
+      maxInterval: 5
+      response:
+          value: 0
+
+    - label: "Turn on the light to see attribute change, if any"
+      command: "On"
+
+    - label: "Check for attribute report"
+      command: "waitForReport"
+      cluster: "LevelControl"
+      attribute: "RemainingTime"
+      # This test should fail, since there should be no reporting for an
+      # attribute that did not actually change.
+      response:
+          value: 0
diff --git a/src/app/tests/suites/TestPurposefulFailureNotNullConstraint.yaml b/src/app/tests/suites/TestPurposefulFailureNotNullConstraint.yaml
new file mode 100644
index 00000000000000..18179fb3e3361a
--- /dev/null
+++ b/src/app/tests/suites/TestPurposefulFailureNotNullConstraint.yaml
@@ -0,0 +1,37 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name:
+    Test that notValue constraint that says value must not be null fails if the
+    value is null.
+
+config:
+    nodeId: 0x12344321
+    cluster: "Unit Testing"
+    endpoint: 1
+
+tests:
+    - label: "Write attribute NULLABLE_INT8U null value"
+      command: "writeAttribute"
+      attribute: "nullable_int8u"
+      arguments:
+          value: null
+
+    - label: "Read attribute NULLABLE_INT8U null value with constraint"
+      command: "readAttribute"
+      attribute: "nullable_int8u"
+      response:
+          constraints:
+              # This should fail.
+              notValue: null
diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_6.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_6.yaml
index 7c353c2b2382b5..9738fefb7024fe 100644
--- a/src/app/tests/suites/certification/Test_TC_ACE_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACE_1_6.yaml
@@ -100,10 +100,13 @@ tests:
                     }
 
     - label:
-          "Step 2: TH binds GroupId to GroupKeySet with entries as follows: List
-          item 1: GroupId: 0x0103, GroupKeySetId: 0x01a3, List item 2: GroupId:
-          0x0104, GroupKeySetId: 0x01a4, List item 3: GroupId: 0x0105,
-          GroupKeySetId: 0x01a3"
+          "Step 2: TH binds GroupIds 0x0101 and 0x0102 with GroupKeySetID 0x01a1
+          and GroupId 0x0103 with GroupKeySetID 0x01a3 in the GroupKeyMap
+          attribute list on GroupKeyManagement cluster by writing the
+          GroupKeyMap attribute with three entries as follows: List item 1:
+          GroupId: 0x0101, GroupKeySetId: 0x01a1, List item 2: GroupId: 0x0102,
+          GroupKeySetId: 0x01a1, List item 3: GroupId: 0x0103, GroupKeySetId:
+          0x01a3"
       cluster: "Group Key Management"
       command: "writeAttribute"
       attribute: "GroupKeyMap"
@@ -175,7 +178,7 @@ tests:
 
     - label:
           "Step 5: TH sends a AddGroup Command to the Groups cluster on Endpoint
-          PIXIT.G.ENDPOINT over CASE with the GroupID field set to 0x0101 and
+          PIXIT.G.ENDPOINT over CASE with the GroupID field set to 0x0104 and
           the GroupName set to an empty string"
       cluster: "Groups"
       endpoint: Groups.Endpoint
@@ -183,7 +186,7 @@ tests:
       arguments:
           values:
               - name: GroupID
-                value: 0x0101
+                value: 0x0104
               - name: GroupName
                 value: ""
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
index 2c7be1eebcf05e..be5f6f789c5c04 100644
--- a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
@@ -59,7 +59,6 @@ tests:
               - name: "Status"
                 value: 0
 
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/28992
     - label:
           "Step 1: TH sends a GetSetupPIN command to the DUT with test values
           provided by the product maker."
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
index ac024c5644ef45..7955c2fa199d11 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -29,37 +29,6 @@ config:
         defaultValue: "hex:1111111122222222"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on Thread network "
-      verification: |
-          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
-
-          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
-          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
-          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
-          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
-          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
-          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
-          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
-          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
-          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
-          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 64335127d530ae..4d3f94418afef9 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -36,32 +36,6 @@ config:
         defaultValue: "hex:70617373776f7264313233"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on WiFi network"
-      verification: |
-          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
-
-          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
-          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
-          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
-          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
-          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
index ec89cc137f89e4..c8d8fa91f34633 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
@@ -43,32 +43,6 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on WiFi network"
-      verification: |
-          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
-
-          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
-          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
-          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
-          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
-          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
index 36fa1ca62ceb30..49422e215be178 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
@@ -43,37 +43,6 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on Thread network "
-      verification: |
-          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
-
-          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
-          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
-          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
-          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
-          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
-          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
-          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
-          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
-          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
-          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after successfull Commission"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
index b8fed5f79afbc5..6b5eb06b47e5cf 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
@@ -29,37 +29,6 @@ config:
         defaultValue: "hex:1111111122222222"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on Thread network "
-      verification: |
-          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
-
-          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
-          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
-          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
-          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
-          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
-          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
-          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
-          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
-          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
-          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label:
           "Step 1: TH sends ScanNetworks command to the DUT with the SSID field
           omitted and the Breadcrumb field set to 1"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
index aaf348393320e1..f020b75bee18dd 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
@@ -29,32 +29,6 @@ config:
         defaultValue: "hex:47524C50726976617465"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition : Commission TH and DUT on WiFi network"
-      verification: |
-          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
-
-          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
-          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
-          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
-          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
-          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
index 892ae4e63059b5..cb12c7a35ac6ed 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
@@ -32,32 +32,6 @@ config:
         defaultValue: "hex:70617373776f7264313233"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on WiFi network"
-      verification: |
-          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
-
-          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
-          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
-          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
-          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
-          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
index aeac82e7857335..9ec38988742f85 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
@@ -28,37 +28,6 @@ config:
         defaultValue: "hex:1111111122222222"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on Thread network"
-      verification: |
-          ./chip-tool pairing ble-thread 0x12344321 <operationalDataset> <setup-pin-code> <discriminator>
-
-          [1698660637.937566][6429:6431] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698660637.937644][6429:6431] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698660637.937705][6429:6431] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698660637.937750][6429:6431] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698660637.937812][6429:6431] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698660637.937863][6429:6431] CHIP:DIS: Closing all BLE connections
-          [1698660637.937911][6429:6431] CHIP:IN: Clearing BLE pending packets.
-          [1698660637.938582][6429:6431] CHIP:BLE: Auto-closing end point's BLE connection.
-          [1698660637.938645][6429:6431] CHIP:DL: Closing BLE GATT connection (con 0xffff9c034bb0)
-          [1698660637.938805][6429:6430] CHIP:DL: BluezDisconnect peer=F7:D4:24:D2:4A:1F
-          [1698660638.365208][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: MarkForEviction Type:1 LSID:62220
-          [1698660638.365311][6429:6431] CHIP:SC: SecureSession[0xffff9400f900, LSID:62220]: State change 'kActive' --> 'kPendingEviction'
-          [1698660638.365440][6429:6431] CHIP:IN: SecureSession[0xffff9400f900]: Released - Type:1 LSID:62220
-          [1698660638.365529][6429:6431] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698660638.365598][6429:6431] CHIP:TOO: Device commissioning completed with success
-          [1698660638.365873][6429:6431] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
index 66e3207b24c22b..8ba579ca9266ba 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -29,32 +29,6 @@ config:
         defaultValue: "hex:7A6967626565686F6D65"
 
 tests:
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/30196
-    - label: "Precondition: Commission TH and DUT on WiFi network"
-      verification: |
-          ./chip-tool pairing ble-wifi 0x12344321 <ssid> <password> <setup-pin-code> <discriminator>
-
-          [1698912271.738597][32363:32366] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
-          [1698912271.738606][32363:32366] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1698912271.738613][32363:32366] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-          [1698912271.738617][32363:32366] CHIP:CTL: Commissioning stage next step: 'SendComplete' -> 'Cleanup'
-          [1698912271.738622][32363:32366] CHIP:CTL: Performing next commissioning step 'Cleanup'
-          [1698912271.738639][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: MarkForEviction Type:1 LSID:50170
-          [1698912271.738642][32363:32366] CHIP:SC: SecureSession[0x7fbb04014a50, LSID:50170]: State change 'kActive' --> 'kPendingEviction'
-          [1698912271.738666][32363:32366] CHIP:IN: SecureSession[0x7fbb04014a50]: Released - Type:1 LSID:50170
-          [1698912271.738672][32363:32366] CHIP:CTL: Successfully finished commissioning step 'Cleanup'
-          [1698912271.738677][32363:32366] CHIP:TOO: Device commissioning completed with success
-          [1698912271.738691][32363:32366] CHIP:DMG: ICR moving to [AwaitingDe]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Precondition: TH reads FeatureMap attribute from the DUT"
       command: "readAttribute"
       attribute: "FeatureMap"
diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml
index 1fbbdab81d8a26..638b78cd2ac59d 100644
--- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml
@@ -36,10 +36,10 @@ tests:
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}' 1 1
+          ./chip-tool contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 1 1 --Data '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}'
 
 
-          ./chip-tv-casting-app contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}' 1 1
+          ./chip-tv-casting-app contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 1 1 --Data '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}'
 
 
           On TH (tv-app), Verify the launch content command is received successfully.
diff --git a/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml
index 832b21e12ac63b..b2f927d14fd554 100644
--- a/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml
@@ -48,9 +48,9 @@ tests:
 
           On the TH(Chip-tool) Log, Verify featureMap value is 0 and below is the sample log provided for the raspi platform:
 
-          [1705923720.577354][23553:23555] CHIP:DMG: }
-          [1705923720.577393][23553:23555] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009F Attribute 0x0000_FFFC DataVersion: 2217281174
-          [1705923720.577412][23553:23555] CHIP:TOO:   FeatureMap: 1
+          [1707803263.396282][12695:12697] CHIP:DMG: }
+          [1707803263.396447][12695:12697] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009F Attribute 0x0000_FFFC DataVersion: 3404644350
+          [1707803263.396492][12695:12697] CHIP:TOO:   FeatureMap: 0
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
index 734282a82e7ca8..2ce0e296bbc2d5 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -136,82 +136,87 @@ tests:
       verification: |
           For all the Endpoint id’s listed in step 1a run the following steps. For all the server list entries listed in the output - Convert them to Hex values. For example 29 is 0x001D. Verify that these are also present in the device_type.json. Every server cluster listed in the JSON should correspond to a number here in the output.
 
+          The cluster ID's listed in the below log is from the All-Cluster-app. Please run the below command in all the Reference apps (bridge-app, tv-app, microwave-oven-app, Lock-app, Energy-Management-app and Thermostat-app).
+
           ./chip-tool descriptor read server-list 1 1
 
-          Verify ServerList entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ServerList entries are 70.
-
-          [1693218196.392903][13451:13453] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 3853201227
-          [1693218196.393030][13451:13453] CHIP:TOO:   ServerList: 70 entries
-          [1693218196.393047][13451:13453] CHIP:TOO:     [1]: 3
-          [1693218196.393059][13451:13453] CHIP:TOO:     [2]: 4
-          [1693218196.393071][13451:13453] CHIP:TOO:     [3]: 5
-          [1693218196.393081][13451:13453] CHIP:TOO:     [4]: 6
-          [1693218196.393092][13451:13453] CHIP:TOO:     [5]: 7
-          [1693218196.393103][13451:13453] CHIP:TOO:     [6]: 8
-          [1693218196.393114][13451:13453] CHIP:TOO:     [7]: 15
-          [1693218196.393125][13451:13453] CHIP:TOO:     [8]: 29
-          [1693218196.393136][13451:13453] CHIP:TOO:     [9]: 30
-          [1693218196.393147][13451:13453] CHIP:TOO:     [10]: 37
-          [1693218196.393159][13451:13453] CHIP:TOO:     [11]: 47
-          [1693218196.393169][13451:13453] CHIP:TOO:     [12]: 59
-          [1693218196.393180][13451:13453] CHIP:TOO:     [13]: 64
-          [1693218196.393191][13451:13453] CHIP:TOO:     [14]: 65
-          [1693218196.393201][13451:13453] CHIP:TOO:     [15]: 69
-          [1693218196.393212][13451:13453] CHIP:TOO:     [16]: 80
-          [1693218196.393222][13451:13453] CHIP:TOO:     [17]: 81
-          [1693218196.393233][13451:13453] CHIP:TOO:     [18]: 82
-          [1693218196.393244][13451:13453] CHIP:TOO:     [19]: 83
-          [1693218196.393254][13451:13453] CHIP:TOO:     [20]: 84
-          [1693218196.393265][13451:13453] CHIP:TOO:     [21]: 85
-          [1693218196.393276][13451:13453] CHIP:TOO:     [22]: 86
-          [1693218196.393286][13451:13453] CHIP:TOO:     [23]: 87
-          [1693218196.393297][13451:13453] CHIP:TOO:     [24]: 89
-          [1693218196.393308][13451:13453] CHIP:TOO:     [25]: 91
-          [1693218196.393318][13451:13453] CHIP:TOO:     [26]: 92
-          [1693218196.393329][13451:13453] CHIP:TOO:     [27]: 93
-          [1693218196.393340][13451:13453] CHIP:TOO:     [28]: 96
-          [1693218196.393350][13451:13453] CHIP:TOO:     [29]: 97
-          [1693218196.393362][13451:13453] CHIP:TOO:     [30]: 113
-          [1693218196.393373][13451:13453] CHIP:TOO:     [31]: 114
-          [1693218196.393384][13451:13453] CHIP:TOO:     [32]: 257
-          [1693218196.393394][13451:13453] CHIP:TOO:     [33]: 258
-          [1693218196.393405][13451:13453] CHIP:TOO:     [34]: 259
-          [1693218196.393416][13451:13453] CHIP:TOO:     [35]: 512
-          [1693218196.393427][13451:13453] CHIP:TOO:     [36]: 513
-          [1693218196.393437][13451:13453] CHIP:TOO:     [37]: 514
-          [1693218196.393448][13451:13453] CHIP:TOO:     [38]: 516
-          [1693218196.393459][13451:13453] CHIP:TOO:     [39]: 768
-          [1693218196.393470][13451:13453] CHIP:TOO:     [40]: 769
-          [1693218196.393481][13451:13453] CHIP:TOO:     [41]: 1024
-          [1693218196.393492][13451:13453] CHIP:TOO:     [42]: 1026
-          [1693218196.393503][13451:13453] CHIP:TOO:     [43]: 1027
-          [1693218196.393514][13451:13453] CHIP:TOO:     [44]: 1028
-          [1693218196.393525][13451:13453] CHIP:TOO:     [45]: 1029
-          [1693218196.393536][13451:13453] CHIP:TOO:     [46]: 1030
-          [1693218196.393546][13451:13453] CHIP:TOO:     [47]: 1036
-          [1693218196.393557][13451:13453] CHIP:TOO:     [48]: 1037
-          [1693218196.393568][13451:13453] CHIP:TOO:     [49]: 1043
-          [1693218196.393579][13451:13453] CHIP:TOO:     [50]: 1045
-          [1693218196.393590][13451:13453] CHIP:TOO:     [51]: 1066
-          [1693218196.393601][13451:13453] CHIP:TOO:     [52]: 1067
-          [1693218196.393611][13451:13453] CHIP:TOO:     [53]: 1068
-          [1693218196.393622][13451:13453] CHIP:TOO:     [54]: 1069
-          [1693218196.393633][13451:13453] CHIP:TOO:     [55]: 1070
-          [1693218196.393643][13451:13453] CHIP:TOO:     [56]: 1071
-          [1693218196.393654][13451:13453] CHIP:TOO:     [57]: 1283
-          [1693218196.393664][13451:13453] CHIP:TOO:     [58]: 1284
-          [1693218196.393675][13451:13453] CHIP:TOO:     [59]: 1285
-          [1693218196.393686][13451:13453] CHIP:TOO:     [60]: 1286
-          [1693218196.393697][13451:13453] CHIP:TOO:     [61]: 1287
-          [1693218196.393708][13451:13453] CHIP:TOO:     [62]: 1288
-          [1693218196.393718][13451:13453] CHIP:TOO:     [63]: 1289
-          [1693218196.393729][13451:13453] CHIP:TOO:     [64]: 1290
-          [1693218196.393740][13451:13453] CHIP:TOO:     [65]: 1291
-          [1693218196.393750][13451:13453] CHIP:TOO:     [66]: 1292
-          [1693218196.393761][13451:13453] CHIP:TOO:     [67]: 1293
-          [1693218196.393772][13451:13453] CHIP:TOO:     [68]: 1294
-          [1693218196.393783][13451:13453] CHIP:TOO:     [69]: 2820
-          [1693218196.393794][13451:13453] CHIP:TOO:     [70]: 4294048773
+          Verify ServerList entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform,
+
+          [1707996554.409850][20755:20757] CHIP:DMG: }
+          [1707996554.410814][20755:20757] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 3583190746
+          [1707996554.410955][20755:20757] CHIP:TOO:   ServerList: 71 entries
+          [1707996554.410990][20755:20757] CHIP:TOO:     [1]: 3
+          [1707996554.411002][20755:20757] CHIP:TOO:     [2]: 4
+          [1707996554.411013][20755:20757] CHIP:TOO:     [3]: 6
+          [1707996554.411024][20755:20757] CHIP:TOO:     [4]: 7
+          [1707996554.411034][20755:20757] CHIP:TOO:     [5]: 8
+          [1707996554.411045][20755:20757] CHIP:TOO:     [6]: 15
+          [1707996554.411056][20755:20757] CHIP:TOO:     [7]: 29
+          [1707996554.411067][20755:20757] CHIP:TOO:     [8]: 30
+          [1707996554.411078][20755:20757] CHIP:TOO:     [9]: 37
+          [1707996554.411092][20755:20757] CHIP:TOO:     [10]: 47
+          [1707996554.411103][20755:20757] CHIP:TOO:     [11]: 59
+          [1707996554.411113][20755:20757] CHIP:TOO:     [12]: 64
+          [1707996554.411124][20755:20757] CHIP:TOO:     [13]: 65
+          [1707996554.411135][20755:20757] CHIP:TOO:     [14]: 69
+          [1707996554.411146][20755:20757] CHIP:TOO:     [15]: 72
+          [1707996554.411156][20755:20757] CHIP:TOO:     [16]: 73
+          [1707996554.411167][20755:20757] CHIP:TOO:     [17]: 74
+          [1707996554.411177][20755:20757] CHIP:TOO:     [18]: 80
+          [1707996554.411188][20755:20757] CHIP:TOO:     [19]: 81
+          [1707996554.411199][20755:20757] CHIP:TOO:     [20]: 82
+          [1707996554.411209][20755:20757] CHIP:TOO:     [21]: 83
+          [1707996554.411220][20755:20757] CHIP:TOO:     [22]: 84
+          [1707996554.411231][20755:20757] CHIP:TOO:     [23]: 85
+          [1707996554.411240][20755:20757] CHIP:TOO:     [24]: 86
+          [1707996554.411251][20755:20757] CHIP:TOO:     [25]: 87
+          [1707996554.411261][20755:20757] CHIP:TOO:     [26]: 89
+          [1707996554.411271][20755:20757] CHIP:TOO:     [27]: 91
+          [1707996554.411282][20755:20757] CHIP:TOO:     [28]: 92
+          [1707996554.411293][20755:20757] CHIP:TOO:     [29]: 93
+          [1707996554.411303][20755:20757] CHIP:TOO:     [30]: 94
+          [1707996554.411313][20755:20757] CHIP:TOO:     [31]: 96
+          [1707996554.411323][20755:20757] CHIP:TOO:     [32]: 97
+          [1707996554.411334][20755:20757] CHIP:TOO:     [33]: 98
+          [1707996554.411345][20755:20757] CHIP:TOO:     [34]: 113
+          [1707996554.411355][20755:20757] CHIP:TOO:     [35]: 114
+          [1707996554.411367][20755:20757] CHIP:TOO:     [36]: 128
+          [1707996554.411376][20755:20757] CHIP:TOO:     [37]: 129
+          [1707996554.411387][20755:20757] CHIP:TOO:     [38]: 144
+          [1707996554.411396][20755:20757] CHIP:TOO:     [39]: 145
+          [1707996554.411406][20755:20757] CHIP:TOO:     [40]: 152
+          [1707996554.411417][20755:20757] CHIP:TOO:     [41]: 153
+          [1707996554.411427][20755:20757] CHIP:TOO:     [42]: 157
+          [1707996554.411437][20755:20757] CHIP:TOO:     [43]: 159
+          [1707996554.411449][20755:20757] CHIP:TOO:     [44]: 258
+          [1707996554.411459][20755:20757] CHIP:TOO:     [45]: 259
+          [1707996554.411469][20755:20757] CHIP:TOO:     [46]: 512
+          [1707996554.411480][20755:20757] CHIP:TOO:     [47]: 513
+          [1707996554.411490][20755:20757] CHIP:TOO:     [48]: 514
+          [1707996554.411500][20755:20757] CHIP:TOO:     [49]: 516
+          [1707996554.411511][20755:20757] CHIP:TOO:     [50]: 768
+          [1707996554.411521][20755:20757] CHIP:TOO:     [51]: 769
+          [1707996554.411532][20755:20757] CHIP:TOO:     [52]: 1024
+          [1707996554.411559][20755:20757] CHIP:TOO:     [53]: 1026
+          [1707996554.411562][20755:20757] CHIP:TOO:     [54]: 1027
+          [1707996554.411565][20755:20757] CHIP:TOO:     [55]: 1028
+          [1707996554.411568][20755:20757] CHIP:TOO:     [56]: 1029
+          [1707996554.411571][20755:20757] CHIP:TOO:     [57]: 1030
+          [1707996554.411575][20755:20757] CHIP:TOO:     [58]: 1036
+          [1707996554.411578][20755:20757] CHIP:TOO:     [59]: 1037
+          [1707996554.411581][20755:20757] CHIP:TOO:     [60]: 1043
+          [1707996554.411584][20755:20757] CHIP:TOO:     [61]: 1045
+          [1707996554.411587][20755:20757] CHIP:TOO:     [62]: 1066
+          [1707996554.411589][20755:20757] CHIP:TOO:     [63]: 1067
+          [1707996554.411592][20755:20757] CHIP:TOO:     [64]: 1068
+          [1707996554.411595][20755:20757] CHIP:TOO:     [65]: 1069
+          [1707996554.411598][20755:20757] CHIP:TOO:     [66]: 1070
+          [1707996554.411601][20755:20757] CHIP:TOO:     [67]: 1071
+          [1707996554.411604][20755:20757] CHIP:TOO:     [68]: 1283
+          [1707996554.411607][20755:20757] CHIP:TOO:     [69]: 1288
+          [1707996554.411610][20755:20757] CHIP:TOO:     [70]: 2820
+          [1707996554.411613][20755:20757] CHIP:TOO:     [71]: 4294048773
+
 
           ./chip-tool descriptor read server-list 1 2
 
@@ -233,6 +238,8 @@ tests:
       verification: |
           For all the Endpoint id’s listed in step 1a run the following steps. For all the client list entries listed in the output - Convert them to Hex values. For example 29 is 0x001D. Verify that these are also present in the device_type.json. Every server cluster listed in the JSON should correspond to a number here in the output.
 
+          The cluster ID's listed in the below log is from the All-Cluster-app. Please run the below command in all the Reference apps (bridge-app, tv-app, microwave-oven-app, Lock-app, Energy-Management-app and Thermostat-app).
+
           ./chip-tool descriptor read client-list 1 1
 
           Verify client list entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ClientList entries are 1.
@@ -242,7 +249,6 @@ tests:
           [1676367470.160282][9805:9807] CHIP:TOO:   ClientList: 1 entries
           [1676367470.160289][9805:9807] CHIP:TOO:     [1]: 6
 
-
           ./chip-tool descriptor read client-list 1 2
 
           Verify client list entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ClientList entries are 0.
diff --git a/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml
index ea416ee91e96b3..769dc5d3cba3ac 100644
--- a/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml
@@ -48,9 +48,9 @@ tests:
 
           On the TH(Chip-tool) Log, Verify featureMap value is 0 and below is the sample log provided for the raspi platform:
 
-          [1705995388.110138][7525:7527] CHIP:DMG: }
-          [1705995388.110173][7525:7527] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009D Attribute 0x0000_FFFC DataVersion: 1324786556
-          [1705995388.110192][7525:7527] CHIP:TOO:   FeatureMap: 1
+          [1707803286.349129][12699:12701] CHIP:DMG: }
+          [1707803286.349183][12699:12701] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009D Attribute 0x0000_FFFC DataVersion: 811903427
+          [1707803286.349202][12699:12701] CHIP:TOO:   FeatureMap: 0
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP
diff --git a/src/app/tests/suites/certification/Test_TC_G_3_2.yaml b/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
index 7f718a160bb9a0..bbafb43b2725fd 100644
--- a/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
@@ -17,6 +17,7 @@ name: 125.3.2. [TC-G-3.2] Groups Cluster Commands [DUT-Client]
 
 PICS:
     - G.C
+    - GRPKEY.C
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml
index 3fe5afe83a8510..365d820bccf00f 100644
--- a/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml
@@ -35,6 +35,47 @@ tests:
           2c.TH reads from the DUT the RegisteredClients attribute. Verify that the DUT response contains empty list of registered clients.
       disabled: true
 
+    - label:
+          "Step 0a: Preconfition 1: Read 'register-clients' by sending the
+          command below and note the check-in nodeID for the entries"
+      verification: |
+          ./chip-tool icdmanagement read registered-clients 1 0
+
+          [1704888897.027204][71644:71646] CHIP:DMG: }
+          [1704888897.027313][71644:71646] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0046 Attribute 0x0000_0003 DataVersion: 852105378
+          [1704888897.027351][71644:71646] CHIP:TOO:   RegisteredClients: 1 entries
+          [1704888897.027394][71644:71646] CHIP:TOO:     [1]: {
+          [1704888897.027412][71644:71646] CHIP:TOO:       CheckInNodeID: 112233
+          [1704888897.027421][71644:71646] CHIP:TOO:       MonitoredSubject: 112233
+          [1704888897.027431][71644:71646] CHIP:TOO:       FabricIndex: 1
+          [1704888897.027440][71644:71646] CHIP:TOO:      }
+          [1704888897.027521][71644:71646] CHIP:EM: <<< [E:49337i S:30873 M:176023643 (Ack:200282364)] (S) Msg TX to 1:0000000000000001 [5BF5] [UDP:[fe80::a70c:61dc:df51:6945%enxd03745ce8f62]:5540] --- Type 0000:10 (SecureChannel:StandaloneAck)
+      disabled: true
+
+    - label:
+          "Step 0b: Preconfition 2: Please send the 'unregister client' command
+          using the check-in nodeID received from the previous read"
+      verification: |
+          ./chip-tool icdmanagement unregister-client 112233 1 0
+
+          [1704888949.629057][71657:71659] CHIP:DMG:
+          [1704888949.629066][71657:71659] CHIP:DMG:         InteractionModelRevision = 11
+          [1704888949.629074][71657:71659] CHIP:DMG: },
+          [1704888949.629125][71657:71659] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0046 Command=0x0000_0002 Status=0x0
+          [1704888949.629153][71657:71659] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "Step 0c: Preconfition 3: Verify that all entries have been
+          successfully unregistered by reading 'register-clients'"
+      verification: |
+          ./chip-tool icdmanagement read registered-clients 1 0
+          [1704889092.945869][71700:71702] CHIP:DMG: }
+          [1704889092.945955][71700:71702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0046 Attribute 0x0000_0003 DataVersion: 852105378
+          [1704889092.945989][71700:71702] CHIP:TOO:   RegisteredClients: 0 entries
+          [1704889092.946079][71700:71702] CHIP:EM: <<< [E:63454i S:39669 M:600516 (Ack:156383188)] (S)
+      disabled: true
+
     - label:
           "Step 1: TH sends RegisterClient command. - CheckInNodeID: registering
           clients node ID - MonitoredSubject: monitored subject ID - Key: shared
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml
index b3535b13ceec51..a1641587411efa 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml
@@ -101,7 +101,6 @@ tests:
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
-          saveAs: Step6_current_mode_dut
           constraints:
               type: int8u
               minValue: 0
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
index 09e18d01b69f9c..b913c30975d85b 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
@@ -119,11 +119,3 @@ tests:
       verification: |
           Out of scope
       disabled: true
-
-    - label:
-          "Step 6: Perform the OTA Update on DUT using vendor specific
-          mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to initiate OTA Update and verify that the software image is transferred to the DUT
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
index 60e55dc65e397b..f58d180b4170bf 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
@@ -157,11 +157,3 @@ tests:
           [1653636406.637617][11116:11121] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_000A DataVersion: 1527020963
           [1653636406.637708][11116:11121] CHIP:TOO:   SoftwareVersion: 1
       disabled: true
-
-    - label:
-          "Step 6: Apply the OTA Update on DUT using vendor specific mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to apply OTA Update and verify that the DUT starts updating its software.
-          Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
index fe03bc98caeb3d..a4fad4cc9fbe35 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
@@ -121,11 +121,3 @@ tests:
       verification: |
           Out of scope
       disabled: true
-
-    - label:
-          "Step 6: Perform the OTA Update from DUT using vendor specific
-          mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to initiate OTA Update and verify that the software image is transferred from the DUT
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
deleted file mode 100644
index 409fdf5b82f1ec..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
-
-name:
-    31.15.1. [TC-SU-4.2] Tests for verifying cluster attributes from Admin(DUT)
-
-PICS:
-    - MCORE.ACL.Administrator
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
-
-tests:
-    - label:
-          "Step 1: DUT sends a write request for the DefaultOTAProviders
-          Attribute to the TH."
-      verification: |
-          Verify that the OTA Requestor App receives the write command and does not reject the value as invalid.
-
-          ./chip-tool otasoftwareupdaterequestor write default-otaproviders '[{"fabricIndex": 1, "providerNodeID": 123, "endpoint": 0}]' 321 0
-
-
-          Verify write request for the DefaultOTAProviders attribute on TH [OTA-REQ] Logs:
-
-          [1662651310.444641][30167:30167] CHIP:IM: Received Write request
-          [1662651310.444820][30167:30167] CHIP:DMG: IM WH moving to [Initialized]
-          [1662651310.444952][30167:30167] CHIP:DMG: WriteRequestMessage =
-          [1662651310.445036][30167:30167] CHIP:DMG: {
-          [1662651310.445112][30167:30167] CHIP:DMG:         suppressResponse = false,
-          [1662651310.445225][30167:30167] CHIP:DMG:         timedRequest = false,
-          [1662651310.445335][30167:30167] CHIP:DMG:         AttributeDataIBs =
-          [1662651310.445455][30167:30167] CHIP:DMG:         [
-          [1662651310.445565][30167:30167] CHIP:DMG:                 AttributeDataIB =
-          [1662651310.445698][30167:30167] CHIP:DMG:                 {
-          [1662651310.445826][30167:30167] CHIP:DMG:                         AttributePathIB =
-          [1662651310.445974][30167:30167] CHIP:DMG:                         {
-          [1662651310.446124][30167:30167] CHIP:DMG:                                 Endpoint = 0x0,
-          [1662651310.446289][30167:30167] CHIP:DMG:                                 Cluster = 0x2a,
-          [1662651310.446457][30167:30167] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1662651310.446620][30167:30167] CHIP:DMG:                         }
-          [1662651310.446772][30167:30167] CHIP:DMG:
-          [1662651310.446905][30167:30167] CHIP:DMG:                         Data = [
-          [1662651310.447049][30167:30167] CHIP:DMG:
-          [1662651310.447158][30167:30167] CHIP:DMG:                         ],
-          [1662651310.447246][30167:30167] CHIP:DMG:                 },
-          [1662651310.447338][30167:30167] CHIP:DMG:
-          [1662651310.447410][30167:30167] CHIP:DMG:                 AttributeDataIB =
-          [1662651310.447490][30167:30167] CHIP:DMG:                 {
-          [1662651310.447570][30167:30167] CHIP:DMG:                         AttributePathIB =
-          [1662651310.447661][30167:30167] CHIP:DMG:                         {
-          [1662651310.447754][30167:30167] CHIP:DMG:                                 Endpoint = 0x0,
-          [1662651310.447854][30167:30167] CHIP:DMG:                                 Cluster = 0x2a,
-          [1662651310.447955][30167:30167] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1662651310.448054][30167:30167] CHIP:DMG:                                 ListIndex = Null,
-          [1662651310.448171][30167:30167] CHIP:DMG:                         }
-          [1662651310.448270][30167:30167] CHIP:DMG:
-          [1662651310.448360][30167:30167] CHIP:DMG:                         Data =
-          [1662651310.448449][30167:30167] CHIP:DMG:                         {
-          [1662651310.448540][30167:30167] CHIP:DMG:                                 0x1 = 123,
-          [1662651310.448641][30167:30167] CHIP:DMG:                                 0x2 = 0,
-          [1662651310.448742][30167:30167] CHIP:DMG:                         },
-          [1662651310.448831][30167:30167] CHIP:DMG:                 },
-          [1662651310.448913][30167:30167] CHIP:DMG:
-          [1662651310.448979][30167:30167] CHIP:DMG:         ],
-          [1662651310.449053][30167:30167] CHIP:DMG:
-          [1662651310.449111][30167:30167] CHIP:DMG:         moreChunkedMessages = false,
-          [1662651310.449178][30167:30167] CHIP:DMG:         InteractionModelRevision = 1
-          [1662651310.449244][30167:30167] CHIP:DMG: },
-          [1662651310.449361][30167:30167] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_002A e=0 p=o
-          [1662651310.449426][30167:30167] CHIP:DMG: AccessControl: allowed
-      disabled: true
-
-    - label:
-          "Step 2: DUT sends a read request to read the DefaultOTAProviders
-          Attribute to the TH."
-      verification: |
-          Verify that the OTA Requestor App responds to the read command
-
-          ./chip-tool otasoftwareupdaterequestor read default-otaproviders 321 0
-
-          Verify read request for the DefaultOTAProviders attribute on TH [OTA-REQ] Logs:
-          [1662651381.708529][30167:30167] CHIP:IM: Received Read request
-          [1662651381.708619][30167:30167] CHIP:DMG: ReadRequestMessage =
-          [1662651381.708648][30167:30167] CHIP:DMG: {
-          [1662651381.708671][30167:30167] CHIP:DMG:         AttributePathIBs =
-          [1662651381.708733][30167:30167] CHIP:DMG:         [
-          [1662651381.708762][30167:30167] CHIP:DMG:                 AttributePathIB =
-          [1662651381.708813][30167:30167] CHIP:DMG:                 {
-          [1662651381.708865][30167:30167] CHIP:DMG:                         Endpoint = 0x0,
-          [1662651381.708920][30167:30167] CHIP:DMG:                         Cluster = 0x2a,
-          [1662651381.708975][30167:30167] CHIP:DMG:                         Attribute = 0x0000_0000,
-          [1662651381.709027][30167:30167] CHIP:DMG:                 }
-          [1662651381.709079][30167:30167] CHIP:DMG:
-          [1662651381.709127][30167:30167] CHIP:DMG:         ],
-          [1662651381.709159][30167:30167] CHIP:DMG:
-          [1662651381.709189][30167:30167] CHIP:DMG:         isFabricFiltered = true,
-      disabled: true
-
-    - label:
-          "Step 3: DUT sends a read request to read the UpdatePossible attribute
-          from the TH."
-      verification: |
-          Verify that the OTA Requestor App responds to the read command
-
-          ./chip-tool otasoftwareupdaterequestor read update-possible 321 0
-
-          Verify UpdatePossible attribute on TH [OTA-REQ] Logs:
-
-          [1662651426.055059][30167:30167] CHIP:IM: Received Read request
-          [1662651426.055180][30167:30167] CHIP:DMG: ReadRequestMessage =
-          [1662651426.055225][30167:30167] CHIP:DMG: {
-          [1662651426.055264][30167:30167] CHIP:DMG:         AttributePathIBs =
-          [1662651426.055308][30167:30167] CHIP:DMG:         [
-          [1662651426.055349][30167:30167] CHIP:DMG:                 AttributePathIB =
-          [1662651426.055397][30167:30167] CHIP:DMG:                 {
-          [1662651426.055444][30167:30167] CHIP:DMG:                         Endpoint = 0x0,
-          [1662651426.055500][30167:30167] CHIP:DMG:                         Cluster = 0x2a,
-          [1662651426.055553][30167:30167] CHIP:DMG:                         Attribute = 0x0000_0001,
-          [1662651426.055603][30167:30167] CHIP:DMG:                 }
-          [1662651426.055654][30167:30167] CHIP:DMG:
-          [1662651426.055701][30167:30167] CHIP:DMG:         ],
-          [1662651426.055747][30167:30167] CHIP:DMG:
-      disabled: true
-
-    - label:
-          "Step 4: DUT sends a read request to read the UpdateState Attribute
-          from the TH."
-      verification: |
-          Verify that the OTA Requestor App responds to the read command
-
-          ./chip-tool otasoftwareupdaterequestor read update-state 321 0
-
-          Verify UpdateState attribute on TH [OTA-REQ] Logs:
-
-          [1662651459.324406][30167:30167] CHIP:IM: Received Read request
-          [1662651459.324545][30167:30167] CHIP:DMG: ReadRequestMessage =
-          [1662651459.324597][30167:30167] CHIP:DMG: {
-          [1662651459.324641][30167:30167] CHIP:DMG:         AttributePathIBs =
-          [1662651459.324692][30167:30167] CHIP:DMG:         [
-          [1662651459.324739][30167:30167] CHIP:DMG:                 AttributePathIB =
-          [1662651459.324847][30167:30167] CHIP:DMG:                 {
-          [1662651459.324914][30167:30167] CHIP:DMG:                         Endpoint = 0x0,
-          [1662651459.324973][30167:30167] CHIP:DMG:                         Cluster = 0x2a,
-          [1662651459.325030][30167:30167] CHIP:DMG:                         Attribute = 0x0000_0002,
-          [1662651459.325083][30167:30167] CHIP:DMG:                 }
-          [1662651459.325138][30167:30167] CHIP:DMG:
-          [1662651459.325188][30167:30167] CHIP:DMG:         ],
-          [1662651459.325240][30167:30167] CHIP:DMG:
-      disabled: true
-
-    - label:
-          "Step 5: TH should start initiating the Software update process. While
-          the TH is downloading the image, DUT sends a read request to read the
-          UpdateStateProgress attribute from the TH."
-      verification: |
-          Write the acl entry to allow the software update:
-
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": [321], "targets": null}]' 123 0
-
-          [1686306394.095355][30543:30545] CHIP:DMG:                         StatusIB =
-          [1686306394.095380][30543:30545] CHIP:DMG:                         {
-          [1686306394.095404][30543:30545] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1686306394.095436][30543:30545] CHIP:DMG:                         },
-
-          Run the announce ota provider command to start the software update and check the UpdateStateProgress
-
-          ./chip-tool otasoftwareupdaterequestor announce-otaprovider 123 0 0 0 321 0
-
-          where 321  is OTA Requestor node ID and 123 is OTA Provider node ID
-
-          Verify that the OTA Requestor App responds to the read command
-
-           ./chip-tool otasoftwareupdaterequestor read update-state-progress 321 0
-
-          Verify UpdateStateProgress attribute on TH [OTA-REQ] Logs:
-
-          [1662651648.244248][30167:30167] CHIP:IM: Received Read request
-          [1662651648.244329][30167:30167] CHIP:DMG: ReadRequestMessage =
-          [1662651648.244353][30167:30167] CHIP:DMG: {
-          [1662651648.244372][30167:30167] CHIP:DMG:         AttributePathIBs =
-          [1662651648.244399][30167:30167] CHIP:DMG:         [
-          [1662651648.244430][30167:30167] CHIP:DMG:                 AttributePathIB =
-          [1662651648.244457][30167:30167] CHIP:DMG:                 {
-          [1662651648.244492][30167:30167] CHIP:DMG:                         Endpoint = 0x0,
-          [1662651648.244523][30167:30167] CHIP:DMG:                         Cluster = 0x2a,
-          [1662651648.244558][30167:30167] CHIP:DMG:                         Attribute = 0x0000_0003,
-          [1662651648.244584][30167:30167] CHIP:DMG:                 }
-          [1662651648.244618][30167:30167] CHIP:DMG:
-          [1662651648.244643][30167:30167] CHIP:DMG:         ],
-          [1662651648.244676][30167:30167] CHIP:DMG:
-          [1662651648.244700][30167:30167] CHIP:DMG:         isFabricFiltered = true,
-          [1662651648.244721][30167:30167] CHIP:DMG:         InteractionModelRevision = 1
-          [1662651648.244749][30167:30167] CHIP:DMG: },
-          [1662651648.244822][30167:30167] CHIP:DMG: IM RH moving to [GeneratingReports]
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
index 859204e549f7b2..b39a2e762a1113 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -309,11 +309,10 @@ tests:
           to G1, the SceneID field set to 0x01, the TransitionTime field set to
           1000 (1s) and a set of extension fields appropriate to AC1."
       verification: |
-          ./chip-tool scenesmanagement add-scene GroupID SceneID TransitionTime "SceneName" '[{"clusterId": value, "attributeValueList":[{"attributeId": value, "attributeValue": value}]}' nodeId endpointId
+          ./chip-tool scenesmanagement add-scene 0x0101 0x01 1000 "scene name" '[{"clusterID": "0x0006", "attributeValueList":[{"attributeID": "0x0001", "attributeValue": "0x01"}, ]}, {"clusterID": "0x0008", "attributeValueList":[{"attributeID": "0x0000", "attributeValue": "0x64"}, ]}]' 1 1
 
-          Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
+          Verify DUT sends a AddSceneResponse command to TH with the Status field set to 0x00 (SUCCESS), the GroupID field set to 257  and the SceneID field set to 0x01 on the TH(Chip-tool)  Log and below is the sample log provided for the raspi platform:
 
-          Verify the "status is success" on the TH(Chip-tool)  Log  and below is the sample log provided for the raspi platform:
           [1705680175.863785][5823:5825] CHIP:DMG: },
           [1705680175.863851][5823:5825] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0062 Command=0x0000_0000
           [1705680175.863880][5823:5825] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0062 Command 0x0000_0000
@@ -613,11 +612,12 @@ tests:
           set to G1 and the SceneID field set to 0x03."
       PICS: S.S.C01.Rsp && PICS_SKIP_SAMPLE_APP
       verification: |
-          ./chip-tool scenesmanagement view-scene GroupId SceneId Node-Id EndpointId
+          ./chip-tool scenesmanagement view-scene 0x0101 0x03 1 1
 
-          Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
+          Verify DUT sends a ViewSceneResponse command to TH with the Status field set to 0x00 (SUCCESS), the GroupID field set to 257, the SceneID field set to 0x03, the TransitionTime field set to 1 and a set of extension fields appropriate to AC1 on the TH(Chip-tool)  Log  and below is the sample log provided for the raspi platform:
+
+          NOTE: The values below are expected to match the values from the specific AC tested
 
-          Verify that the extension fields in the log match the ones expected and that the log output is similar to the following:
           [1707285444.028460][13682:13684] CHIP:DMG: },
           [1707285444.028553][13682:13684] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0062 Command=0x0000_0001
           [1707285444.028579][13682:13684] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0062 Command 0x0000_0001
@@ -627,13 +627,13 @@ tests:
           [1707285444.028706][13682:13684] CHIP:TOO:     sceneID: 3
           [1707285444.028717][13682:13684] CHIP:TOO:     transitionTime: 1
           [1707285444.028728][13682:13684] CHIP:TOO:     sceneName: scene name
-          [1707285444.028766][13682:13684] CHIP:TOO:     extensionFieldSets: XX entries
-          [1707285444.028814][13682:13684] CHIP:TOO:       [XX]: {
-          [1707285444.028828][13682:13684] CHIP:TOO:         ClusterID: XX
-          [1707285444.028853][13682:13684] CHIP:TOO:         AttributeValueList: XX entries
-          [1707285444.028882][13682:13684] CHIP:TOO:           [XX]: {
-          [1707285444.028896][13682:13684] CHIP:TOO:             AttributeID: XX
-          [1707285444.028913][13682:13684] CHIP:TOO:             AttributeValue: XX
+          [1707285444.028766][13682:13684] CHIP:TOO:     extensionFieldSets: 1 entries
+          [1707285444.028814][13682:13684] CHIP:TOO:       [1]: {
+          [1707285444.028828][13682:13684] CHIP:TOO:         ClusterID: 768
+          [1707285444.028853][13682:13684] CHIP:TOO:         AttributeValueList: 1 entries
+          [1707285444.028882][13682:13684] CHIP:TOO:           [1]: {
+          [1707285444.028896][13682:13684] CHIP:TOO:             AttributeID: 16386
+          [1707285444.028913][13682:13684] CHIP:TOO:             AttributeValue: 1
           [1707285444.028925][13682:13684] CHIP:TOO:            }
           [1707285444.028937][13682:13684] CHIP:TOO:        }
           [1707285444.028950][13682:13684] CHIP:TOO:    }
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
index c3ba72dcf05b80..196d08a4eb46cf 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
@@ -440,7 +440,7 @@ tests:
       response:
           value: 100
 
-    - label: "DUT transitions to AC2 over 20."
+    - label: "DUT transitions to AC1 over 20s."
       verification: |
           Is the transition done over 20s?
       cluster: "LogCommands"
@@ -449,7 +449,7 @@ tests:
       arguments:
           values:
               - name: "message"
-                value: "Please confirm that transition to AC2 was made over 5s"
+                value: "Please confirm that transition to AC1 was made over 20s"
               - name: "expectedValue"
                 value: "y"
 
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_5.yaml b/src/app/tests/suites/certification/Test_TC_S_2_5.yaml
index e0a2998e06d965..8616c15665531e 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_5.yaml
@@ -17,7 +17,6 @@ name: 132.2.5. [TC-S-2.5] RemainingCapacity functionality with DUT as Server
 
 PICS:
     - S.S
-    - S.S.F03
 
 config:
     nodeId: 0x12344321
@@ -250,7 +249,7 @@ tests:
           to 20000 (20s) and no extension field sets."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0001 0x01 20000 scene1 [] 1 1
+          scenesmanagement add-scene 0x0001 0x01 20000 scene1 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -331,7 +330,7 @@ tests:
           8a."
       PICS: S.S.C04.Rsp
       verification: |
-          ./chiptool scenesmanagement store-scene 0x0001 0x02  1 1
+          scenesmanagement store-scene 0x0001 0x02 1 1
 
           Verify the StoreSceneResponse with following fields:
           Status is SUCCESS
@@ -412,7 +411,7 @@ tests:
           field sets. If RemainingCapacity is 0, continue to Step 8a."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0001 0x03 20000 scene1 [] 1 1
+          scenesmanagement add-scene 0x0001 0x03 20000 scene1 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -491,7 +490,7 @@ tests:
           set to G1 and the SceneID field set to 0x01."
       PICS: S.S.C02.Rsp
       verification: |
-          ./chip-tool scenesmanagement remove-scene 0x0001 0x01 1 1
+          scenesmanagement remove-scene 0x0001 0x01 1 1
 
           Verify the RemoveScenesResponse with following fields:
           Status is SUCCESS
@@ -646,7 +645,7 @@ tests:
           KeySetRemove command to the GroupKeyManagement cluster with the
           GroupKeySetID field set to 0x01a1"
       verification: |
-          ./chip-tool groupkeymanagement key-set-remove 0x01a1 1 0
+          groupkeymanagement key-set-remove 0x01a1 1 0
 
           Verify DUT responds with SUCCESS status response on the TH(Chip-tool)  Log  and below is the sample log provided for the raspi platform:
 
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_6.yaml b/src/app/tests/suites/certification/Test_TC_S_2_6.yaml
index 2c8d0ce4e5a820..5a578eeb8a7866 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_6.yaml
@@ -19,7 +19,6 @@ name:
 
 PICS:
     - S.S
-    - S.S.F03
 
 config:
     nodeId: 0x12344321
@@ -30,7 +29,7 @@ tests:
     - label: "Precondition: Commission DUT to TH1"
       verification: |
           Once DUT reach the  commissionable state send the following command on TH1:
-          ./chip-tool pairing onnetwork 1 20202021
+          pairing onnetwork 1 20202021
           Verify the commissioning completed with success on TH(chip-tool) from DUT
           [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
@@ -39,7 +38,7 @@ tests:
       verification: |
           Open a commissioning window On TH1(Chiptool)using below command
 
-          ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3841
+           pairing open-commissioning-window 1 1 400 2000 3841
 
           Verify the Successfully opened pairing window On TH1(Chiptool)e device
 
@@ -53,7 +52,7 @@ tests:
       verification: |
           Now send the below command for commissionin DUT to TH2 with Manual pairing code generated in TH1 using open commission window
 
-          ./chip-tool pairing code 2 36253605617 --commissioner-name beta
+          pairing code 2 36253605617 --commissioner-name beta
 
           Verify the commissioning completed with success on TH2(chip-tool) from DUT
 
@@ -65,7 +64,7 @@ tests:
       verification: |
           Open a commissioning window On TH1(Chiptool)using below command
 
-          ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3842
+           pairing open-commissioning-window 1 1 400 2000 3842
 
           Verify the Successfully opened pairing window On TH1(Chiptool)e device
 
@@ -79,7 +78,7 @@ tests:
       verification: |
           send the below command for commissionin DUT to TH3 with Manual pairing code generated in TH1 using open commission window
 
-          ./chip-tool pairing code 3 36545248276 --commissioner-name gamma
+          pairing code 3 36545248276 --commissioner-name gamma
 
           Verify the commissioning completed with success on TH3(chip-tool) from DUT
 
@@ -92,7 +91,7 @@ tests:
           field set to 0x0000."
       PICS: S.S.C03.Rsp
       verification: |
-          ./chip-tool scenesmanagement remove-all-scenes 0x0000 1 1
+          scenesmanagement remove-all-scenes 0x0000 1 1
 
           Verify the RemoveAllScenesResponse with following fields:
           Status is SUCCESS
@@ -108,7 +107,7 @@ tests:
     - label: "Step 1b: Repeat Step 1a with TH2."
       PICS: S.S.C03.Rsp
       verification: |
-          ./chip-tool scenesmanagement remove-all-scenes 0x0000 2 1 --commissioner-name beta
+          scenesmanagement remove-all-scenes 0x0000 2 1 --commissioner-name beta
 
           Verify the RemoveAllScenesResponse with following fields:
           Status is SUCCESS
@@ -125,7 +124,7 @@ tests:
     - label: "Step 1C: Repeat Step 1a with TH3."
       PICS: S.S.C03.Rsp
       verification: |
-          ./chip-tool scenesmanagement remove-all-scenes 0x0000 3 1 --commissioner-name gamma
+          scenesmanagement remove-all-scenes 0x0000 3 1 --commissioner-name gamma
 
           Verify the RemoveAllScenesResponse with following fields:
           Status is SUCCESS
@@ -141,7 +140,7 @@ tests:
 
     - label: "Step 2a: TH1 reads from the DUT the SceneTableSize attribute"
       verification: |
-          ./chip-tool scenesmanagement read scene-table-size 1 1
+          scenesmanagement read scene-table-size 1 1
 
           Verify the "SceneTableSize" attribute value is SceneTableSize(minimum=16) which is recorded into SceneTableSize on the TH (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -156,7 +155,7 @@ tests:
       verification: |
           Please use Interactive mode to Verify the subscription
           Here the command to enter interactive mode:--
-          ./chip-tool interactive start
+          interactive start
 
           Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
@@ -236,7 +235,7 @@ tests:
 
           Please use Interactive mode to Verify the subscription of an event
           Here the command to enter interactive mode:--
-          ./chip-tool interactive start
+          interactive start
 
           Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
@@ -296,7 +295,7 @@ tests:
       verification: |
           Please use Interactive mode to Verify the subscription of an event
           Here the command to enter interactive mode:--
-          ./chip-tool interactive start
+          interactive start
 
           Set up the subscription between DUT and TH by sending the command mentioned below, and verify that the subscription is activated successfully
 
@@ -358,7 +357,7 @@ tests:
           set to 20000 (20s) and no extension field sets."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x01 20000 scene1 [] 1 1
+          scenesmanagement add-scene 0x0000 0x01 20000 scene1 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -381,7 +380,7 @@ tests:
           FabricSceneInfo into Remaining1stCapacity; verify Remaining1stCapacity
           equals (MaxRemainingCapacity-1)."
       verification: |
-          ./chipt-tool scenesmanagement subscribe fabric-scene-info 100 200 1 1
+          scenesmanagement subscribe fabric-scene-info 100 200 1 1
 
           Verify  the DUT sends a report data to TH1 for FabricSceneInfo after the MinIntervalFloor time; store the RemainingCapacity field from this fabric’s entry reported in FabricSceneInfo into Remaining1stCapacity and is equals to (MaxRemainingCapacity-1) on the TH (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -441,7 +440,7 @@ tests:
           becomes 0."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x02 20000 scene2 [] 1 1
+          scenesmanagement add-scene 0x0000 0x02 20000 scene2 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -457,7 +456,7 @@ tests:
           [1700827508.579697][16026:16028] CHIP:TOO:    }
 
 
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 1 1
+          scenesmanagement subscribe fabric-scene-info 100 200 1 1
           Verify  the DUT sends a report data messages after the MinIntervalFloor time to TH1 for RemainingCapacity field in FabricSceneInfo for that fabric with updated valueon the TH1 (Chip-tool) and below is the sample log provided for the raspi platform:
           [1701243677.717829][7642:7644] CHIP:DMG: ReportDataMessage =
           [1701243677.717834][7642:7644] CHIP:DMG: {
@@ -508,7 +507,7 @@ tests:
           .
           .
           .
-          ./chip-tool scenesmanagement add-scene 0x0000 0x07 20000 scene8 [] 1 1
+          scenesmanagement add-scene 0x0000 0x07 20000 scene8 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -524,7 +523,7 @@ tests:
           [1700827941.415498][16068:16070] CHIP:TOO:     sceneID: 7
           [1700827941.415508][16068:16070] CHIP:TOO:    }
 
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 1 1
+          scenesmanagement subscribe fabric-scene-info 100 200 1 1
 
           Verify  the DUT sends a report data messages after the MinIntervalFloor time to TH1 for RemainingCapacity field in FabricSceneInfo for that fabric with updated valueon the TH1 (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -583,7 +582,7 @@ tests:
           field sets."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x08 20000 scene9 [] 1 1
+          scenesmanagement add-scene 0x0000 0x08 20000 scene9 [] 1 1
 
           Verify the AddSceneResponse with following fields:
           Status is RESOURCE_EXHAUSTED(0x89) on the TH1(Chip-tool) log and below is the sample log provided for the raspi platform:
@@ -601,7 +600,7 @@ tests:
     - label: "Step 5a: Repeat Step 4a with TH2"
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x02 0x0014 scene1 [] 2 1 --commissioner-name beta
+          scenesmanagement add-scene 0x0000 0x02 0x0014 scene1 [] 2 1 --commissioner-name beta
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -617,7 +616,7 @@ tests:
           [1700828173.261638][16115:16117] CHIP:TOO:     sceneID: 2
           [1700828173.261640][16115:16117] CHIP:TOO:    }
 
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
+          scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
 
           Verify  the DUT sends a report data messages after the MinIntervalFloor time to TH2 for RemainingCapacity field in FabricSceneInfo for that fabric with updated value on the TH2 (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -670,7 +669,7 @@ tests:
           .
           .
           .
-          ./chip-tool scenesmanagement add-scene 0x0000 0x08 0x0014 scene7 [] 2 1 --commissioner-name beta
+          scenesmanagement add-scene 0x0000 0x08 0x0014 scene7 [] 2 1 --commissioner-name beta
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -685,7 +684,7 @@ tests:
           [1700829509.052521][16198:16200] CHIP:TOO:     sceneID: 8
           [1700829509.052532][16198:16200] CHIP:TOO:    }
 
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
+          scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
 
           Verify  the DUT sends a report data messages after the MinIntervalFloor time to TH2 for RemainingCapacity field in FabricSceneInfo for that fabric with updated value(decreasing to 0) on the TH2 (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -736,7 +735,7 @@ tests:
           [1701245132.870584][7824:7826] CHIP:TOO:       FabricIndex: 2
           [1701245132.870594][7824:7826] CHIP:TOO:      }
 
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 3 1 --commissioner-name gamma
+          scenesmanagement subscribe fabric-scene-info 100 200 3 1 --commissioner-name gamma
 
           Verify that the DUT sends report data messages after the MinIntervalFloor time to TH3 for RemainingCapacity field in FabricSceneInfo for that fabric with updated value (decreasing to SceneTableSize - (2 * MaxRemainingCapacity)) on the TH2 (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -791,7 +790,7 @@ tests:
     - label: "Step 5b: Repeat Step 4b with TH2"
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x09 0x0014 scene8 [] 2 1 --commissioner-name beta
+          scenesmanagement add-scene 0x0000 0x09 0x0014 scene8 [] 2 1 --commissioner-name beta
 
           Verify the AddSceneResponse with following fields:
           Status is RESOURCE_EXHAUSTED(0x89) on the TH2(Chip-tool) log and below is the sample log provided for the raspi platform:
@@ -808,7 +807,7 @@ tests:
     - label: "Step 6a: Repeat Step 4a with TH3"
       PICS: S.S.C00.Rsp
       verification: |
-          ./chip-tool scenesmanagement add-scene 0x0000 0x02 0x0014 scene1 [] 3 1 --commissioner-name gamma
+          scenesmanagement add-scene 0x0000 0x02 0x0014 scene1 [] 3 1 --commissioner-name gamma
 
           Verify the AddSceneResponse with following fields:
           Status is SUCCESS
@@ -951,7 +950,7 @@ tests:
           set to 20000 20s and no extension field sets."
       PICS: S.S.C00.Rsp
       verification: |
-          ./chipt-tool scenesmanagement add-scene 0x0000 0x01 20000 scene [] 3 1 --commissioner-name gamma
+          scenesmanagement add-scene 0x0000 0x01 20000 scene [] 3 1 --commissioner-name gamma
 
           Verify the AddSceneResponse with following fields:
           Status is RESOURCE_EXHAUSTED(0x89) on the TH3(Chip-tool) log and below is the sample log provided for the raspi platform:
@@ -971,7 +970,7 @@ tests:
           set to 0x0000, the SceneID field set to 0x01."
       PICS: S.S.C04.Rsp
       verification: |
-          ./chipt-tool scenesmanagement store-scene 0x0000 0x01 3 1 --commissioner-name gamma
+          scenesmanagement store-scene 0x0000 0x01 3 1 --commissioner-name gamma
 
           Verify the StoreSceneResponse with following fields:
           Status is RESOURCE_EXHAUSTED(0x89) on the TH3(Chip-tool) log and below is the sample log provided for the raspi platform:
@@ -993,7 +992,7 @@ tests:
           to 0x0000 and the scene identifier to field set to 0xFE."
       PICS: S.S.C40.Rsp
       verification: |
-          ./chipt-tool scenesmanagement copy-scene 0x00 0x0000 0x02 0x0000 0x00 3 1 --commissioner-name gamma
+          scenesmanagement copy-scene 0x00 0x0000 0x02 0x0000 0x00 3 1 --commissioner-name gamma
 
           Verify the CopySceneResponse with following fields:
           Status is RESOURCE_EXHAUSTED(0x89) on the TH(Chip-tool) log and below is the sample log provided for the raspi platform:
@@ -1013,7 +1012,7 @@ tests:
           field set to 0x0000."
       PICS: S.S.C03.Rsp
       verification: |
-          ./chipt-tool scenesmanagement remove-all-scenes 0x0000 1 1
+          scenesmanagement remove-all-scenes 0x0000 1 1
 
           Verify the RemoveAllScenesResponse with following fields:
           Status is SUCCESS
@@ -1038,7 +1037,7 @@ tests:
           should send 'empty' report data since there is no update for this
           attribute for TH2)."
       verification: |
-          ./chipt-tool scenesmanagement subscribe fabric-scene-info 100 200 1 1
+          scenesmanagement subscribe fabric-scene-info 100 200 1 1
 
           Verify that the DUT sends a report data to TH1 for FabricSceneInfo after the MinIntervalFloor time; store the RemainingCapacity field from this fabric’s entry the reported in FabricSceneInfo into Remaining1stCapacity; verify Remaining1stCapacity equals (MaxRemainingCapacity) on TH1(Chip-tool) log and below is the sample log provided for the raspi platform:
 
@@ -1097,7 +1096,7 @@ tests:
           field set to 0x0000."
       PICS: S.S.C03.Rsp
       verification: |
-          ./chipt-tool scenesmanagement remove-all-scenes 0x0000 2 1 --commissioner-name beta
+          scenesmanagement remove-all-scenes 0x0000 2 1 --commissioner-name beta
 
           Verify the RemoveAllScenesResponse with following fields:
           Status is SUCCESS
@@ -1119,7 +1118,7 @@ tests:
           FabricSceneInfo into Remaining2ndCapacity; verify Remaining2ndCapacity
           equals (MaxRemainingCapacity)."
       verification: |
-          ./chip-tool scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
+          scenesmanagement subscribe fabric-scene-info 100 200 2 1 --commissioner-name beta
 
           Verify that the DUT sends a report data to TH2 for FabricSceneInfo after the MinIntervalFloor time; store the RemainingCapacity field from this fabric’s entry reported in FabricSceneInfo into Remaining2ndCapacity; verify Remaining2ndCapacity equals (MaxRemainingCapacity) on TH2(Chip-tool) log and below is the sample log provided for the raspi platform:
 
@@ -1141,7 +1140,7 @@ tests:
           "Step 11a: TH1 removes the TH2 fabric by sending the RemoveFabric
           command to the DUT with the FabricIndex set to th2FabricIndex"
       verification: |
-          ./chip-tool operationalcredentials remove-fabric th2FabricIndex 1 0
+          operationalcredentials remove-fabric th2FabricIndex 1 0
 
           On TH1(chip-tool) verify the success with the nocresponse with statuscode is success(0)
 
@@ -1158,7 +1157,7 @@ tests:
           "Step 11b: TH1 removes the TH3 fabric by sending the RemoveFabric
           command to the DUT with the FabricIndex set to th3FabricIndex"
       verification: |
-          ./chip-tool operationalcredentials remove-fabric th3FabricIndex 1 0
+          operationalcredentials remove-fabric th3FabricIndex 1 0
 
           On TH1(chip-tool) verify the success with the nocresponse with statuscode is success(0)
 
diff --git a/src/app/tests/suites/certification/Test_TC_S_3_1.yaml b/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
index 66912006363345..ffb3023c67b862 100644
--- a/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
@@ -154,16 +154,34 @@ tests:
     - label:
           "Step 0d: Precondition 4: TH sends a RemoveAllGroups command to DUT."
       verification: |
-          Please execute the below commands before starting the test case :
-
           ./chip-tool groups remove-all-groups 1 1
 
-          Verify DUT responds with SUCCESS status response on the TH(Chip-tool)  Log  and below is the sample log provided for the raspi platform:
-
-          [1653485455.344097][11508:11513] CHIP:DMG:                              StatusIB =
-          [1653485455.344141][11508:11513] CHIP:DMG:                              {
-          [1653485455.344190][11508:11513] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1653485455.344236][11508:11513] CHIP:DMG:                              },
+          Verify the RemoveAllGroups attribute On TH (all-Clusters-app) log and below is the sample log provided for the raspi platform:
+
+          [1707992121.754676][18074:18074] CHIP:DMG: InvokeRequestMessage =
+          [1707992121.754689][18074:18074] CHIP:DMG: {
+          [1707992121.754697][18074:18074] CHIP:DMG:         suppressResponse = false,
+          [1707992121.754707][18074:18074] CHIP:DMG:         timedRequest = false,
+          [1707992121.754714][18074:18074] CHIP:DMG:         InvokeRequests =
+          [1707992121.754730][18074:18074] CHIP:DMG:         [
+          [1707992121.754744][18074:18074] CHIP:DMG:                 CommandDataIB =
+          [1707992121.754756][18074:18074] CHIP:DMG:                 {
+          [1707992121.754766][18074:18074] CHIP:DMG:                         CommandPathIB =
+          [1707992121.754776][18074:18074] CHIP:DMG:                         {
+          [1707992121.754788][18074:18074] CHIP:DMG:                                 EndpointId = 0x1,
+          [1707992121.754801][18074:18074] CHIP:DMG:                                 ClusterId = 0x4,
+          [1707992121.754810][18074:18074] CHIP:DMG:                                 CommandId = 0x4,
+          [1707992121.754827][18074:18074] CHIP:DMG:                         },
+          [1707992121.754841][18074:18074] CHIP:DMG:
+          [1707992121.754852][18074:18074] CHIP:DMG:                         CommandFields =
+          [1707992121.754863][18074:18074] CHIP:DMG:                         {
+          [1707992121.754874][18074:18074] CHIP:DMG:                         },
+          [1707992121.754883][18074:18074] CHIP:DMG:                 },
+          [1707992121.754899][18074:18074] CHIP:DMG:
+          [1707992121.754907][18074:18074] CHIP:DMG:         ],
+          [1707992121.754924][18074:18074] CHIP:DMG:
+          [1707992121.754934][18074:18074] CHIP:DMG:         InteractionModelRevision = 11
+          [1707992121.754943][18074:18074] CHIP:DMG: },
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
deleted file mode 100644
index a239c77b01dd05..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: 7.2.1. [TC-TMP-2.1] Attributes with server as DUT
-
-PICS:
-    - TMP.S
-
-config:
-    nodeId: 0x12344321
-    cluster: "Temperature Measurement"
-    endpoint: 1
-
-tests:
-    - label: "Step 1: Commission DUT to TH"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
-    - label: "Step 2: TH reads the MinMeasuredValue attribute from the DUT"
-      PICS: TMP.S.A0001
-      command: "readAttribute"
-      attribute: "MinMeasuredValue"
-      response:
-          saveAs: CurrentMinMeasured
-          constraints:
-              type: int16s
-              minValue: -27315
-              maxValue: 32766
-
-    - label: "Step 3: TH reads the MaxMeasuredValue attribute from the DUT"
-      PICS: TMP.S.A0002
-      command: "readAttribute"
-      attribute: "MaxMeasuredValue"
-      response:
-          saveAs: CurrentMaxMeasured
-          constraints:
-              type: int16s
-              minValue: CurrentMinMeasured+1
-              maxValue: 32767
-
-    - label: "Step 4: TH reads the MeasuredValue attribute from the DUT"
-      PICS: TMP.S.A0000
-      command: "readAttribute"
-      attribute: "MeasuredValue"
-      response:
-          constraints:
-              type: int16s
-              minValue: CurrentMinMeasured
-              maxValue: CurrentMaxMeasured
-
-    - label: "Step 5: TH reads the Tolerance attribute from the DUT"
-      PICS: TMP.S.A0003
-      command: "readAttribute"
-      attribute: "Tolerance"
-      response:
-          constraints:
-              type: int16u
-              minValue: 0
-              maxValue: 2048
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
index 066267b9117be0..333a81dc7b71a8 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
@@ -85,17 +85,17 @@ tests:
           constraints:
               type: list
 
-    - label: "Step 6: TH reads from the DUT the AcceptedCommandList attribute."
+    - label: "Step 6: TH reads from the DUT the GeneratedCommandList attribute."
       command: "readAttribute"
-      attribute: "AcceptedCommandList"
+      attribute: "GeneratedCommandList"
       response:
           value: []
           constraints:
               type: list
 
-    - label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
+    - label: "Step 7: TH reads from the DUT the AcceptedCommandList attribute."
       command: "readAttribute"
-      attribute: "GeneratedCommandList"
+      attribute: "AcceptedCommandList"
       response:
           value: []
           constraints:
diff --git a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
index 5d9a98683a5c21..366dd5752c2fb1 100644
--- a/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
+++ b/src/app/tests/suites/credentials/TestHarnessDACProvider.cpp
@@ -29,6 +29,7 @@
 #include <platform/CHIPDeviceConfig.h>
 
 #include <fstream>
+#include <string>
 
 //-> format_version = 1
 //-> vendor_id = 0xFFF1/0xFFF2/0xFFF3
diff --git a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h b/src/app/util/IMClusterCommandHandler.h
similarity index 50%
rename from examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h
rename to src/app/util/IMClusterCommandHandler.h
index 37edd157a228ce..95d1aef85917f4 100644
--- a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h
+++ b/src/app/util/IMClusterCommandHandler.h
@@ -1,6 +1,6 @@
 /*
- *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,21 +16,23 @@
  */
 #pragma once
 
-#include <credentials/DeviceAttestationCredsProvider.h>
+#include <app/CommandHandler.h>
+#include <app/ConcreteCommandPath.h>
+#include <lib/core/TLVReader.h>
 
 namespace chip {
-namespace Credentials {
-namespace CC13X2_26X2 {
+namespace app {
 
 /**
- * @brief Get implementation of a sample DAC provider to validate device
- *        attestation procedure.
+ * Dispatch is generally implemented in code-generated code in ember within
+ * IMClusterCommandHandler.cpp
  *
- * @returns a singleton DeviceAttestationCredentialsProvider that relies on no
- *          storage abstractions.
+ * aCommandPath - the path that is invoked
+ * aReader      - the input TLV data for this command
+ * apCommandObj - how to send back the reply
  */
-DeviceAttestationCredentialsProvider * GetCC13X2_26X2DacProvider();
+void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, chip::TLV::TLVReader & aReader,
+                                  CommandHandler * apCommandObj);
 
-} // namespace CC13X2_26X2
-} // namespace Credentials
+} // namespace app
 } // namespace chip
diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h
index 0c343185f70576..c608854c346fba 100644
--- a/src/app/util/af-types.h
+++ b/src/app/util/af-types.h
@@ -24,7 +24,6 @@
  */
 
 #include <stdbool.h> // For bool
-#include <stddef.h>  // For NULL.
 #include <stdint.h>  // For various uint*_t types
 
 #include <app/util/basic-types.h>
@@ -297,3 +296,15 @@ typedef chip::Protocols::InteractionModel::Status (*EmberAfClusterPreAttributeCh
 #define MAX_INT16U_VALUE (0xFFFF)
 
 /** @} END addtogroup */
+
+namespace chip {
+namespace app {
+
+enum class MarkAttributeDirty
+{
+    kIfChanged,
+    kNo,
+};
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/util/af.h b/src/app/util/af.h
deleted file mode 100644
index f747d50523a5d6..00000000000000
--- a/src/app/util/af.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- *
- *    Copyright (c) 2020-2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#ifndef CONFIGURATION_HEADER
-#define CONFIGURATION_HEADER <app/util/config.h>
-#endif
-#include CONFIGURATION_HEADER
-
-#include <app/util/af-types.h>
-
-#include <app/util/endpoint-config-api.h>
-
-#include <lib/core/DataModelTypes.h>
-#include <lib/support/Iterators.h>
-#include <lib/support/SafeInt.h>
-#include <protocols/interaction_model/StatusCode.h>
-
-/** @name Attribute Storage */
-// @{
-
-static constexpr uint16_t kEmberInvalidEndpointIndex = 0xFFFF;
-
-/**
- * @brief locate attribute metadata
- *
- * Function returns pointer to the attribute metadata structure,
- * or NULL if attribute was not found.
- *
- * @param endpoint Zigbee endpoint number.
- * @param clusterId Cluster ID of the sought cluster.
- * @param attributeId Attribute ID of the sought attribute.
- *
- * @return Returns pointer to the attribute metadata location.
- */
-const EmberAfAttributeMetadata * emberAfLocateAttributeMetadata(chip::EndpointId endpoint, chip::ClusterId clusterId,
-                                                                chip::AttributeId attributeId);
-/**
- * @brief Returns true if endpoint contains the ZCL server with specified id.
- *
- * This function returns true if
- * the endpoint contains server of a given cluster.
- */
-bool emberAfContainsServer(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
-/**
- * @brief Returns true if endpoint of given index contains the ZCL server with specified id.
- *
- * This function returns true if
- * the endpoint of given index contains server of a given cluster.
- * If this function is used with a manufacturer specific clusterId
- * then this will return the first cluster that it finds in the Cluster table.
- * and will not return any other clusters that share that id.
- */
-bool emberAfContainsServerFromIndex(uint16_t index, chip::ClusterId clusterId);
-
-/**
- * @brief Returns true if endpoint contains the ZCL client with specified id.
- *
- * This function returns true if
- * the endpoint contains client of a given cluster.
- */
-bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
-/**
- * @brief write an attribute, performing all the checks.
- *
- * This function will attempt to write the attribute value from
- * the provided pointer. This function will only check that the
- * attribute exists. If it does it will write the value into
- * the attribute table for the given attribute.
- *
- * This function will not check to see if the attribute is
- * writable since the read only / writable characteristic
- * of an attribute only pertains to external devices writing
- * over the air. Because this function is being called locally
- * it assumes that the device knows what it is doing and has permission
- * to perform the given operation.
- *
- * This function also does NOT check that the input dataType matches the expected
- * data type (as Accessors.h/cpp have this correct by default).
- * TODO: this not checking seems off - what if this is run without Accessors.h ?
- */
-chip::Protocols::InteractionModel::Status emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                                chip::AttributeId attributeID, uint8_t * dataPtr,
-                                                                EmberAfAttributeType dataType);
-
-/**
- * @brief Read the attribute value, performing all the checks.
- *
- * This function will attempt to read the attribute and store it into the
- * pointer.
- *
- * dataPtr may be NULL, signifying that we don't need the value, just the status
- * (i.e. whether the attribute can be read).
- */
-chip::Protocols::InteractionModel::Status emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                               chip::AttributeId attributeID, uint8_t * dataPtr,
-                                                               uint16_t readLength);
-
-/**
- * @brief macro that returns size of attribute in bytes.
- *
- * @param metadata EmberAfAttributeMetadata* to consider.
- */
-#define emberAfAttributeSize(metadata) ((metadata)->size)
-
-#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
-// master array of all defined endpoints
-extern EmberAfDefinedEndpoint emAfEndpoints[];
-#endif
-
-/**
- * @brief Returns parent endpoint for a given endpoint index
- */
-chip::EndpointId emberAfParentEndpointFromIndex(uint16_t index);
-
-/**
- * Returns the index of a given endpoint.  Will return 0xFFFF if this is not a
- * valid endpoint id or if the endpoint is disabled.
- */
-uint16_t emberAfIndexFromEndpoint(chip::EndpointId endpoint);
-
-/**
- *  @brief Returns the index of the given endpoint in the list of all endpoints that might support the given cluster server.
- *
- * Returns kEmberInvalidEndpointIndex if the given endpoint does not support the
- * given cluster or if the given endpoint is disabled.
- *
- * This function always returns the same index for a given endpointId instance, fixed or dynamic.
- *
- * The return index for fixed endpoints will range from 0 to (fixedClusterServerEndpointCount - 1),
- * For dynamic endpoints the indexing assumes that any dynamic endpoint could start supporting
- * the given server cluster and their index will range from fixedClusterServerEndpointCount to
- * (fixedClusterServerEndpointCount + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT - 1).
- *
- * For example, if a device has 4 fixed endpoints (ids 0-3) and 2 dynamic
- * endpoints, and cluster X is supported on endpoints 1 and 3, then
- * fixedClusterServerEndpointCount should be 2 and
- *
- * 1) emberAfGetClusterServerEndpointIndex(0, X) returns kEmberInvalidEndpointIndex
- * 2) emberAfGetClusterServerEndpointIndex(1, X) returns 0
- * 3) emberAfGetClusterServerEndpointIndex(2, X) returns kEmberInvalidEndpointIndex
- * 4) emberAfGetClusterServerEndpointIndex(3, X) returns 1
-
- * The Dynamic endpoints are placed after the fixed ones;
- * therefore their return index will always be >= to fixedClusterServerEndpointCount
- *
- * If a dynamic endpoint, supporting cluster X, is defined to dynamic index 1 with endpoint id 7,
- * (via emberAfSetDynamicEndpoint(1, 7, ...))
- * then emberAfGetClusterServerEndpointIndex(7, X) returns 3 (fixedClusterServerEndpointCount{2} + DynamicEndpointIndex {1}).
- *
- * If now a second dynamic endpoint, also supporting cluster X, is defined to dynamic index 0
- * with endpoint id 9  (via emberAfSetDynamicEndpoint(0, 9, ...)),
- * emberAfGetClusterServerEndpointIndex(9, X) returns 2. (fixedClusterServerEndpointCount{2} + DynamicEndpointIndex {0}).
- * and emberAfGetClusterServerEndpointIndex(7, X) still returns 3
- *
- * @param endpoint Endpoint number
- * @param cluster Id the of the Cluster server you are interrested on
- * @param fixedClusterServerEndpointCount The number of fixed endpoints containing this cluster server.  Typically one of the
- MATTER_DM_*_CLUSTER_SERVER_ENDPOINT_COUNT constants.
- */
-uint16_t emberAfGetClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                              uint16_t fixedClusterServerEndpointCount);
-
-/**
- * @brief Returns the number of pre-compiled endpoints.
- */
-uint16_t emberAfFixedEndpointCount(void);
-
-/** @} END Attribute Storage */
-
-/** @} END addtogroup */
-
-/**
- * Returns the pointer to the data version storage for the given endpoint and
- * cluster.  Can return null in the following cases:
- *
- * 1) There is no such endpoint.
- * 2) There is no such server cluster on the given endpoint.
- * 3) No storage for a data version was provided for the endpoint.
- */
-chip::DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & aConcreteClusterPath);
-
-namespace chip {
-namespace app {
-
-class EnabledEndpointsWithServerCluster
-{
-public:
-    EnabledEndpointsWithServerCluster(ClusterId clusterId);
-
-    // Instead of having a separate Iterator class, optimize for codesize by
-    // just reusing ourselves as our own iterator.  We could do a bit better
-    // here with C++17 and using a different type for the end iterator, but this
-    // is the best I've found with C++14 so far.
-    //
-    // This does mean that you can only iterate a given
-    // EnabledEndpointsWithServerCluster once, but that's OK given how we use it
-    // in practice.
-    EnabledEndpointsWithServerCluster & begin() { return *this; }
-    const EnabledEndpointsWithServerCluster & end() const { return *this; }
-
-    bool operator!=(const EnabledEndpointsWithServerCluster & other) const { return mEndpointIndex != mEndpointCount; }
-
-    EnabledEndpointsWithServerCluster & operator++();
-
-    EndpointId operator*() const { return emberAfEndpointFromIndex(mEndpointIndex); }
-
-private:
-    void EnsureMatchingEndpoint();
-
-    uint16_t mEndpointIndex = 0;
-    uint16_t mEndpointCount = emberAfEndpointCount();
-    ClusterId mClusterId;
-};
-
-/**
- * @brief Sets the parent endpoint for a given endpoint
- */
-CHIP_ERROR SetParentEndpointForEndpoint(EndpointId childEndpoint, EndpointId parentEndpoint);
-
-/**
- * @brief Sets an Endpoint to use Flat Composition
- */
-CHIP_ERROR SetFlatCompositionForEndpoint(EndpointId endpoint);
-
-/**
- * @brief Sets an Endpoint to use Tree Composition
- */
-CHIP_ERROR SetTreeCompositionForEndpoint(EndpointId endpoint);
-
-/**
- * @brief Returns true is an Endpoint has flat composition
- */
-bool IsFlatCompositionForEndpoint(EndpointId endpoint);
-
-/**
- * @brief Returns true is an Endpoint has tree composition
- */
-bool IsTreeCompositionForEndpoint(EndpointId endpoint);
-
-} // namespace app
-} // namespace chip
diff --git a/src/app/util/attribute-storage-detail.h b/src/app/util/attribute-storage-detail.h
new file mode 100644
index 00000000000000..922605f3f91da7
--- /dev/null
+++ b/src/app/util/attribute-storage-detail.h
@@ -0,0 +1,88 @@
+/**
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/AttributeAccessInterface.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/util/config.h>
+#include <app/util/endpoint-config-api.h>
+#include <lib/support/CodeUtils.h>
+
+#include <app/util/att-storage.h>
+#include <app/util/attribute-metadata.h>
+#include <zap-generated/endpoint_config.h>
+
+#include <protocols/interaction_model/StatusCode.h>
+
+extern uint8_t attributeData[]; // main storage bucket for all attributes
+
+void emAfCallInits();
+
+chip::Protocols::InteractionModel::Status emAfReadOrWriteAttribute(const EmberAfAttributeSearchRecord * attRecord,
+                                                                   const EmberAfAttributeMetadata ** metadata, uint8_t * buffer,
+                                                                   uint16_t readLength, bool write);
+
+//
+// Given a cluster ID, endpoint ID and a cluster mask, finds a matching cluster within that endpoint
+// with a matching mask. If one is found, the relative index of that cluster within the list of clusters on that
+// endpoint is returned. Otherwise, 0xFF is returned.
+//
+uint8_t emberAfClusterIndex(chip::EndpointId endpoint, chip::ClusterId clusterId, EmberAfClusterMask mask);
+
+// Returns the clusterId of Nth server or client cluster,
+// depending on server toggle.
+// Returns Optional<ClusterId>::Missing if cluster does not exist.
+chip::Optional<chip::ClusterId> emberAfGetNthClusterId(chip::EndpointId endpoint, uint8_t n, bool server);
+
+// Returns cluster within the endpoint; Does not ignore disabled endpoints
+const EmberAfCluster * emberAfFindClusterIncludingDisabledEndpoints(chip::EndpointId endpoint, chip::ClusterId clusterId,
+                                                                    EmberAfClusterMask mask);
+
+// Function mask must contain one of the CLUSTER_MASK function macros,
+// then this method either returns the function pointer or null if
+// function doesn't exist. Before you call the function, you must
+// cast it.
+EmberAfGenericClusterFunction emberAfFindClusterFunction(const EmberAfCluster * cluster, EmberAfClusterMask functionMask);
+
+// After the RAM value has changed, code should call this function. If this
+// attribute has been tagged as non-volatile, its value will be stored.
+void emAfSaveAttributeToStorageIfNeeded(uint8_t * data, chip::EndpointId endpoint, chip::ClusterId clusterId,
+                                        const EmberAfAttributeMetadata * metadata);
+
+// Calls the attribute changed callback
+void emAfClusterAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+// Calls the attribute changed callback for a specific cluster.
+chip::Protocols::InteractionModel::Status
+emAfClusterPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType,
+                                       uint16_t size, uint8_t * value);
+
+// Get the number of attributes of the specific cluster under the endpoint.
+// Returns 0 if the cluster does not exist.
+uint16_t emberAfGetServerAttributeCount(chip::EndpointId endpoint, chip::ClusterId cluster);
+
+// Get the index of the given attribute of the specific cluster under the endpoint.
+// Returns UINT16_MAX if the attribute does not exist.
+uint16_t emberAfGetServerAttributeIndexByAttributeId(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                     chip::AttributeId attributeId);
+
+// Get the attribute id at the attributeIndex of the cluster under the endpoint. This function is useful for iterating over the
+// attributes.
+// Returns Optional<chip::AttributeId>::Missing() if the attribute does not exist.
+chip::Optional<chip::AttributeId> emberAfGetServerAttributeIdByIndex(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                                     uint16_t attributeIndex);
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index 6aa8e334a9380f..d154b95cf9ab9e 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -17,13 +17,15 @@
 
 #include <app/util/attribute-storage.h>
 
-#include <app/AttributeAccessInterfaceCache.h>
+#include <app/util/attribute-storage-detail.h>
+
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/AttributePersistenceProvider.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/config.h>
 #include <app/util/ember-strings.h>
+#include <app/util/endpoint-config-api.h>
 #include <app/util/generic-callbacks.h>
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/CodeUtils.h>
@@ -138,43 +140,6 @@ constexpr const EmberAfDeviceType fixedDeviceTypeList[]             = FIXED_DEVI
 DataVersion fixedEndpointDataVersions[ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT];
 #endif // FIXED_ENDPOINT_COUNT > 0
 
-AttributeAccessInterface * gAttributeAccessOverrides = nullptr;
-AttributeAccessInterfaceCache gAttributeAccessInterfaceCache;
-
-// shouldUnregister returns true if the given AttributeAccessInterface should be
-// unregistered.
-template <typename F>
-void UnregisterMatchingAttributeAccessInterfaces(F shouldUnregister)
-{
-    AttributeAccessInterface * prev = nullptr;
-    AttributeAccessInterface * cur  = gAttributeAccessOverrides;
-    while (cur)
-    {
-        AttributeAccessInterface * next = cur->GetNext();
-        if (shouldUnregister(cur))
-        {
-            // Remove it from the list
-            if (prev)
-            {
-                prev->SetNext(next);
-            }
-            else
-            {
-                gAttributeAccessOverrides = next;
-            }
-
-            cur->SetNext(nullptr);
-
-            // Do not change prev in this case.
-        }
-        else
-        {
-            prev = cur;
-        }
-        cur = next;
-    }
-}
-
 bool emberAfIsThisDataTypeAListType(EmberAfAttributeType dataType)
 {
     return dataType == ZCL_ARRAY_ATTRIBUTE_TYPE;
@@ -460,10 +425,7 @@ static void shutdownEndpoint(EmberAfDefinedEndpoint * definedEndpoint)
     // endpoint.
     chip::app::InteractionModelEngine::GetInstance()->UnregisterCommandHandlers(definedEndpoint->endpoint);
 
-    // Clear out any attribute access overrides registered for this
-    // endpoint.
-    UnregisterMatchingAttributeAccessInterfaces(
-        [endpoint = definedEndpoint->endpoint](AttributeAccessInterface * entry) { return entry->MatchesEndpoint(endpoint); });
+    unregisterAllAttributeAccessOverridesForEndpoint(definedEndpoint);
 }
 
 // Calls the init functions.
@@ -816,10 +778,17 @@ bool emberAfContainsServerFromIndex(uint16_t index, ClusterId clusterId)
 namespace chip {
 namespace app {
 
-EnabledEndpointsWithServerCluster::EnabledEndpointsWithServerCluster(ClusterId clusterId) : mClusterId(clusterId)
+EnabledEndpointsWithServerCluster::EnabledEndpointsWithServerCluster(ClusterId clusterId) :
+    mEndpointCount(emberAfEndpointCount()), mClusterId(clusterId)
 {
     EnsureMatchingEndpoint();
 }
+
+EndpointId EnabledEndpointsWithServerCluster::operator*() const
+{
+    return emberAfEndpointFromIndex(mEndpointIndex);
+}
+
 EnabledEndpointsWithServerCluster & EnabledEndpointsWithServerCluster::operator++()
 {
     ++mEndpointIndex;
@@ -1373,62 +1342,9 @@ EmberAfGenericClusterFunction emberAfFindClusterFunction(const EmberAfCluster *
     return cluster->functions[functionIndex];
 }
 
-bool registerAttributeAccessOverride(AttributeAccessInterface * attrOverride)
-{
-    gAttributeAccessInterfaceCache.Invalidate();
-    for (auto * cur = gAttributeAccessOverrides; cur; cur = cur->GetNext())
-    {
-        if (cur->Matches(*attrOverride))
-        {
-            ChipLogError(Zcl, "Duplicate attribute override registration failed");
-            return false;
-        }
-    }
-    attrOverride->SetNext(gAttributeAccessOverrides);
-    gAttributeAccessOverrides = attrOverride;
-    return true;
-}
-
-void unregisterAttributeAccessOverride(AttributeAccessInterface * attrOverride)
-{
-    gAttributeAccessInterfaceCache.Invalidate();
-    UnregisterMatchingAttributeAccessInterfaces([attrOverride](AttributeAccessInterface * entry) { return entry == attrOverride; });
-}
-
 namespace chip {
 namespace app {
 
-app::AttributeAccessInterface * GetAttributeAccessOverride(EndpointId endpointId, ClusterId clusterId)
-{
-    using CacheResult = AttributeAccessInterfaceCache::CacheResult;
-
-    AttributeAccessInterface * cached = nullptr;
-    CacheResult result                = gAttributeAccessInterfaceCache.Get(endpointId, clusterId, &cached);
-    switch (result)
-    {
-    case CacheResult::kDefinitelyUnused:
-        return nullptr;
-    case CacheResult::kDefinitelyUsed:
-        return cached;
-    case CacheResult::kCacheMiss:
-    default:
-        // Did not cache yet, search set of AAI registered, and cache if found.
-        for (app::AttributeAccessInterface * cur = gAttributeAccessOverrides; cur; cur = cur->GetNext())
-        {
-            if (cur->Matches(endpointId, clusterId))
-            {
-                gAttributeAccessInterfaceCache.MarkUsed(endpointId, clusterId, cur);
-                return cur;
-            }
-        }
-
-        // Did not find AAI registered: mark as definitely not using.
-        gAttributeAccessInterfaceCache.MarkUnused(endpointId, clusterId);
-    }
-
-    return nullptr;
-}
-
 CHIP_ERROR SetParentEndpointForEndpoint(EndpointId childEndpoint, EndpointId parentEndpoint)
 {
     uint16_t childIndex  = emberAfIndexFromEndpoint(childEndpoint);
diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h
index 4365366e707f8a..b25f106d4fcecd 100644
--- a/src/app/util/attribute-storage.h
+++ b/src/app/util/attribute-storage.h
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,26 +17,28 @@
 
 #pragma once
 
-// #include PLATFORM_HEADER
 #include <app/AttributeAccessInterface.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/util/af.h>
+#include <app/util/af-types.h>
+#include <app/util/att-storage.h>
+#include <app/util/attribute-metadata.h>
 #include <app/util/config.h>
-#include <app/util/endpoint-config-api.h>
+#include <app/util/endpoint-config-defines.h>
 #include <lib/support/CodeUtils.h>
 
-#include <app/util/att-storage.h>
+#include <app-common/zap-generated/attribute-type.h>
+#include <app-common/zap-generated/cluster-objects.h>
+
+// NOTE: direct include here even though app/util/config.h is the public header,
+//       because MAX_ENDPOINT_COUNT needs FIXED_ENDPOINT_COUNT definitions.
 #include <zap-generated/endpoint_config.h>
 
-#include <protocols/interaction_model/StatusCode.h>
+static constexpr uint16_t kEmberInvalidEndpointIndex = 0xFFFF;
 
 // If we have fixed number of endpoints, then max is the same.
 #ifdef FIXED_ENDPOINT_COUNT
 #define MAX_ENDPOINT_COUNT (FIXED_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT)
 #endif
 
-#include <app-common/zap-generated/attribute-type.h>
-
 #define DECLARE_DYNAMIC_ENDPOINT(endpointName, clusterList)                                                                        \
     EmberAfEndpointType endpointName = { clusterList, ArraySize(clusterList), 0 }
 
@@ -64,94 +66,122 @@
         ZAP_EMPTY_DEFAULT(), attId, attSizeBytes, ZAP_TYPE(attType), attrMask | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE)               \
     }
 
-extern uint8_t attributeData[]; // main storage bucket for all attributes
-
-void emAfCallInits(void);
-
-// Initial configuration
-void emberAfEndpointConfigure(void);
-
-chip::Protocols::InteractionModel::Status emAfReadOrWriteAttribute(const EmberAfAttributeSearchRecord * attRecord,
-                                                                   const EmberAfAttributeMetadata ** metadata, uint8_t * buffer,
-                                                                   uint16_t readLength, bool write);
+/**
+ * @brief locate attribute metadata
+ *
+ * Function returns pointer to the attribute metadata structure,
+ * or NULL if attribute was not found.
+ *
+ * @param endpoint Zigbee endpoint number.
+ * @param clusterId Cluster ID of the sought cluster.
+ * @param attributeId Attribute ID of the sought attribute.
+ *
+ * @return Returns pointer to the attribute metadata location.
+ */
+const EmberAfAttributeMetadata * emberAfLocateAttributeMetadata(chip::EndpointId endpoint, chip::ClusterId clusterId,
+                                                                chip::AttributeId attributeId);
 
-// Check if a cluster is implemented or not. If yes, the cluster is returned.
-//
-// mask = 0 -> find either client or server
-// mask = CLUSTER_MASK_CLIENT -> find client
-// mask = CLUSTER_MASK_SERVER -> find server
-//
-// If a pointer to an index is provided, it will be updated to point to the relative index of the cluster
-// within the set of clusters that match the mask criteria.
-//
-const EmberAfCluster * emberAfFindClusterInType(const EmberAfEndpointType * endpointType, chip::ClusterId clusterId,
-                                                EmberAfClusterMask mask, uint8_t * index = nullptr);
+/**
+ * @brief Returns true if endpoint contains the ZCL server with specified id.
+ *
+ * This function returns true if
+ * the endpoint contains server of a given cluster.
+ */
+bool emberAfContainsServer(chip::EndpointId endpoint, chip::ClusterId clusterId);
 
-//
-// Given a cluster ID, endpoint ID and a cluster mask, finds a matching cluster within that endpoint
-// with a matching mask. If one is found, the relative index of that cluster within the list of clusters on that
-// endpoint is returned. Otherwise, 0xFF is returned.
-//
-uint8_t emberAfClusterIndex(chip::EndpointId endpoint, chip::ClusterId clusterId, EmberAfClusterMask mask);
+/**
+ * @brief Returns true if endpoint of given index contains the ZCL server with specified id.
+ *
+ * This function returns true if
+ * the endpoint of given index contains server of a given cluster.
+ * If this function is used with a manufacturer specific clusterId
+ * then this will return the first cluster that it finds in the Cluster table.
+ * and will not return any other clusters that share that id.
+ */
+bool emberAfContainsServerFromIndex(uint16_t index, chip::ClusterId clusterId);
 
-// If server == true, returns the number of server clusters,
-// otherwise number of client clusters on this endpoint
-uint8_t emberAfClusterCount(chip::EndpointId endpoint, bool server);
+/**
+ * @brief Returns true if endpoint contains the ZCL client with specified id.
+ *
+ * This function returns true if
+ * the endpoint contains client of a given cluster.
+ */
+bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId);
 
-// Returns the cluster of Nth server or client cluster,
-// depending on server toggle.
-const EmberAfCluster * emberAfGetNthCluster(chip::EndpointId endpoint, uint8_t n, bool server);
+/**
+ * @brief macro that returns size of attribute in bytes.
+ *
+ * @param metadata EmberAfAttributeMetadata* to consider.
+ */
+#define emberAfAttributeSize(metadata) ((metadata)->size)
 
-// Returns the clusterId of Nth server or client cluster,
-// depending on server toggle.
-// Returns Optional<ClusterId>::Missing if cluster does not exist.
-chip::Optional<chip::ClusterId> emberAfGetNthClusterId(chip::EndpointId endpoint, uint8_t n, bool server);
+/**
+ * Returns the index of a given endpoint.  Will return 0xFFFF if this is not a
+ * valid endpoint id or if the endpoint is disabled.
+ */
+uint16_t emberAfIndexFromEndpoint(chip::EndpointId endpoint);
 
-// Returns number of clusters put into the passed cluster list
-// for the given endpoint and client/server polarity
-uint8_t emberAfGetClustersFromEndpoint(chip::EndpointId endpoint, chip::ClusterId * clusterList, uint8_t listLen, bool server);
+/**
+ * @brief Returns parent endpoint for a given endpoint index
+ */
+chip::EndpointId emberAfParentEndpointFromIndex(uint16_t index);
 
-// Returns cluster within the endpoint; Does not ignore disabled endpoints
-const EmberAfCluster * emberAfFindClusterIncludingDisabledEndpoints(chip::EndpointId endpoint, chip::ClusterId clusterId,
-                                                                    EmberAfClusterMask mask);
+/**
+ *  @brief Returns the index of the given endpoint in the list of all endpoints that might support the given cluster server.
+ *
+ * Returns kEmberInvalidEndpointIndex if the given endpoint does not support the
+ * given cluster or if the given endpoint is disabled.
+ *
+ * This function always returns the same index for a given endpointId instance, fixed or dynamic.
+ *
+ * The return index for fixed endpoints will range from 0 to (fixedClusterServerEndpointCount - 1),
+ * For dynamic endpoints the indexing assumes that any dynamic endpoint could start supporting
+ * the given server cluster and their index will range from fixedClusterServerEndpointCount to
+ * (fixedClusterServerEndpointCount + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT - 1).
+ *
+ * For example, if a device has 4 fixed endpoints (ids 0-3) and 2 dynamic
+ * endpoints, and cluster X is supported on endpoints 1 and 3, then
+ * fixedClusterServerEndpointCount should be 2 and
+ *
+ * 1) emberAfGetClusterServerEndpointIndex(0, X) returns kEmberInvalidEndpointIndex
+ * 2) emberAfGetClusterServerEndpointIndex(1, X) returns 0
+ * 3) emberAfGetClusterServerEndpointIndex(2, X) returns kEmberInvalidEndpointIndex
+ * 4) emberAfGetClusterServerEndpointIndex(3, X) returns 1
 
-// Function mask must contain one of the CLUSTER_MASK function macros,
-// then this method either returns the function pointer or null if
-// function doesn't exist. Before you call the function, you must
-// cast it.
-EmberAfGenericClusterFunction emberAfFindClusterFunction(const EmberAfCluster * cluster, EmberAfClusterMask functionMask);
+ * The Dynamic endpoints are placed after the fixed ones;
+ * therefore their return index will always be >= to fixedClusterServerEndpointCount
+ *
+ * If a dynamic endpoint, supporting cluster X, is defined to dynamic index 1 with endpoint id 7,
+ * (via emberAfSetDynamicEndpoint(1, 7, ...))
+ * then emberAfGetClusterServerEndpointIndex(7, X) returns 3 (fixedClusterServerEndpointCount{2} + DynamicEndpointIndex {1}).
+ *
+ * If now a second dynamic endpoint, also supporting cluster X, is defined to dynamic index 0
+ * with endpoint id 9  (via emberAfSetDynamicEndpoint(0, 9, ...)),
+ * emberAfGetClusterServerEndpointIndex(9, X) returns 2. (fixedClusterServerEndpointCount{2} + DynamicEndpointIndex {0}).
+ * and emberAfGetClusterServerEndpointIndex(7, X) still returns 3
+ *
+ * @param endpoint Endpoint number
+ * @param cluster Id the of the Cluster server you are interrested on
+ * @param fixedClusterServerEndpointCount The number of fixed endpoints containing this cluster server.  Typically one of the
+ MATTER_DM_*_CLUSTER_SERVER_ENDPOINT_COUNT constants.
+ */
+uint16_t emberAfGetClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                              uint16_t fixedClusterServerEndpointCount);
 
 /**
- * @brief Loads attribute defaults and any non-volatile attributes stored
+ * Returns the pointer to the data version storage for the given endpoint and
+ * cluster.  Can return null in the following cases:
  *
- * @param endpoint EnpointId. Use chip::kInvalidEndpointId to initialize all endpoints
+ * 1) There is no such endpoint.
+ * 2) There is no such server cluster on the given endpoint.
+ * 3) No storage for a data version was provided for the endpoint.
  */
-void emberAfInitializeAttributes(chip::EndpointId endpoint);
-
-// After the RAM value has changed, code should call this function. If this
-// attribute has been tagged as non-volatile, its value will be stored.
-void emAfSaveAttributeToStorageIfNeeded(uint8_t * data, chip::EndpointId endpoint, chip::ClusterId clusterId,
-                                        const EmberAfAttributeMetadata * metadata);
-
-// Calls the attribute changed callback
-void emAfClusterAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-
-// Calls the attribute changed callback for a specific cluster.
-chip::Protocols::InteractionModel::Status
-emAfClusterPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType,
-                                       uint16_t size, uint8_t * value);
+chip::DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & aConcreteClusterPath);
 
-// Note the difference in for server filtering.
-// This method will return the cluster count for BOTH client and server
-// and those do NOT work with NthCluster/NthClusterId
-//  - Use emberAfGetClustersFromEndpoint()  with emberAfGetNthCluster() emberAfGetNthClusterId()
-//
-uint8_t emberAfGetClusterCountForEndpoint(chip::EndpointId endpoint);
-
-//
-// Retrieve the device type list associated with a specific endpoint.
-//
-chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err);
+/**
+ * @brief Returns the number of pre-compiled endpoints.
+ */
+uint16_t emberAfFixedEndpointCount();
 
 /**
  * Get the semantic tags of the endpoint.
@@ -166,21 +196,39 @@ CHIP_ERROR GetSemanticTagForEndpointAtIndex(chip::EndpointId endpoint, size_t in
                                             chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::Type & tag);
 
 //
-// Override the device type list current associated with an endpoint with a user-provided list. The buffers backing
+// Override the tag list current associated with an endpoint with a user-provided list. The buffers backing
 // that list have to live as long as the endpoint is enabled.
 //
 // NOTE: It is the application's responsibility to free the existing list that is being replaced if needed.
 //
-CHIP_ERROR emberAfSetDeviceTypeList(chip::EndpointId endpoint, chip::Span<const EmberAfDeviceType> deviceTypeList);
+CHIP_ERROR SetTagList(chip::EndpointId endpoint,
+                      chip::Span<const chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::Type> tagList);
+
+// Returns number of clusters put into the passed cluster list
+// for the given endpoint and client/server polarity
+uint8_t emberAfGetClustersFromEndpoint(chip::EndpointId endpoint, chip::ClusterId * clusterList, uint8_t listLen, bool server);
 
+// Note the difference in for server filtering.
+// This method will return the cluster count for BOTH client and server
+// and those do NOT work with NthCluster/NthClusterId
+//  - Use emberAfGetClustersFromEndpoint()  with emberAfGetNthCluster() emberAfGetNthClusterId()
 //
-// Override the tag list current associated with an endpoint with a user-provided list. The buffers backing
-// that list have to live as long as the endpoint is enabled.
+uint8_t emberAfGetClusterCountForEndpoint(chip::EndpointId endpoint);
+
+// Check if a cluster is implemented or not. If yes, the cluster is returned.
 //
-// NOTE: It is the application's responsibility to free the existing list that is being replaced if needed.
+// mask = 0 -> find either client or server
+// mask = CLUSTER_MASK_CLIENT -> find client
+// mask = CLUSTER_MASK_SERVER -> find server
 //
-CHIP_ERROR SetTagList(chip::EndpointId endpoint,
-                      chip::Span<const chip::app::Clusters::Descriptor::Structs::SemanticTagStruct::Type> tagList);
+// If a pointer to an index is provided, it will be updated to point to the relative index of the cluster
+// within the set of clusters that match the mask criteria.
+//
+const EmberAfCluster * emberAfFindClusterInType(const EmberAfEndpointType * endpointType, chip::ClusterId clusterId,
+                                                EmberAfClusterMask mask, uint8_t * index = nullptr);
+
+// Initial configuration
+void emberAfEndpointConfigure();
 
 // Register a dynamic endpoint. This involves registering descriptors that describe
 // the composition of the endpoint (encapsulated in the 'ep' argument) as well as providing
@@ -209,37 +257,91 @@ CHIP_ERROR emberAfSetDynamicEndpoint(uint16_t index, chip::EndpointId id, const
                                      chip::EndpointId parentEndpointId                  = chip::kInvalidEndpointId);
 chip::EndpointId emberAfClearDynamicEndpoint(uint16_t index);
 uint16_t emberAfGetDynamicIndexFromEndpoint(chip::EndpointId id);
+/**
+ * @brief Loads attribute defaults and any non-volatile attributes stored
+ *
+ * @param endpoint EnpointId. Use chip::kInvalidEndpointId to initialize all endpoints
+ */
+void emberAfInitializeAttributes(chip::EndpointId endpoint);
+
+// If server == true, returns the number of server clusters,
+// otherwise number of client clusters on this endpoint
+uint8_t emberAfClusterCount(chip::EndpointId endpoint, bool server);
 
-// Get the number of attributes of the specific cluster under the endpoint.
-// Returns 0 if the cluster does not exist.
-uint16_t emberAfGetServerAttributeCount(chip::EndpointId endpoint, chip::ClusterId cluster);
+// Returns the cluster of Nth server or client cluster,
+// depending on server toggle.
+const EmberAfCluster * emberAfGetNthCluster(chip::EndpointId endpoint, uint8_t n, bool server);
 
-// Get the index of the given attribute of the specific cluster under the endpoint.
-// Returns UINT16_MAX if the attribute does not exist.
-uint16_t emberAfGetServerAttributeIndexByAttributeId(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                     chip::AttributeId attributeId);
+//
+// Retrieve the device type list associated with a specific endpoint.
+//
+chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpoint(chip::EndpointId endpoint, CHIP_ERROR & err);
 
-// Get the attribute id at the attributeIndex of the cluster under the endpoint. This function is useful for iterating over the
-// attributes.
-// Returns Optional<chip::AttributeId>::Missing() if the attribute does not exist.
-chip::Optional<chip::AttributeId> emberAfGetServerAttributeIdByIndex(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                                     uint16_t attributeIndex);
+//
+// Override the device type list current associated with an endpoint with a user-provided list. The buffers backing
+// that list have to live as long as the endpoint is enabled.
+//
+// NOTE: It is the application's responsibility to free the existing list that is being replaced if needed.
+//
+CHIP_ERROR emberAfSetDeviceTypeList(chip::EndpointId endpoint, chip::Span<const EmberAfDeviceType> deviceTypeList);
+
+namespace chip {
+namespace app {
+
+class EnabledEndpointsWithServerCluster
+{
+public:
+    EnabledEndpointsWithServerCluster(ClusterId clusterId);
+
+    // Instead of having a separate Iterator class, optimize for codesize by
+    // just reusing ourselves as our own iterator.  We could do a bit better
+    // here with C++17 and using a different type for the end iterator, but this
+    // is the best I've found with C++14 so far.
+    //
+    // This does mean that you can only iterate a given
+    // EnabledEndpointsWithServerCluster once, but that's OK given how we use it
+    // in practice.
+    EnabledEndpointsWithServerCluster & begin() { return *this; }
+    const EnabledEndpointsWithServerCluster & end() const { return *this; }
+
+    bool operator!=(const EnabledEndpointsWithServerCluster & other) const { return mEndpointIndex != mEndpointCount; }
+
+    EnabledEndpointsWithServerCluster & operator++();
+
+    EndpointId operator*() const;
+
+private:
+    void EnsureMatchingEndpoint();
+
+    uint16_t mEndpointIndex = 0;
+    uint16_t mEndpointCount = 0;
+    ClusterId mClusterId;
+};
 
 /**
- * Register an attribute access override.  It will remain registered until the
- * endpoint it's registered for is disabled (or until shutdown if it's
- * registered for all endpoints) or until it is explicitly unregistered.
- * Registration will fail if there is an already-registered override for the
- * same set of attributes.
- *
- * @return false if there is an existing override that the new one would
- *               conflict with.  In this case the override is not registered.
- * @return true if registration was successful.
+ * @brief Sets the parent endpoint for a given endpoint
  */
-bool registerAttributeAccessOverride(chip::app::AttributeAccessInterface * attrOverride);
+CHIP_ERROR SetParentEndpointForEndpoint(EndpointId childEndpoint, EndpointId parentEndpoint);
 
 /**
- * Unregister an attribute access override (for example if the object
- * implementing AttributeAccessInterface is being destroyed).
+ * @brief Sets an Endpoint to use Flat Composition
  */
-void unregisterAttributeAccessOverride(chip::app::AttributeAccessInterface * attrOverride);
+CHIP_ERROR SetFlatCompositionForEndpoint(EndpointId endpoint);
+
+/**
+ * @brief Sets an Endpoint to use Tree Composition
+ */
+CHIP_ERROR SetTreeCompositionForEndpoint(EndpointId endpoint);
+
+/**
+ * @brief Returns true is an Endpoint has flat composition
+ */
+bool IsFlatCompositionForEndpoint(EndpointId endpoint);
+
+/**
+ * @brief Returns true is an Endpoint has tree composition
+ */
+bool IsTreeCompositionForEndpoint(EndpointId endpoint);
+
+} // namespace app
+} // namespace chip
diff --git a/src/app/util/attribute-table-detail.h b/src/app/util/attribute-table-detail.h
new file mode 100644
index 00000000000000..d755f9cd23cbac
--- /dev/null
+++ b/src/app/util/attribute-table-detail.h
@@ -0,0 +1,32 @@
+/**
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/util/attribute-metadata.h>
+#include <lib/core/DataModelTypes.h>
+#include <protocols/interaction_model/StatusCode.h>
+
+/**
+ * Write an attribute for a request arriving from external sources.
+ *
+ * This will check attribute writeability and that
+ * the provided data type matches the expected data type.
+ */
+chip::Protocols::InteractionModel::Status emAfWriteAttributeExternal(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                                     chip::AttributeId attributeID, uint8_t * dataPtr,
+                                                                     EmberAfAttributeType dataType);
diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp
index 0b0f2143ecbc1c..57b5f43d35071f 100644
--- a/src/app/util/attribute-table.cpp
+++ b/src/app/util/attribute-table.cpp
@@ -16,8 +16,12 @@
  */
 #include <app/util/attribute-table.h>
 
+#include <app/util/attribute-table-detail.h>
+
+#include <app/util/attribute-storage-detail.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
+#include <app/util/ember-strings.h>
 #include <app/util/generic-callbacks.h>
 #include <app/util/odd-sized-integers.h>
 #include <lib/core/CHIPConfig.h>
@@ -34,9 +38,9 @@
 using chip::Protocols::InteractionModel::Status;
 
 using namespace chip;
+using namespace chip::app;
 
 namespace {
-
 // Zigbee spec says types between signed 8 bit and signed 64 bit
 bool emberAfIsTypeSigned(EmberAfAttributeType dataType)
 {
@@ -131,18 +135,58 @@ int8_t emberAfCompareValues(const uint8_t * val1, const uint8_t * val2, uint16_t
     return 0;
 }
 
-} // namespace
+/**
+ * @brief write an attribute, performing all the checks.
+ *
+ * This function will attempt to write the attribute value from
+ * the provided pointer. This function will only check that the
+ * attribute exists. If it does it will write the value into
+ * the attribute table for the given attribute.
+ *
+ * This function will not check to see if the attribute is
+ * writable since the read only / writable characteristic
+ * of an attribute only pertains to external devices writing
+ * over the air. Because this function is being called locally
+ * it assumes that the device knows what it is doing and has permission
+ * to perform the given operation.
+ *
+ * if true is passed in for overrideReadOnlyAndDataType then the data type is
+ * not checked and the read-only flag is ignored. This mode is meant for
+ * testing or setting the initial value of the attribute on the device.
+ *
+ * this returns:
+ * - Status::UnsupportedEndpoint: if endpoint isn't supported by the device.
+ * - Status::UnsupportedCluster: if cluster isn't supported on the endpoint.
+ * - Status::UnsupportedAttribute: if attribute isn't supported in the cluster.
+ * - Status::InvalidDataType: if the data type passed in doesnt match the type
+ *           stored in the attribute table
+ * - Status::UnsupportedWrite: if the attribute isnt writable
+ * - Status::ConstraintError: if the value is set out of the allowable range for
+ *           the attribute
+ * - Status::Success: if the attribute was found and successfully written
+ */
+Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * data,
+                          EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, MarkAttributeDirty markDirty);
+} // anonymous namespace
 
 Status emAfWriteAttributeExternal(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr,
                                   EmberAfAttributeType dataType)
 {
-    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, false /* override read-only */);
+    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, false /* override read-only */,
+                              MarkAttributeDirty::kIfChanged);
 }
 
 Status emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr,
                              EmberAfAttributeType dataType)
 {
-    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, true /* override read-only */);
+    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, true /* override read-only */,
+                              MarkAttributeDirty::kIfChanged);
+}
+
+Status emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr,
+                             EmberAfAttributeType dataType, MarkAttributeDirty markDirty)
+{
+    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, true /* override read-only */, markDirty);
 }
 
 //------------------------------------------------------------------------------
@@ -204,8 +248,78 @@ static bool IsNullValue(const uint8_t * data, uint16_t dataLen, bool isAttribute
     return false;
 }
 
+namespace {
+
+/**
+ * Helper function to determine whether the attribute value for the given
+ * attribute is changing.  On success, the isChanging outparam will be set to
+ * whether the value is changing.
+ */
+Status AttributeValueIsChanging(EndpointId endpoint, ClusterId cluster, AttributeId attributeID,
+                                const EmberAfAttributeMetadata * metadata, uint8_t * newValueData, bool * isChanging)
+{
+    EmberAfAttributeType attributeType = metadata->attributeType;
+
+    // We don't know how to size our buffer for strings in general, but if the
+    // string happens to fit into our fixed-size buffer, great.
+    size_t valueSize               = metadata->size;
+    constexpr size_t kMaxValueSize = 16; // ipv6adr
+    if (valueSize > kMaxValueSize)
+    {
+        if (emberAfIsStringAttributeType(attributeType) || emberAfIsLongStringAttributeType(attributeType))
+        {
+            // It's a string that may not fit in our buffer.  Just claim it's
+            // changing, since we have no way to tell.
+            *isChanging = true;
+            return Status::Success;
+        }
+
+        // Very much unexpected
+        ChipLogError(Zcl, "Attribute type %d has too-large size %u", attributeType, static_cast<unsigned>(valueSize));
+        return Status::ConstraintError;
+    }
+
+    uint8_t oldValueBuffer[kMaxValueSize];
+    // Cast to uint16_t is safe, because we checked valueSize <= kMaxValueSize above.
+    if (emberAfReadAttribute(endpoint, cluster, attributeID, oldValueBuffer, static_cast<uint16_t>(valueSize)) != Status::Success)
+    {
+        // We failed to read the old value, so flag the value as changing to be safe.
+        *isChanging = true;
+        return Status::Success;
+    }
+
+    if (emberAfIsStringAttributeType(attributeType))
+    {
+        size_t oldLength = emberAfStringLength(oldValueBuffer);
+        size_t newLength = emberAfStringLength(newValueData);
+        // The first byte of the buffer is the string length, and
+        // oldLength/newLength refer to the number of bytes after that.  We want
+        // to include that first byte in our comparison, because null and empty
+        // string have different values there but both return 0 from
+        // emberAfStringLength.
+        *isChanging = (oldLength != newLength) || (memcmp(oldValueBuffer, newValueData, oldLength + 1) != 0);
+    }
+    else if (emberAfIsLongStringAttributeType(attributeType))
+    {
+        size_t oldLength = emberAfLongStringLength(oldValueBuffer);
+        size_t newLength = emberAfLongStringLength(newValueData);
+        // The first two bytes of the buffer are the string length, and
+        // oldLength/newLength refer to the number of bytes after that.  We want
+        // to include those first two bytes in our comparison, because null and
+        // empty string have different values there but both return 0 from
+        // emberAfLongStringLength.
+        *isChanging = (oldLength != newLength) || (memcmp(oldValueBuffer, newValueData, oldLength + 2) != 0);
+    }
+    else
+    {
+        *isChanging = (memcmp(newValueData, oldValueBuffer, valueSize) != 0);
+    }
+
+    return Status::Success;
+}
+
 Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * data,
-                          EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType)
+                          EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, MarkAttributeDirty markDirty)
 {
     const EmberAfAttributeMetadata * metadata = nullptr;
     EmberAfAttributeSearchRecord record;
@@ -283,12 +397,25 @@ Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId at
         }
     }
 
+    // Check whether anything is actually changing, before we do any work here.
+    bool valueChanging;
+    Status imStatus = AttributeValueIsChanging(endpoint, cluster, attributeID, metadata, data, &valueChanging);
+    if (imStatus != Status::Success)
+    {
+        return imStatus;
+    }
+
+    if (!valueChanging)
+    {
+        // Just do nothing.
+        return Status::Success;
+    }
+
     const app::ConcreteAttributePath attributePath(endpoint, cluster, attributeID);
 
     // Pre write attribute callback for all attribute changes,
     // regardless of cluster.
-    Protocols::InteractionModel::Status imStatus =
-        MatterPreAttributeChangeCallback(attributePath, dataType, emberAfAttributeSize(metadata), data);
+    imStatus = MatterPreAttributeChangeCallback(attributePath, dataType, emberAfAttributeSize(metadata), data);
     if (imStatus != Protocols::InteractionModel::Status::Success)
     {
         return imStatus;
@@ -325,7 +452,10 @@ Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId at
     // The callee will weed out attributes that do not need to be stored.
     emAfSaveAttributeToStorageIfNeeded(data, endpoint, cluster, metadata);
 
-    MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID);
+    if (markDirty != MarkAttributeDirty::kNo)
+    {
+        MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID);
+    }
 
     // Post write attribute callback for all attributes changes, regardless
     // of cluster.
@@ -338,6 +468,8 @@ Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId at
     return Status::Success;
 }
 
+} // anonymous namespace
+
 Status emberAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength)
 {
     const EmberAfAttributeMetadata * metadata = nullptr;
diff --git a/src/app/util/attribute-table.h b/src/app/util/attribute-table.h
index 7b86298209326f..0527e855d4350d 100644
--- a/src/app/util/attribute-table.h
+++ b/src/app/util/attribute-table.h
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,20 +17,11 @@
 
 #pragma once
 
-#include <app/util/af.h>
-
+#include <app/util/af-types.h>
+#include <app/util/attribute-metadata.h>
+#include <lib/core/DataModelTypes.h>
 #include <protocols/interaction_model/StatusCode.h>
 
-/**
- * Write an attribute for a request arriving from external sources.
- *
- * This will check attribute writeability and that
- * the provided data type matches the expected data type.
- */
-chip::Protocols::InteractionModel::Status emAfWriteAttributeExternal(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                                     chip::AttributeId attributeID, uint8_t * dataPtr,
-                                                                     EmberAfAttributeType dataType);
-
 /**
  * @brief write an attribute, performing all the checks.
  *
@@ -46,21 +37,34 @@ chip::Protocols::InteractionModel::Status emAfWriteAttributeExternal(chip::Endpo
  * it assumes that the device knows what it is doing and has permission
  * to perform the given operation.
  *
- * if true is passed in for overrideReadOnlyAndDataType then the data type is
- * not checked and the read-only flag is ignored. This mode is meant for
- * testing or setting the initial value of the attribute on the device.
+ * This function also does NOT check that the input dataType matches the expected
+ * data type (as Accessors.h/cpp have this correct by default).
+ * TODO: this not checking seems off - what if this is run without Accessors.h ?
+ */
+chip::Protocols::InteractionModel::Status emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                                chip::AttributeId attributeID, uint8_t * dataPtr,
+                                                                EmberAfAttributeType dataType);
+
+/**
+ * A version of emberAfWriteAttribute that allows controlling when the attribute
+ * should be marked dirty.  This is an overload, not an optional argument, to
+ * reduce codesize at all the callsites that want to write without doing
+ * anything special to control the dirty marking.
+ */
+chip::Protocols::InteractionModel::Status emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                                chip::AttributeId attributeID, uint8_t * dataPtr,
+                                                                EmberAfAttributeType dataType,
+                                                                chip::app::MarkAttributeDirty markDirty);
+
+/**
+ * @brief Read the attribute value, performing all the checks.
+ *
+ * This function will attempt to read the attribute and store it into the
+ * pointer.
  *
- * this returns:
- * - Status::UnsupportedEndpoint: if endpoint isn't supported by the device.
- * - Status::UnsupportedCluster: if cluster isn't supported on the endpoint.
- * - Status::UnsupportedAttribute: if attribute isn't supported in the cluster.
- * - Status::InvalidDataType: if the data type passed in doesnt match the type
- *           stored in the attribute table
- * - Status::UnsupportedWrite: if the attribute isnt writable
- * - Status::ConstraintError: if the value is set out of the allowable range for
- *           the attribute
- * - Status::Success: if the attribute was found and successfully written
+ * dataPtr may be NULL, signifying that we don't need the value, just the status
+ * (i.e. whether the attribute can be read).
  */
-chip::Protocols::InteractionModel::Status emAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
-                                                             chip::AttributeId attributeID, uint8_t * data,
-                                                             EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType);
+chip::Protocols::InteractionModel::Status emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                               chip::AttributeId attributeID, uint8_t * dataPtr,
+                                                               uint16_t readLength);
diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp
index 81bf518558a5e3..16db0badc38030 100644
--- a/src/app/util/ember-compatibility-functions.cpp
+++ b/src/app/util/ember-compatibility-functions.cpp
@@ -25,10 +25,11 @@
 #include <app/RequiredPrivilege.h>
 #include <app/reporting/Engine.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
+#include <app/util/attribute-storage-detail.h>
 #include <app/util/attribute-storage-null-handling.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/attribute-table-detail.h>
 #include <app/util/attribute-table.h>
 #include <app/util/config.h>
 #include <app/util/odd-sized-integers.h>
diff --git a/src/app/util/ember-compatibility-functions.h b/src/app/util/ember-compatibility-functions.h
index a0888ac7f90498..1a81e543967482 100644
--- a/src/app/util/ember-compatibility-functions.h
+++ b/src/app/util/ember-compatibility-functions.h
@@ -17,6 +17,7 @@
 
 #include <access/SubjectDescriptor.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/ConcreteEventPath.h>
diff --git a/src/app/util/endpoint-config-api.h b/src/app/util/endpoint-config-api.h
index 2028c9f06d7f07..182e4a652a3740 100644
--- a/src/app/util/endpoint-config-api.h
+++ b/src/app/util/endpoint-config-api.h
@@ -30,7 +30,7 @@
  *
  * Typically only used for endpoint index iteration.
  */
-uint16_t emberAfEndpointCount(void);
+uint16_t emberAfEndpointCount();
 
 /**
  * @brief Enable/disable endpoints
diff --git a/src/app/util/mock/Functions.h b/src/app/util/mock/Functions.h
index 32ba08d316f484..16fe45d9045b9e 100644
--- a/src/app/util/mock/Functions.h
+++ b/src/app/util/mock/Functions.h
@@ -36,7 +36,15 @@ namespace Test {
 CHIP_ERROR ReadSingleMockClusterData(FabricIndex aAccessingFabricIndex, const app::ConcreteAttributePath & aPath,
                                      app::AttributeReportIBs::Builder & aAttributeReports,
                                      app::AttributeValueEncoder::AttributeEncodeState * apEncoderState);
+
+/// Increase the current value for `GetVersion`
 void BumpVersion();
+
+/// Sets GetVersion to return 0
+void ResetVersion();
+
+/// Gets the current value for the version that will
+/// be returned by emberAfDataVersionStorage
 DataVersion GetVersion();
 
 /// Configures the singular global mock attribute storage to use the specified configuration.
diff --git a/src/app/util/mock/MockNodeConfig.cpp b/src/app/util/mock/MockNodeConfig.cpp
index 3b9fa2416c57eb..79c886f532a8a2 100644
--- a/src/app/util/mock/MockNodeConfig.cpp
+++ b/src/app/util/mock/MockNodeConfig.cpp
@@ -18,8 +18,8 @@
 
 #include <app/util/mock/MockNodeConfig.h>
 
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
+#include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 
 #include <utility>
@@ -70,6 +70,22 @@ MockClusterConfig::MockClusterConfig(ClusterId aId, std::initializer_list<MockAt
     mEmberCluster.mask           = CLUSTER_MASK_SERVER;
     mEmberCluster.eventCount     = static_cast<uint16_t>(mEmberEventList.size());
     mEmberCluster.eventList      = mEmberEventList.data();
+
+    for (auto & attr : attributes)
+    {
+        mAttributeMetaData.push_back(attr.attributeMetaData);
+    }
+
+    // Make sure ember side has access to attribute metadata
+    mEmberCluster.attributes = mAttributeMetaData.data();
+}
+
+MockClusterConfig::MockClusterConfig(const MockClusterConfig & other) :
+    id(other.id), attributes(other.attributes), events(other.events), mEmberCluster(other.mEmberCluster),
+    mEmberEventList(other.mEmberEventList), mAttributeMetaData(other.mAttributeMetaData)
+{
+    // Fix self-referencial dependencies after data copy
+    mEmberCluster.attributes = mAttributeMetaData.data();
 }
 
 const MockAttributeConfig * MockClusterConfig::attributeById(AttributeId attributeId, ptrdiff_t * outIndex) const
@@ -91,6 +107,13 @@ MockEndpointConfig::MockEndpointConfig(EndpointId aId, std::initializer_list<Moc
     mEmberEndpoint.cluster      = mEmberClusters.data();
 }
 
+MockEndpointConfig::MockEndpointConfig(const MockEndpointConfig & other) :
+    id(other.id), clusters(other.clusters), mEmberClusters(other.mEmberClusters), mEmberEndpoint(other.mEmberEndpoint)
+{
+    // fix self-referencing pointers
+    mEmberEndpoint.cluster = mEmberClusters.data();
+}
+
 const MockClusterConfig * MockEndpointConfig::clusterById(ClusterId clusterId, ptrdiff_t * outIndex) const
 {
     return findById(clusters, clusterId, outIndex);
diff --git a/src/app/util/mock/MockNodeConfig.h b/src/app/util/mock/MockNodeConfig.h
index 2e8f19895036a7..aa711589eff432 100644
--- a/src/app/util/mock/MockNodeConfig.h
+++ b/src/app/util/mock/MockNodeConfig.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <app-common/zap-generated/attribute-type.h>
 #include <app/util/af-types.h>
 #include <lib/core/DataModelTypes.h>
 
@@ -28,10 +29,35 @@
 namespace chip {
 namespace Test {
 
+namespace internal {
+
+constexpr EmberAfAttributeMetadata DefaultAttributeMetadata(chip::AttributeId id)
+{
+    return EmberAfAttributeMetadata{
+        .defaultValue  = EmberAfDefaultOrMinMaxAttributeValue(static_cast<uint32_t>(0)),
+        .attributeId   = id,
+        .size          = 4,
+        .attributeType = ZCL_INT32U_ATTRIBUTE_TYPE,
+        .mask          = ATTRIBUTE_MASK_WRITABLE | ATTRIBUTE_MASK_NULLABLE,
+    };
+}
+
+} // namespace internal
+
 struct MockAttributeConfig
 {
-    MockAttributeConfig(AttributeId aId) : id(aId) {}
+    MockAttributeConfig(AttributeId aId) : id(aId), attributeMetaData(internal::DefaultAttributeMetadata(aId)) {}
+    MockAttributeConfig(AttributeId aId, EmberAfAttributeType type,
+                        EmberAfAttributeMask mask = ATTRIBUTE_MASK_WRITABLE | ATTRIBUTE_MASK_NULLABLE) :
+        id(aId),
+        attributeMetaData(internal::DefaultAttributeMetadata(aId))
+    {
+        attributeMetaData.attributeType = type;
+        attributeMetaData.mask          = mask;
+    }
+
     const AttributeId id;
+    EmberAfAttributeMetadata attributeMetaData;
 };
 
 struct MockEventConfig
@@ -45,6 +71,10 @@ struct MockClusterConfig
     MockClusterConfig(ClusterId aId, std::initializer_list<MockAttributeConfig> aAttributes = {},
                       std::initializer_list<MockEventConfig> aEvents = {});
 
+    // Cluster-config is self-referential: mEmberCluster.attributes references  mAttributeMetaData.data()
+    MockClusterConfig(const MockClusterConfig & other);
+    MockClusterConfig & operator=(const MockClusterConfig &) = delete;
+
     const MockAttributeConfig * attributeById(AttributeId attributeId, ptrdiff_t * outIndex = nullptr) const;
     const EmberAfCluster * emberCluster() const { return &mEmberCluster; }
 
@@ -55,12 +85,17 @@ struct MockClusterConfig
 private:
     EmberAfCluster mEmberCluster;
     std::vector<EventId> mEmberEventList;
+    std::vector<EmberAfAttributeMetadata> mAttributeMetaData;
 };
 
 struct MockEndpointConfig
 {
     MockEndpointConfig(EndpointId aId, std::initializer_list<MockClusterConfig> aClusters = {});
 
+    // Endpoint-config is self-referential: mEmberEndpoint.clusters references  mEmberClusters.data()
+    MockEndpointConfig(const MockEndpointConfig & other);
+    MockEndpointConfig & operator=(const MockEndpointConfig &) = delete;
+
     const MockClusterConfig * clusterById(ClusterId clusterId, ptrdiff_t * outIndex = nullptr) const;
     const EmberAfEndpointType * emberEndpoint() const { return &mEmberEndpoint; }
 
diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp
index cf36ddc560e583..cc1e19230dc33e 100644
--- a/src/app/util/mock/attribute-storage.cpp
+++ b/src/app/util/mock/attribute-storage.cpp
@@ -33,8 +33,9 @@
 #include <app/MessageDef/AttributeDataIB.h>
 #include <app/MessageDef/AttributeReportIB.h>
 #include <app/MessageDef/AttributeStatusIB.h>
-#include <app/util/af.h>
 #include <app/util/att-storage.h>
+#include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <app/util/mock/Constants.h>
 #include <app/util/mock/MockNodeConfig.h>
 
@@ -257,18 +258,26 @@ const EmberAfCluster * emberAfFindServerCluster(EndpointId endpointId, ClusterId
     return cluster->emberCluster();
 }
 
+DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & aConcreteClusterPath)
+{
+    // shared data version storage
+    return &dataVersion;
+}
+
 namespace chip {
 namespace app {
 
-AttributeAccessInterface * GetAttributeAccessOverride(EndpointId aEndpointId, ClusterId aClusterId)
+EndpointId EnabledEndpointsWithServerCluster::operator*() const
 {
-    return nullptr;
+    return emberAfEndpointFromIndex(mEndpointIndex);
 }
 
-EnabledEndpointsWithServerCluster::EnabledEndpointsWithServerCluster(ClusterId clusterId) : mClusterId(clusterId)
+EnabledEndpointsWithServerCluster::EnabledEndpointsWithServerCluster(ClusterId clusterId) :
+    mEndpointCount(emberAfEndpointCount()), mClusterId(clusterId)
 {
     EnsureMatchingEndpoint();
 }
+
 EnabledEndpointsWithServerCluster & EnabledEndpointsWithServerCluster::operator++()
 {
     ++mEndpointIndex;
@@ -293,8 +302,14 @@ void EnabledEndpointsWithServerCluster::EnsureMatchingEndpoint()
 }
 
 } // namespace app
+
 namespace Test {
 
+void ResetVersion()
+{
+    dataVersion = 0;
+}
+
 void BumpVersion()
 {
     dataVersion++;
@@ -393,5 +408,15 @@ CHIP_ERROR ReadSingleMockClusterData(FabricIndex aAccessingFabricIndex, const Co
     return attributeReport.EndOfAttributeReportIB();
 }
 
+void SetMockNodeConfig(const MockNodeConfig & config)
+{
+    mockConfig = &config;
+}
+
+void ResetMockNodeConfig()
+{
+    mockConfig = nullptr;
+}
+
 } // namespace Test
 } // namespace chip
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index c1b55ab836f223..b485e7c5dfb4cb 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -20,7 +20,7 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
+#include <app/util/attribute-storage-detail.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <app/util/ember-strings.h>
diff --git a/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt b/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt
index 2dd92f0f7450ec..4a2ca16e49d960 100644
--- a/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt
+++ b/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt
@@ -10,10 +10,11 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage-null-handling.h>
+#include <app/util/attribute-table.h>
 #include <app/util/odd-sized-integers.h>
 #include <lib/core/CHIPEncoding.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 namespace chip {
 namespace app {
@@ -38,6 +39,13 @@ namespace {{asUpperCamelCase label}} {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, {{accessorGetterType this}} value)
 {
     {{~#if (isString type)}}
+    {{#if isNullable}}
+    if (value.IsNull()) {
+      ChipLogError(Zcl, "Null Nullable<Span> passed to {{asUpperCamelCase parent.label}}::{{asUpperCamelCase label}}::Get");
+      return Protocols::InteractionModel::Status::Failure;
+    }
+
+    {{/if}}
     {{~#*inline "lengthType"}}uint{{#if (isShortString type)}}8{{else}}16{{/if}}_t{{/inline}}
     uint8_t zclString[{{maxLength}} + {{>sizingBytes}}];
     Protocols::InteractionModel::Status status = emberAfReadAttribute(endpoint, {{>clusterId}}, Id, zclString, sizeof(zclString));
@@ -53,7 +61,7 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, {{accessorGet
       {{/if}}
     }
     {{#if isNullable}}
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
     {{/if}}
     {{~#*inline "value"}}{{#if isNullable}}span{{else}}value{{/if}}{{/inline}}
     VerifyOrReturnError({{>value}}.size() == {{maxLength}}, Protocols::InteractionModel::Status::InvalidDataType);
@@ -85,8 +93,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, {{accessorGet
     return status;
     {{/if}}
 }
-Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value)
-{
+
+{{! Has a passMarkDirty boolean argument that controls which overload of emberAfWriteAttribute we call }}
+{{#*inline "setBody"}}
     {{~#if (isString type)}}
     {{~#*inline "lengthType"}}uint{{#if (isShortString type)}}8{{else}}16{{/if}}_t{{/inline}}
     static_assert({{maxLength}} < NumericAttributeTraits<{{>lengthType}}>::kNullValue,
@@ -100,7 +109,7 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEn
       Encoding::LittleEndian::Put16(zclString, length);
     {{/if}}
     memcpy(&zclString[{{>sizingBytes}}], value.data(), value.size());
-    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, zclString, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, zclString, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE{{#if passMarkDirty}}, markDirty{{/if}});
     {{else}}
     using Traits = NumericAttributeTraits<{{accessorTraitType type}}>;
     if (!Traits::CanRepresentValue(/* isNullable = */ {{isNullable}}, value))
@@ -110,23 +119,52 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEn
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, writable, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, writable, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE{{#if passMarkDirty}}, markDirty{{/if}});
     {{/if}}
+{{/inline}}
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value, MarkAttributeDirty markDirty)
+{
+    {{> setBody passMarkDirty=true}}
 }
 
-{{#if isNullable}}
-Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value)
 {
+    {{> setBody passMarkDirty=false}}
+}
+
+{{#if isNullable}}
+{{! Has a passMarkDirty boolean argument that controls which overload of emberAfWriteAttribute we call }}
+{{#*inline "setNullBody"}}
     {{#if (isString type)}}
     uint8_t zclString[{{>sizingBytes}}] = { {{#if (isShortString type)}}0xFF{{else}}0xFF, 0xFF{{/if}} };
-    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, zclString, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, zclString, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE{{#if passMarkDirty}}, markDirty{{/if}});
     {{else}}
     using Traits = NumericAttributeTraits<{{accessorTraitType type}}>;
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, writable, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, {{>clusterId}}, Id, writable, ZCL_{{typeAsDelimitedMacro type}}_ATTRIBUTE_TYPE{{#if passMarkDirty}}, markDirty{{/if}});
     {{/if}}
+{{/inline}}
+
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    {{> setNullBody passMarkDirty=true}}
+}
+
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
+{
+    {{> setNullBody passMarkDirty=false}}
+}
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name isArgument=true forceNotOptional=true}} value, MarkAttributeDirty markDirty)
+{
+  if (value.IsNull()) {
+    return SetNull(endpoint, markDirty);
+  }
+
+  return Set(endpoint, value.Value(), markDirty);
 }
 
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name isArgument=true forceNotOptional=true}} value)
diff --git a/src/app/zap-templates/templates/app/attributes/Accessors.zapt b/src/app/zap-templates/templates/app/attributes/Accessors.zapt
index be70fb092983ec..fd8c4fad3dc87a 100644
--- a/src/app/zap-templates/templates/app/attributes/Accessors.zapt
+++ b/src/app/zap-templates/templates/app/attributes/Accessors.zapt
@@ -16,6 +16,7 @@
 
 namespace chip {
 namespace app {
+
 namespace Clusters {
 
 {{#zcl_clusters}}
@@ -28,10 +29,15 @@ namespace Attributes {
 {{#unless (isStrEqual storagePolicy "attributeAccessInterface")}}
 namespace {{asUpperCamelCase label}} {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, {{accessorGetterType this}} value); // {{type}}
+{{! NOTE: Adding an optional arg instead of an overload can break API
+    consumers that are using the function type (e.g. in templates). }}
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value, MarkAttributeDirty markDirty);
 {{#if isNullable}}
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name isArgument=true forceNotOptional=true}} value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name isArgument=true forceNotOptional=true}} value, MarkAttributeDirty markDirty);
 {{/if}}
 } // namespace {{asUpperCamelCase label}}
 
diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
index 5f60c009753cbe..840a668be0a62a 100644
--- a/src/ble/BLEEndPoint.cpp
+++ b/src/ble/BLEEndPoint.cpp
@@ -41,17 +41,12 @@
 #include <ble/BLEEndPoint.h>
 #include <ble/BleLayer.h>
 #include <ble/BtpEngine.h>
-#if CHIP_ENABLE_CHIPOBLE_TEST
-#include "BtpEngineTest.h"
-#endif
-
-// clang-format off
 
 // Define below to enable extremely verbose, BLE end point-specific debug logging.
 #undef CHIP_BLE_END_POINT_DEBUG_LOGGING_ENABLED
 
 #ifdef CHIP_BLE_END_POINT_DEBUG_LOGGING_ENABLED
-#define ChipLogDebugBleEndPoint(MOD, MSG, ...) ChipLogDetail(MOD, MSG, ## __VA_ARGS__)
+#define ChipLogDebugBleEndPoint(MOD, MSG, ...) ChipLogDetail(MOD, MSG, ##__VA_ARGS__)
 #else
 #define ChipLogDebugBleEndPoint(MOD, MSG, ...)
 #endif
@@ -64,7 +59,7 @@
  *    packet to re-open its window instead of waiting for the send-ack timer to expire.
  *
  */
-#define BLE_CONFIG_IMMEDIATE_ACK_WINDOW_THRESHOLD                   1
+#define BLE_CONFIG_IMMEDIATE_ACK_WINDOW_THRESHOLD 1
 
 /**
  *  @def BLE_UNSUBSCRIBE_TIMEOUT_MS
@@ -74,14 +69,18 @@
  *    before it automatically releases its BLE connection and frees itself. The default value of 5 seconds is arbitrary.
  *
  */
-#define BLE_UNSUBSCRIBE_TIMEOUT_MS                            5000 // 5 seconds
-
-#define BTP_ACK_SEND_TIMEOUT_MS                               2500 // 2.5 seconds
+#define BLE_UNSUBSCRIBE_TIMEOUT_MS 5000
 
-#define BTP_WINDOW_NO_ACK_SEND_THRESHOLD                         1 // Data fragments may only be sent without piggybacked
-                                                                   // acks if receiver's window size is above this threshold.
+#define BTP_ACK_SEND_TIMEOUT_MS 2500
 
-// clang-format on
+/**
+ *  @def BTP_WINDOW_NO_ACK_SEND_THRESHOLD
+ *
+ *  @brief
+ *    Data fragments may only be sent without piggybacked acks if receiver's window size is above this threshold.
+ *
+ */
+#define BTP_WINDOW_NO_ACK_SEND_THRESHOLD 1
 
 namespace chip {
 namespace Ble {
@@ -204,18 +203,13 @@ void BLEEndPoint::HandleSubscribeReceived()
     VerifyOrExit(!mSendQueue.IsNull(), err = CHIP_ERROR_INCORRECT_STATE);
 
     // Send BTP capabilities response to peripheral via GATT indication.
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    VerifyOrExit(mBtpEngine.PopPacketTag(mSendQueue) == kType_Data, err = BLE_ERROR_INVALID_BTP_HEADER_FLAGS);
-#endif
     // Add reference to message fragment for duration of platform's GATT indication attempt. CHIP retains partial
     // ownership of message fragment's packet buffer, since this is the same buffer as that of the whole message, just
     // with a fragmenter-modified payload offset and data length.
     if (!SendIndication(mSendQueue.Retain()))
     {
         // Ensure transmit queue is empty and set to NULL.
-        QueueTxLock();
         mSendQueue = nullptr;
-        QueueTxUnlock();
 
         ChipLogError(Ble, "cap resp ind failed");
         err = BLE_ERROR_GATT_INDICATE_FAILED;
@@ -289,9 +283,6 @@ void BLEEndPoint::Abort()
     OnConnectComplete  = nullptr;
     OnConnectionClosed = nullptr;
     OnMessageReceived  = nullptr;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    OnCommandReceived = NULL;
-#endif
 
     DoClose(kBleCloseFlag_SuppressCallback | kBleCloseFlag_AbortTransmission, CHIP_NO_ERROR);
 }
@@ -302,9 +293,6 @@ void BLEEndPoint::Close()
     OnConnectComplete  = nullptr;
     OnConnectionClosed = nullptr;
     OnMessageReceived  = nullptr;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    OnCommandReceived = NULL;
-#endif
 
     DoClose(kBleCloseFlag_SuppressCallback, CHIP_NO_ERROR);
 }
@@ -364,9 +352,7 @@ void BLEEndPoint::FinalizeClose(uint8_t oldState, uint8_t flags, CHIP_ERROR err)
     mState = kState_Closed;
 
     // Ensure transmit queue is empty and set to NULL.
-    QueueTxLock();
     mSendQueue = nullptr;
-    QueueTxUnlock();
 
     // Fire application's close callback if we haven't already, and it's not suppressed.
     if (oldState != kState_Closing && (flags & kBleCloseFlag_SuppressCallback) == 0)
@@ -486,11 +472,6 @@ void BLEEndPoint::Free()
     StopAckReceivedTimer();
     StopSendAckTimer();
     StopUnsubscribeTimer();
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    mBtpEngineTest.StopTestTimer();
-    // Clear callback
-    OnCommandReceived = NULL;
-#endif
 
     // Clear callbacks.
     OnConnectComplete  = nullptr;
@@ -524,7 +505,7 @@ CHIP_ERROR BLEEndPoint::Init(BleLayer * bleLayer, BLE_CONNECTION_OBJECT connObj,
     VerifyOrReturnError((role == kBleRole_Central || role == kBleRole_Peripheral), CHIP_ERROR_INVALID_ARGUMENT);
 
     // If end point plays peripheral role, expect ack for indication sent as last step of BTP handshake.
-    // If central, periperal's handshake indication 'ack's write sent by central to kick off the BTP handshake.
+    // If central, peripheral's handshake indication 'ack's write sent by central to kick off the BTP handshake.
     bool expectInitialAck = (role == kBleRole_Peripheral);
 
     CHIP_ERROR err = mBtpEngine.Init(this, expectInitialAck);
@@ -534,21 +515,6 @@ CHIP_ERROR BLEEndPoint::Init(BleLayer * bleLayer, BLE_CONNECTION_OBJECT connObj,
         return err;
     }
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    err = static_cast<CHIP_ERROR>(mTxQueueMutex.Init(mTxQueueMutex));
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Ble, "%s: Mutex init failed", __FUNCTION__);
-        return err;
-    }
-    err = mBtpEngineTest.Init(this);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Ble, "BTP test init failed");
-        return err;
-    }
-#endif
-
     mBle      = bleLayer;
     mRefCount = 1;
 
@@ -630,13 +596,6 @@ CHIP_ERROR BLEEndPoint::SendCharacteristic(PacketBufferHandle && buf)
  */
 void BLEEndPoint::QueueTx(PacketBufferHandle && data, PacketType_t type)
 {
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    ChipLogDebugBleEndPoint(Ble, "%s: data->%p, type %d, len %d", __FUNCTION__, data, type, data->DataLength());
-    mBtpEngine.PushPacketTag(data, type);
-#endif
-
-    QueueTxLock();
-
     if (mSendQueue.IsNull())
     {
         mSendQueue = std::move(data);
@@ -647,8 +606,6 @@ void BLEEndPoint::QueueTx(PacketBufferHandle && data, PacketType_t type)
         mSendQueue->AddToEnd(std::move(data));
         ChipLogDebugBleEndPoint(Ble, "%s: Append data to mSendQueue %p, type %d", __FUNCTION__, mSendQueue->Start(), type);
     }
-
-    QueueTxUnlock();
 }
 
 CHIP_ERROR BLEEndPoint::Send(PacketBufferHandle && data)
@@ -714,26 +671,7 @@ bool BLEEndPoint::PrepareNextFragment(PacketBufferHandle && data, bool & sentAck
 CHIP_ERROR BLEEndPoint::SendNextMessage()
 {
     // Get the first queued packet to send
-    QueueTxLock();
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    // Return if tx queue is empty
-    // Note: PopHead() does not check an empty queue
-    if (mSendQueue.IsNull())
-    {
-        QueueTxUnlock();
-        return CHIP_NO_ERROR;
-    }
-#endif
-
     PacketBufferHandle data = mSendQueue.PopHead();
-    QueueTxUnlock();
-
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    // Get and consume the packet tag in message buffer
-    PacketType_t type = mBtpEngine.PopPacketTag(data);
-    mBtpEngine.SetTxPacketType(type);
-    mBtpEngineTest.DoTxTiming(data, BTP_TX_START);
-#endif
 
     // Hand whole message payload to the fragmenter.
     bool sentAck;
@@ -799,9 +737,7 @@ CHIP_ERROR BLEEndPoint::HandleHandshakeConfirmationReceived()
     uint8_t closeFlags = kBleCloseFlag_AbortTransmission;
 
     // Free capabilities request/response payload.
-    QueueTxLock();
     mSendQueue.FreeHead();
-    QueueTxUnlock();
 
     if (mRole == kBleRole_Central)
     {
@@ -831,7 +767,7 @@ CHIP_ERROR BLEEndPoint::HandleHandshakeConfirmationReceived()
             }
             else
             {
-                // Drive sending in case application callend Send() after we sent the handshake indication, but
+                // Drive sending in case application called Send() after we sent the handshake indication, but
                 // before the GATT confirmation for this indication was received.
                 err = DriveSending();
                 SuccessOrExit(err);
@@ -1020,9 +956,6 @@ CHIP_ERROR BLEEndPoint::DriveSending()
         // Clear fragmenter's pointer to sent message buffer and reset its Tx state.
         // Buffer will be freed at scope exit.
         PacketBufferHandle sentBuf = mBtpEngine.TakeTxPacket();
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        mBtpEngineTest.DoTxTiming(sentBuf, BTP_TX_DONE);
-#endif // CHIP_ENABLE_CHIPOBLE_TEST
 
         if (!mSendQueue.IsNull())
         {
@@ -1201,13 +1134,6 @@ CHIP_ERROR BLEEndPoint::Receive(PacketBufferHandle && data)
     uint8_t closeFlags           = kBleCloseFlag_AbortTransmission;
     bool didReceiveAck           = false;
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    if (mBtpEngine.IsCommandPacket(data))
-    {
-        ChipLogDebugBleEndPoint(Ble, "%s: Received Control frame: Flags %x", __FUNCTION__, *(data->Start()));
-    }
-    else
-#endif
     { // This is a special handling on the first CHIPoBLE data packet, the CapabilitiesRequest.
         // Suppress error logging if peer's send overlaps with our unsubscribe on final close.
         if (IsUnsubscribePending())
@@ -1283,7 +1209,7 @@ CHIP_ERROR BLEEndPoint::Receive(PacketBufferHandle && data)
     {
         ChipLogDebugBleEndPoint(Ble, "got btp ack = %u", receivedAck);
 
-        // If ack was rx'd for neweset unacked sent fragment, stop ack received timer.
+        // If ack was rx'd for newest unacked sent fragment, stop ack received timer.
         if (!mBtpEngine.ExpectingAck())
         {
             ChipLogDebugBleEndPoint(Ble, "got ack for last outstanding fragment");
@@ -1359,24 +1285,12 @@ CHIP_ERROR BLEEndPoint::Receive(PacketBufferHandle && data)
 
         ChipLogDebugBleEndPoint(Ble, "reassembled whole msg, len = %d", full_packet->DataLength());
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        // If we have a control message received callback, and end point is not closing...
-        if (mBtpEngine.RxPacketType() == kType_Control && OnCommandReceived && mState != kState_Closing)
+        // If we have a message received callback, and end point is not closing...
+        if (mBleTransport != nullptr && mState != kState_Closing)
         {
-            ChipLogDebugBleEndPoint(Ble, "%s: calling OnCommandReceived, seq# %u, len = %u, type %u", __FUNCTION__, receivedAck,
-                                    full_packet->DataLength(), mBtpEngine.RxPacketType());
-            // Pass received control message up the stack.
-            mBtpEngine.SetRxPacketSeq(receivedAck);
-            OnCommandReceived(this, std::move(full_packet));
+            // Pass received message up the stack.
+            mBleTransport->OnEndPointMessageReceived(this, std::move(full_packet));
         }
-        else
-#endif
-            // If we have a message received callback, and end point is not closing...
-            if (mBleTransport != nullptr && mState != kState_Closing)
-            {
-                // Pass received message up the stack.
-                mBleTransport->OnEndPointMessageReceived(this, std::move(full_packet));
-            }
     }
 
 exit:
diff --git a/src/ble/BLEEndPoint.h b/src/ble/BLEEndPoint.h
index dba18fc5b43511..1bce51e1671419 100644
--- a/src/ble/BLEEndPoint.h
+++ b/src/ble/BLEEndPoint.h
@@ -32,11 +32,6 @@
 #include <ble/BleRole.h>
 #include <ble/BtpEngine.h>
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-#include <ble/BtpEngineTest.h>
-#include <system/SystemMutex.h>
-#endif
-
 namespace chip {
 namespace Ble {
 
@@ -53,17 +48,11 @@ class BleLayer;
 class BleEndPointPool;
 // BLEEndPoint holds a pointer to BleLayerDelegate for messages, while BleLayerDelegate functions also accepts BLEEndPoint.
 class BleLayerDelegate;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-class BtpEngineTest;
-#endif
 
 class DLL_EXPORT BLEEndPoint
 {
     friend class BleLayer;
     friend class BleEndPointPool;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    friend class BtpEngineTest;
-#endif
 
 public:
     typedef uint64_t AlignT;
@@ -90,15 +79,6 @@ class DLL_EXPORT BLEEndPoint
     typedef void (*OnConnectionClosedFunct)(BLEEndPoint * endPoint, CHIP_ERROR err);
     OnConnectionClosedFunct OnConnectionClosed;
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    typedef void (*OnCommandReceivedFunct)(BLEEndPoint * endPoint, PacketBufferHandle && msg);
-    OnCommandReceivedFunct OnCommandReceived;
-    inline void SetOnCommandReceivedCB(OnCommandReceivedFunct cb) { OnCommandReceived = cb; };
-    BtpEngineTest mBtpEngineTest;
-    inline void SetTxWindowSize(uint8_t size) { mRemoteReceiveWindowSize = size; };
-    inline void SetRxWindowSize(uint8_t size) { mReceiveWindowMaxSize = size; };
-#endif
-
     // Public functions:
     CHIP_ERROR Send(PacketBufferHandle && data);
     CHIP_ERROR Receive(PacketBufferHandle && data);
@@ -137,9 +117,6 @@ class DLL_EXPORT BLEEndPoint
         kAckReceivedTimerRunning       = 0x04, // Ack received timer running due to unacked sent fragment.
         kSendAckTimerRunning           = 0x08, // Send ack timer running; indicates pending ack to send.
         kUnsubscribeTimerRunning       = 0x10, // Unsubscribe completion timer running.
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        kUnderTestTimerRunnung = 0x80 // running throughput Tx test
-#endif
     };
 
     // BLE connection to which an end point is uniquely bound. Type BLE_CONNECTION_OBJECT is defined by the platform or
@@ -164,9 +141,6 @@ class DLL_EXPORT BLEEndPoint
     SequenceNumber_t mLocalReceiveWindowSize;
     SequenceNumber_t mRemoteReceiveWindowSize;
     SequenceNumber_t mReceiveWindowMaxSize;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    chip::System::Mutex mTxQueueMutex; // For MT-safe Tx queuing
-#endif
 
     // Private functions:
     BLEEndPoint()  = delete;
@@ -228,14 +202,6 @@ class DLL_EXPORT BLEEndPoint
     void Free();
     void FreeBtpEngine();
 
-    // Mutex lock on Tx queue. Used only in BtpEngine test build for now.
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    inline void QueueTxLock() { mTxQueueMutex.Lock(); }
-    inline void QueueTxUnlock() { mTxQueueMutex.Unlock(); }
-#else
-    inline void QueueTxLock() {}
-    inline void QueueTxUnlock() {}
-#endif
     void QueueTx(PacketBufferHandle && data, PacketType_t type);
 };
 
diff --git a/src/ble/BUILD.gn b/src/ble/BUILD.gn
index bfdc3db2548044..508d420f665107 100644
--- a/src/ble/BUILD.gn
+++ b/src/ble/BUILD.gn
@@ -29,10 +29,7 @@ buildconfig_header("ble_buildconfig") {
   header = "BleBuildConfig.h"
   header_dir = "ble"
 
-  defines = [
-    "CONFIG_NETWORK_LAYER_BLE=${chip_config_network_layer_ble}",
-    "CHIP_ENABLE_CHIPOBLE_TEST=false",
-  ]
+  defines = [ "CONFIG_NETWORK_LAYER_BLE=${chip_config_network_layer_ble}" ]
 
   if (chip_ble_project_config_include != "") {
     defines +=
diff --git a/src/ble/BleConfig.h b/src/ble/BleConfig.h
index 91005a20882fc1..c6d7877081f340 100644
--- a/src/ble/BleConfig.h
+++ b/src/ble/BleConfig.h
@@ -65,9 +65,6 @@
 #include BLE_PLATFORM_CONFIG_INCLUDE
 #endif
 
-// clang-format off
-
-
 /**
  *  @def BLE_LAYER_NUM_BLE_ENDPOINTS
  *
@@ -102,7 +99,7 @@
  *
  */
 #ifndef BLE_CONNECTION_OBJECT
-#define BLE_CONNECTION_OBJECT void*
+#define BLE_CONNECTION_OBJECT void *
 #endif // BLE_CONNECTION_OBJECT
 
 /**
@@ -129,7 +126,7 @@
  *
  */
 #ifndef BLE_READ_REQUEST_CONTEXT
-#define BLE_READ_REQUEST_CONTEXT void*
+#define BLE_READ_REQUEST_CONTEXT void *
 #endif // BLE_READ_REQUEST_CONTEXT
 
 /**
@@ -197,7 +194,6 @@
 #define BLE_CONFIG_ERROR(e) (BLE_CONFIG_ERROR_MIN + (e))
 #endif // BLE_CONFIG_ERROR
 
-
 /**
  * @def BTP_CONN_RSP_TIMEOUT_MS
  *
@@ -206,7 +202,7 @@
  *   request to wait for connection establishment.
  */
 #ifndef BTP_CONN_RSP_TIMEOUT_MS
-#define BTP_CONN_RSP_TIMEOUT_MS 15000 // 15 seconds
+#define BTP_CONN_RSP_TIMEOUT_MS 15000
 #endif // BTP_CONN_RSP_TIMEOUT_MS
 
 /**
@@ -217,9 +213,7 @@
  *   an acknowledgement. When the ack is not received within this period the BTP session is closed.
  */
 #ifndef BTP_ACK_TIMEOUT_MS
-#define BTP_ACK_TIMEOUT_MS 15000 // 15 seconds
+#define BTP_ACK_TIMEOUT_MS 15000
 #endif // BTP_ACK_TIMEOUT_MS
 
-// clang-format on
-
 #include <lib/core/CHIPConfig.h>
diff --git a/src/ble/BleLayer.cpp b/src/ble/BleLayer.cpp
index eae49a0bfa8dd1..0472d70ac28d2c 100644
--- a/src/ble/BleLayer.cpp
+++ b/src/ble/BleLayer.cpp
@@ -287,10 +287,6 @@ CHIP_ERROR BleLayer::Init(BlePlatformDelegate * platformDelegate, BleConnectionD
 
     mState = kState_Initialized;
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    mTestBleEndPoint = NULL;
-#endif
-
     return CHIP_NO_ERROR;
 }
 
@@ -444,10 +440,6 @@ CHIP_ERROR BleLayer::NewBleEndPoint(BLEEndPoint ** retEndPoint, BLE_CONNECTION_O
     (*retEndPoint)->Init(this, connObj, role, autoClose);
     (*retEndPoint)->mBleTransport = mBleTransport;
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    mTestBleEndPoint = *retEndPoint;
-#endif
-
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/ble/BleLayer.h b/src/ble/BleLayer.h
index af2267b770fcf8..a1c4d191672617 100644
--- a/src/ble/BleLayer.h
+++ b/src/ble/BleLayer.h
@@ -22,7 +22,7 @@
  *      platform's Bluetooth Low Energy (BLE) implementation and the CHIP
  *      stack.
  *
- *      The BleLayer obect accepts BLE data and control input from the
+ *      The BleLayer object accepts BLE data and control input from the
  *      application via a functional interface. It performs the fragmentation
  *      and reassembly required to transmit CHIP message via a BLE GATT
  *      characteristic interface, and drives incoming messages up the CHIP
@@ -197,7 +197,7 @@ class BleTransportCapabilitiesResponseMessage
  *    and hand the platform-specific BLE_CONNECTION_OBJECT that this receipt
  *    generates to BleLayer via the corresponding platform interface function.
  *    This causes BleLayer to wrap the BLE_CONNECTION_OBJECT in a BLEEndPoint,
- *    and notify chipMessageLayer that a new BLE conneciotn has been received.
+ *    and notify chipMessageLayer that a new BLE connection has been received.
  *    The message layer then wraps the new BLEEndPoint object in a
  *    chipConnection, and hands this object to the application via the message
  *    layer's OnConnectionReceived callback.
@@ -214,9 +214,6 @@ class BleTransportCapabilitiesResponseMessage
 class DLL_EXPORT BleLayer
 {
     friend class BLEEndPoint;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    friend class BtpEngineTest;
-#endif
 
 public:
     // Public data members:
@@ -271,7 +268,7 @@ class DLL_EXPORT BleLayer
      *     characteristics CHIP cares about.
 
      *     Platform must call this function when a GATT subscription has been established to any CHIP service
-     *     charateristic.
+     *     characteristic.
      *
      *     If this function returns true, CHIP has accepted the BLE connection and wrapped it
      *     in a chipConnection object. If CHIP accepts a BLE connection, the platform MUST
@@ -283,7 +280,7 @@ class DLL_EXPORT BleLayer
     bool HandleSubscribeComplete(BLE_CONNECTION_OBJECT connObj, const ChipBleUUID * svcId, const ChipBleUUID * charId);
 
     /**< Platform must call this function when a GATT unsubscribe is requested on any CHIP
-     *   service charateristic, that is, when an existing GATT subscription on a CHIP service
+     *   service characteristic, that is, when an existing GATT subscription on a CHIP service
      *   characteristic is canceled. */
     bool HandleUnsubscribeReceived(BLE_CONNECTION_OBJECT connObj, const ChipBleUUID * svcId, const ChipBleUUID * charId);
 
@@ -319,10 +316,6 @@ class DLL_EXPORT BleLayer
      *   err = BLE_ERROR_APP_CLOSED_CONNECTION to prevent the leak of this chipConnection and its end point object. */
     void HandleConnectionError(BLE_CONNECTION_OBJECT connObj, CHIP_ERROR err);
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    BLEEndPoint * mTestBleEndPoint;
-#endif
-
 private:
     // Private data members:
 
diff --git a/src/ble/BtpEngine.cpp b/src/ble/BtpEngine.cpp
index 3183c6db79aed1..cb3ac8ee092e2a 100644
--- a/src/ble/BtpEngine.cpp
+++ b/src/ble/BtpEngine.cpp
@@ -30,9 +30,6 @@
 #if CONFIG_NETWORK_LAYER_BLE
 
 #include <ble/BtpEngine.h>
-#if CHIP_ENABLE_CHIPOBLE_TEST
-#include <ble/BtpEngineTest.h>
-#endif
 
 #include <lib/support/BufferReader.h>
 #include <lib/support/CodeUtils.h>
@@ -93,10 +90,6 @@ CHIP_ERROR BtpEngine::Init(void * an_app_state, bool expect_first_ack)
     mTxPacketCount         = 0;
     mTxNewestUnackedSeqNum = 0;
     mTxOldestUnackedSeqNum = 0;
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    mTxPacketType = kType_Data; // Default BtpEngine Data packet
-    mRxPacketType = kType_Data; // Default BtpEngine Data packet
-#endif
 
     if (expect_first_ack)
     {
@@ -144,25 +137,6 @@ SequenceNumber_t BtpEngine::GetAndRecordRxAckSeqNum()
     return ret;
 }
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-bool BtpEngine::IsCommandPacket(const PacketBufferHandle & p)
-{
-    if (p.IsNull())
-    {
-        return false;
-    }
-
-    BitFlags<HeaderFlags> rx_flags;
-    Encoding::LittleEndian::Reader reader(data->Start(), data->DataLength());
-    CHIP_ERROR err = reader.Read8(rx_flags.RawStorage()).StatusCode();
-    if (err != CHIP_NO_ERROR)
-    {
-        return false;
-    }
-    return rx_flags.Has(HeaderFlags::kCommandMessage);
-}
-#endif // CHIP_ENABLE_CHIPOBLE_TEST
-
 bool BtpEngine::HasUnackedData() const
 {
     return (mRxOldestUnackedSeqNum != mRxNextSeqNum);
@@ -271,12 +245,6 @@ CHIP_ERROR BtpEngine::HandleCharacteristicReceived(System::PacketBufferHandle &&
         // Get header flags, always in first byte.
         err = reader.Read8(rx_flags.RawStorage()).StatusCode();
         SuccessOrExit(err);
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        if (rx_flags.Has(HeaderFlags::kCommandMessage))
-            SetRxPacketType(kType_Control);
-        else
-            SetRxPacketType(kType_Data);
-#endif
 
         didReceiveAck = rx_flags.Has(HeaderFlags::kFragmentAck);
 
@@ -307,7 +275,7 @@ CHIP_ERROR BtpEngine::HandleCharacteristicReceived(System::PacketBufferHandle &&
         }
 
         // Truncate the incoming fragment length by the mRxFragmentSize as the negotiated
-        // mRxFragnentSize may be smaller than the characteristic size.  Make sure
+        // mRxFragmentSize may be smaller than the characteristic size.  Make sure
         // we're not truncating to a data length smaller than what we have already consumed.
         VerifyOrExit(reader.OctetsRead() <= mRxFragmentSize, err = BLE_ERROR_REASSEMBLER_INCORRECT_STATE);
         data->SetDataLength(chip::min(data->DataLength(), mRxFragmentSize));
@@ -483,11 +451,6 @@ bool BtpEngine::HandleCharacteristicSend(System::PacketBufferHandle data, bool s
         uint8_t cursor = 1; // first position past header flags byte
         BitFlags<HeaderFlags> headerFlags(HeaderFlags::kStartMessage);
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        if (TxPacketType() == kType_Control)
-            headerFlags.Set(HeaderFlags::kCommandMessage);
-#endif
-
         if (send_ack)
         {
             headerFlags.Set(HeaderFlags::kFragmentAck);
@@ -536,11 +499,6 @@ bool BtpEngine::HandleCharacteristicSend(System::PacketBufferHandle data, bool s
 
         BitFlags<HeaderFlags> headerFlags(HeaderFlags::kContinueMessage);
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        if (TxPacketType() == kType_Control)
-            headerFlags.Set(HeaderFlags::kCommandMessage);
-#endif
-
         if (send_ack)
         {
             headerFlags.Set(HeaderFlags::kFragmentAck);
diff --git a/src/ble/BtpEngine.h b/src/ble/BtpEngine.h
index 2055c2a9c1cfbb..0e1ed33789f513 100644
--- a/src/ble/BtpEngine.h
+++ b/src/ble/BtpEngine.h
@@ -39,7 +39,7 @@
 namespace chip {
 namespace Ble {
 
-inline constexpr size_t kTransferProtocolHeaderFlagsSize = 1; // Size in bytes of enocded BTP fragment header flag bits
+inline constexpr size_t kTransferProtocolHeaderFlagsSize = 1; // Size in bytes of encoded BTP fragment header flag bits
 inline constexpr size_t kTransferProtocolSequenceNumSize = 1; // Size in bytes of encoded BTP sequence number
 inline constexpr size_t kTransferProtocolAckSize         = 1; // Size in bytes of encoded BTP fragment acknowledgement number
 inline constexpr size_t kTransferProtocolMsgLenSize      = 2; // Size in byte of encoded BTP total fragmented message length
@@ -56,10 +56,6 @@ using ::chip::System::PacketBufferHandle;
 typedef uint8_t SequenceNumber_t; // If type changed from uint8_t, adjust assumptions in BtpEngine::IsValidAck and
                                   // BLEEndPoint::AdjustReceiveWindow.
 
-#if CHIP_ENABLE_CHIPOBLE_TEST
-class BLEEndPoint;
-#endif
-
 // Public data members:
 typedef enum
 {
@@ -69,10 +65,6 @@ typedef enum
 
 class BtpEngine
 {
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    friend class BLEEndPoint;
-#endif
-
 public:
     // Public data members:
     typedef enum
@@ -90,9 +82,6 @@ class BtpEngine
         kContinueMessage = 0x02,
         kEndMessage      = 0x04,
         kFragmentAck     = 0x08,
-#if CHIP_ENABLE_CHIPOBLE_TEST
-        kCommandMessage = 0x10,
-#endif
     };
 
     static const uint16_t sDefaultFragmentSize;
@@ -117,29 +106,6 @@ class BtpEngine
 
     inline State_t RxState() { return mRxState; }
     inline State_t TxState() { return mTxState; }
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    inline PacketType_t SetTxPacketType(PacketType_t type) { return (mTxPacketType = type); }
-    inline PacketType_t SetRxPacketType(PacketType_t type) { return (mRxPacketType = type); }
-    inline PacketType_t TxPacketType() { return mTxPacketType; }
-    inline PacketType_t RxPacketType() { return mRxPacketType; }
-    inline SequenceNumber_t SetTxPacketSeq(SequenceNumber_t seq) { return (mTxPacketSeq = seq); }
-    inline SequenceNumber_t SetRxPacketSeq(SequenceNumber_t seq) { return (mRxPacketSeq = seq); }
-    inline SequenceNumber_t TxPacketSeq() { return mTxPacketSeq; }
-    inline SequenceNumber_t RxPacketSeq() { return mRxPacketSeq; }
-    static bool IsCommandPacket(const PacketBufferHandle & p);
-    inline void PushPacketTag(const PacketBufferHandle & p, PacketType_t type)
-    {
-        p->SetStart(p->Start() - sizeof(type));
-        memcpy(p->Start(), &type, sizeof(type));
-    }
-    inline PacketType_t PopPacketTag(const PacketBufferHandle & p)
-    {
-        PacketType_t type;
-        memcpy(&type, p->Start(), sizeof(type));
-        p->SetStart(p->Start() + sizeof(type));
-        return type;
-    }
-#endif // CHIP_ENABLE_CHIPOBLE_TEST
 
     bool HasUnackedData() const;
 
@@ -160,12 +126,6 @@ class BtpEngine
 
 private:
     // Private data members:
-#if CHIP_ENABLE_CHIPOBLE_TEST
-    PacketType_t mTxPacketType;
-    PacketType_t mRxPacketType;
-    SequenceNumber_t mTxPacketSeq;
-    SequenceNumber_t mRxPacketSeq;
-#endif
     State_t mRxState;
     uint16_t mRxLength;
     void * mAppState;
diff --git a/src/ble/tests/BUILD.gn b/src/ble/tests/BUILD.gn
index a0af13be3cd9f9..687ad7be8f4167 100644
--- a/src/ble/tests/BUILD.gn
+++ b/src/ble/tests/BUILD.gn
@@ -14,23 +14,19 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
 
-chip_test_suite_using_nltest("tests") {
+chip_test_suite("tests") {
   output_name = "libBleLayerTests"
 
   test_sources = [
     "TestBleErrorStr.cpp",
     "TestBleUUID.cpp",
+    "TestBtpEngine.cpp",
   ]
 
   cflags = [ "-Wconversion" ]
 
-  public_deps = [
-    "${chip_root}/src/ble",
-    "${chip_root}/src/lib/support:testing_nlunit",
-    "${nlunit_test_root}:nlunit-test",
-  ]
+  public_deps = [ "${chip_root}/src/ble" ]
 }
diff --git a/src/ble/tests/TestBleErrorStr.cpp b/src/ble/tests/TestBleErrorStr.cpp
index caaa8d96a8f94d..1dcb30e6e9878d 100644
--- a/src/ble/tests/TestBleErrorStr.cpp
+++ b/src/ble/tests/TestBleErrorStr.cpp
@@ -30,17 +30,14 @@
 
 #include <ble/BleError.h>
 #include <lib/core/ErrorStr.h>
-#include <lib/support/UnitTestRegistration.h>
 
-#include <nlunit-test.h>
+#include <gtest/gtest.h>
 
 using namespace chip;
 
 // Test input data.
 
-// clang-format off
-static const CHIP_ERROR kTestElements[] =
-{
+static const CHIP_ERROR kTestElements[] = {
     BLE_ERROR_ADAPTER_UNAVAILABLE,
     BLE_ERROR_NO_CONNECTION_RECEIVED_CALLBACK,
     BLE_ERROR_CENTRAL_UNSUBSCRIBED,
@@ -67,9 +64,8 @@ static const CHIP_ERROR kTestElements[] =
     BLE_ERROR_INVALID_BTP_SEQUENCE_NUMBER,
     BLE_ERROR_REASSEMBLER_INCORRECT_STATE,
 };
-// clang-format on
 
-static void CheckBleErrorStr(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleErrorStr, CheckBleErrorStr)
 {
     // Register the layer error formatter
 
@@ -83,45 +79,12 @@ static void CheckBleErrorStr(nlTestSuite * inSuite, void * inContext)
 
         // Assert that the error string contains the error number in hex.
         snprintf(expectedText, sizeof(expectedText), "%08" PRIX32, err.AsInteger());
-        NL_TEST_ASSERT(inSuite, (strstr(errStr, expectedText) != nullptr));
+        EXPECT_NE(strstr(errStr, expectedText), nullptr);
 
 #if !CHIP_CONFIG_SHORT_ERROR_STR
         // Assert that the error string contains a description, which is signaled
         // by a presence of a colon proceeding the description.
-        NL_TEST_ASSERT(inSuite, (strchr(errStr, ':') != nullptr));
+        EXPECT_NE(strchr(errStr, ':'), nullptr);
 #endif // !CHIP_CONFIG_SHORT_ERROR_STR
     }
 }
-
-/**
- *   Test Suite. It lists all the test functions.
- */
-
-// clang-format off
-static const nlTest sTests[] =
-{
-    NL_TEST_DEF("BleErrorStr", CheckBleErrorStr),
-
-    NL_TEST_SENTINEL()
-};
-// clang-format on
-
-int TestBleErrorStr()
-{
-    // clang-format off
-    nlTestSuite theSuite =
-	{
-        "Test BLE range error strings conversions",
-        &sTests[0],
-        nullptr,
-        nullptr
-    };
-    // clang-format on
-
-    // Run test suite against one context.
-    nlTestRunner(&theSuite, nullptr);
-
-    return nlTestRunnerStats(&theSuite);
-}
-
-CHIP_REGISTER_TEST_SUITE(TestBleErrorStr)
diff --git a/src/ble/tests/TestBleUUID.cpp b/src/ble/tests/TestBleUUID.cpp
index 41033ad01a5df0..70d95bc0336d63 100644
--- a/src/ble/tests/TestBleUUID.cpp
+++ b/src/ble/tests/TestBleUUID.cpp
@@ -25,80 +25,57 @@
  */
 
 #include <ble/BleUUID.h>
-#include <lib/support/UnitTestRegistration.h>
 
-#include <nlunit-test.h>
+#include <gtest/gtest.h>
 
 using namespace chip;
 using namespace chip::Ble;
 
 namespace {
 
-void CheckStringToUUID_ChipUUID(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_ChipUUID)
 {
     // Test positive scenario - CHIP Service UUID
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, StringToUUID("0000FFF6-0000-1000-8000-00805F9B34FB", uuid));
-    NL_TEST_ASSERT(inSuite, UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
+    EXPECT_TRUE(StringToUUID("0000FFF6-0000-1000-8000-00805F9B34FB", uuid));
+    EXPECT_TRUE(UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
 }
 
-void CheckStringToUUID_ChipUUID_RandomCase(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_ChipUUID_RandomCase)
 {
     // Test that letter case doesn't matter
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, StringToUUID("0000FfF6-0000-1000-8000-00805f9B34Fb", uuid));
-    NL_TEST_ASSERT(inSuite, UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
+    EXPECT_TRUE(StringToUUID("0000FfF6-0000-1000-8000-00805f9B34Fb", uuid));
+    EXPECT_TRUE(UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
 }
 
-void CheckStringToUUID_ChipUUID_NoSeparators(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_ChipUUID_NoSeparators)
 {
     // Test that separators don't matter
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, StringToUUID("0000FFF600001000800000805F9B34FB", uuid));
-    NL_TEST_ASSERT(inSuite, UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
+    EXPECT_TRUE(StringToUUID("0000FFF600001000800000805F9B34FB", uuid));
+    EXPECT_TRUE(UUIDsMatch(&uuid, &CHIP_BLE_SVC_ID));
 }
 
-void CheckStringToUUID_TooLong(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_TooLong)
 {
     // Test that even one more digit is too much
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, !StringToUUID("0000FFF600001000800000805F9B34FB0", uuid));
+    EXPECT_FALSE(StringToUUID("0000FFF600001000800000805F9B34FB0", uuid));
 }
 
-void CheckStringToUUID_TooShort(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_TooShort)
 {
     // Test that even one less digit is too little
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, !StringToUUID("0000FFF600001000800000805F9B34F", uuid));
+    EXPECT_FALSE(StringToUUID("0000FFF600001000800000805F9B34F", uuid));
 }
 
-void CheckStringToUUID_InvalidChar(nlTestSuite * inSuite, void * inContext)
+TEST(TestBleUUID, CheckStringToUUID_InvalidChar)
 {
     // Test that non-hex digits don't pass
     ChipBleUUID uuid;
-    NL_TEST_ASSERT(inSuite, !StringToUUID("0000GFF6-0000-1000-8000-00805F9B34FB0", uuid));
+    EXPECT_FALSE(StringToUUID("0000GFF6-0000-1000-8000-00805F9B34FB0", uuid));
 }
 
-// clang-format off
-const nlTest sTests[] =
-{
-    NL_TEST_DEF("CheckStringToUUID_ChipUUID", CheckStringToUUID_ChipUUID),
-    NL_TEST_DEF("CheckStringToUUID_ChipUUID_RandomCase", CheckStringToUUID_ChipUUID_RandomCase),
-    NL_TEST_DEF("CheckStringToUUID_ChipUUID_NoSeparators", CheckStringToUUID_ChipUUID_NoSeparators),
-    NL_TEST_DEF("CheckStringToUUID_TooLong", CheckStringToUUID_TooLong),
-    NL_TEST_DEF("CheckStringToUUID_TooShort", CheckStringToUUID_TooShort),
-    NL_TEST_DEF("CheckStringToUUID_InvalidChar", CheckStringToUUID_InvalidChar),
-    NL_TEST_SENTINEL()
-};
-// clang-format on
-
 } // namespace
-
-int TestBleUUID()
-{
-    nlTestSuite theSuite = { "BleUUID", &sTests[0], nullptr, nullptr };
-    nlTestRunner(&theSuite, nullptr);
-    return nlTestRunnerStats(&theSuite);
-}
-
-CHIP_REGISTER_TEST_SUITE(TestBleUUID)
diff --git a/src/ble/tests/TestBtpEngine.cpp b/src/ble/tests/TestBtpEngine.cpp
new file mode 100644
index 00000000000000..945c794bb01559
--- /dev/null
+++ b/src/ble/tests/TestBtpEngine.cpp
@@ -0,0 +1,181 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    Copyright (c) 2018 Google LLC.
+ *    Copyright (c) 2018 Nest Labs, Inc.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <cstdint>
+#include <numeric>
+
+#include <ble/BleLayer.h>
+#include <ble/BtpEngine.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#include <gtest/gtest.h>
+
+using namespace chip;
+using namespace chip::Ble;
+
+namespace {
+
+class TestBtpEngine : public ::testing::Test
+{
+public:
+    static void SetUpTestSuite() { ASSERT_EQ(chip::Platform::MemoryInit(), CHIP_NO_ERROR); }
+    static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
+
+    void SetUp()
+    {
+        ASSERT_EQ(mBtpEngine.Init(nullptr, false), CHIP_NO_ERROR);
+        ChipLogDetail(Test, "### Initial BTP Engine State:");
+        mBtpEngine.LogState();
+    }
+
+    void TearDown()
+    {
+        ChipLogDetail(Test, "### Final BTP Engine State:");
+        mBtpEngine.LogState();
+    }
+
+    Ble::BtpEngine mBtpEngine;
+};
+
+TEST_F(TestBtpEngine, HandleCharacteristicReceivedOnePacket)
+{
+    constexpr uint8_t packetData0[] = {
+        to_underlying(BtpEngine::HeaderFlags::kStartMessage) | to_underlying(BtpEngine::HeaderFlags::kEndMessage),
+        0x01,
+        0x01,
+        0x00,
+        0xff, // payload
+    };
+
+    auto packet0 = System::PacketBufferHandle::NewWithData(packetData0, sizeof(packetData0));
+    EXPECT_EQ(packet0->DataLength(), 5);
+
+    SequenceNumber_t receivedAck;
+    bool didReceiveAck;
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet0), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_Complete);
+}
+
+TEST_F(TestBtpEngine, HandleCharacteristicReceivedTwoPacket)
+{
+    constexpr uint8_t packetData0[] = { to_underlying(BtpEngine::HeaderFlags::kStartMessage), 0x01, 0x02, 0x00, 0xfe };
+    constexpr uint8_t packetData1[] = { to_underlying(BtpEngine::HeaderFlags::kEndMessage), 0x02, 0xff };
+
+    auto packet0 = System::PacketBufferHandle::NewWithData(packetData0, sizeof(packetData0));
+    EXPECT_EQ(packet0->DataLength(), 5);
+
+    SequenceNumber_t receivedAck;
+    bool didReceiveAck;
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet0), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_InProgress);
+
+    auto packet1 = System::PacketBufferHandle::NewWithData(packetData1, sizeof(packetData1));
+    EXPECT_EQ(packet1->DataLength(), 3);
+
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet1), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_Complete);
+}
+
+TEST_F(TestBtpEngine, HandleCharacteristicReceivedThreePacket)
+{
+    constexpr uint8_t packetData0[] = { to_underlying(BtpEngine::HeaderFlags::kStartMessage), 0x01, 0x03, 0x00, 0xfd };
+    constexpr uint8_t packetData1[] = { to_underlying(BtpEngine::HeaderFlags::kContinueMessage), 0x02, 0xfe };
+    constexpr uint8_t packetData2[] = { to_underlying(BtpEngine::HeaderFlags::kEndMessage), 0x03, 0xff };
+
+    auto packet0 = System::PacketBufferHandle::NewWithData(packetData0, sizeof(packetData0));
+    EXPECT_EQ(packet0->DataLength(), 5);
+
+    SequenceNumber_t receivedAck;
+    bool didReceiveAck;
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet0), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_InProgress);
+
+    auto packet1 = System::PacketBufferHandle::NewWithData(packetData1, sizeof(packetData1));
+    EXPECT_EQ(packet1->DataLength(), 3);
+
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet1), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_InProgress);
+
+    auto packet2 = System::PacketBufferHandle::NewWithData(packetData2, sizeof(packetData2));
+    EXPECT_EQ(packet2->DataLength(), 3);
+
+    EXPECT_EQ(mBtpEngine.HandleCharacteristicReceived(std::move(packet2), receivedAck, didReceiveAck), CHIP_NO_ERROR);
+    EXPECT_EQ(mBtpEngine.RxState(), BtpEngine::kState_Complete);
+}
+
+TEST_F(TestBtpEngine, HandleCharacteristicSendOnePacket)
+{
+    auto packet0 = System::PacketBufferHandle::New(10);
+    packet0->SetDataLength(1);
+
+    auto data0 = packet0->Start();
+    ASSERT_NE(data0, nullptr);
+    std::iota(data0, data0 + 1, 0);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(packet0.Retain(), false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_Complete);
+    EXPECT_EQ(packet0->DataLength(), 5);
+}
+
+TEST_F(TestBtpEngine, HandleCharacteristicSendTwoPacket)
+{
+    auto packet0 = System::PacketBufferHandle::New(30);
+    packet0->SetDataLength(30);
+
+    auto data0 = packet0->Start();
+    ASSERT_NE(data0, nullptr);
+    std::iota(data0, data0 + 30, 0);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(packet0.Retain(), false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_InProgress);
+    EXPECT_EQ(packet0->DataLength(), 20);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(nullptr, false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_Complete);
+    EXPECT_EQ(packet0->DataLength(), 16);
+}
+
+// Send 40-byte payload.
+// Packet0: 4 byte header + 16 byte payload
+// Packet1: 2 byte header + 18 byte payload
+// Packet2: 2 byte header + 6 byte payload
+TEST_F(TestBtpEngine, HandleCharacteristicSendThreePacket)
+{
+    auto packet0 = System::PacketBufferHandle::New(40);
+    packet0->SetDataLength(40);
+
+    auto data0 = packet0->Start();
+    ASSERT_NE(data0, nullptr);
+    std::iota(data0, data0 + 40, 0);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(packet0.Retain(), false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_InProgress);
+    EXPECT_EQ(packet0->DataLength(), 20);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(nullptr, false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_InProgress);
+    EXPECT_EQ(packet0->DataLength(), 20);
+
+    EXPECT_TRUE(mBtpEngine.HandleCharacteristicSend(nullptr, false));
+    EXPECT_EQ(mBtpEngine.TxState(), BtpEngine::kState_Complete);
+    EXPECT_EQ(packet0->DataLength(), 8);
+}
+
+} // namespace
diff --git a/src/controller/AbstractDnssdDiscoveryController.h b/src/controller/AbstractDnssdDiscoveryController.h
index 6e50d7b40c89ca..c8c9053f878ff3 100644
--- a/src/controller/AbstractDnssdDiscoveryController.h
+++ b/src/controller/AbstractDnssdDiscoveryController.h
@@ -36,7 +36,7 @@ namespace Controller {
  *   to maintain a list of DiscoveredNodes and providing the implementation
  *   of the template GetDiscoveredNodes() function.
  */
-class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::CommissioningResolveDelegate
+class DLL_EXPORT AbstractDnssdDiscoveryController : public Dnssd::DiscoverNodeDelegate
 {
 public:
     explicit AbstractDnssdDiscoveryController(Dnssd::Resolver * resolver = nullptr) : mDNSResolver(resolver) {}
diff --git a/src/controller/CHIPCommissionableNodeController.cpp b/src/controller/CHIPCommissionableNodeController.cpp
index d187cc1289a851..f116928b585d82 100644
--- a/src/controller/CHIPCommissionableNodeController.cpp
+++ b/src/controller/CHIPCommissionableNodeController.cpp
@@ -36,13 +36,13 @@ CHIP_ERROR CommissionableNodeController::DiscoverCommissioners(Dnssd::DiscoveryF
     mDNSResolver.Shutdown(); // reset if already inited
     ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
 #endif
-    mDNSResolver.SetCommissioningDelegate(this);
+    mDNSResolver.SetDiscoveryDelegate(this);
     return mDNSResolver.DiscoverCommissioners(discoveryFilter);
 }
 
 CommissionableNodeController::~CommissionableNodeController()
 {
-    mDNSResolver.SetCommissioningDelegate(nullptr);
+    mDNSResolver.SetDiscoveryDelegate(nullptr);
 }
 
 const Dnssd::DiscoveredNodeData * CommissionableNodeController::GetDiscoveredCommissioner(int idx)
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index fa65b96db66e45..a9c41d87fd04fa 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -70,6 +70,7 @@
 #include <memory>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string>
 #include <time.h>
 
 using namespace chip::Inet;
@@ -109,7 +110,7 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params)
     VerifyOrReturnError(params.systemState->TransportMgr() != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     ReturnErrorOnFailure(mDNSResolver.Init(params.systemState->UDPEndPointManager()));
-    mDNSResolver.SetCommissioningDelegate(this);
+    mDNSResolver.SetDiscoveryDelegate(this);
     RegisterDeviceDiscoveryDelegate(params.deviceDiscoveryDelegate);
 
     mVendorId = params.controllerVendorId;
@@ -135,6 +136,7 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params)
     mState       = State::Initialized;
 
     mRemoveFromFabricTableOnShutdown = params.removeFromFabricTableOnShutdown;
+    mDeleteFromFabricTableOnShutdown = params.deleteFromFabricTableOnShutdown;
 
     if (GetFabricIndex() != kUndefinedFabricIndex)
     {
@@ -381,8 +383,9 @@ void DeviceController::Shutdown()
 
     VerifyOrReturn(mState != State::NotInitialized);
 
+    // If our state is initialialized it means mSystemState is valid,
+    // and we can use it below before we release our reference to it.
     ChipLogDetail(Controller, "Shutting down the controller");
-
     mState = State::NotInitialized;
 
     if (mFabricIndex != kUndefinedFabricIndex)
@@ -400,13 +403,13 @@ void DeviceController::Shutdown()
         // existing sessions too?
         mSystemState->SessionMgr()->ExpireAllSessionsForFabric(mFabricIndex);
 
-        if (mRemoveFromFabricTableOnShutdown)
+        if (mDeleteFromFabricTableOnShutdown)
         {
-            FabricTable * fabricTable = mSystemState->Fabrics();
-            if (fabricTable != nullptr)
-            {
-                fabricTable->Forget(mFabricIndex);
-            }
+            mSystemState->Fabrics()->Delete(mFabricIndex);
+        }
+        else if (mRemoveFromFabricTableOnShutdown)
+        {
+            mSystemState->Fabrics()->Forget(mFabricIndex);
         }
     }
 
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index 979a5f044fde8b..3d6e287ff17f44 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -126,15 +126,27 @@ struct ControllerInitParams
 
     /**
      * Controls whether shutdown of the controller removes the corresponding
-     * entry from the fabric table.  For now the removal is just from the
-     * in-memory table, not from storage, which means that after controller
-     * shutdown the storage and the in-memory fabric table will be out of sync.
-     * This is acceptable for implementations that don't actually store any of
-     * the fabric table information, but if someone wants a true removal at some
-     * point another option will need to be added here.
+     * entry from the in-memory fabric table, but NOT from storage.
+     *
+     * Note that this means that after controller shutdown the storage and
+     * in-memory versions of the fabric table will be out of sync.
+     * For compatibility reasons this is the default behavior.
+     *
+     * @see deleteFromFabricTableOnShutdown
      */
     bool removeFromFabricTableOnShutdown = true;
 
+    /**
+     * Controls whether shutdown of the controller deletes the corresponding
+     * entry from the fabric table (both in-memory and storage).
+     *
+     * If both `removeFromFabricTableOnShutdown` and this setting are true,
+     * this setting will take precedence.
+     *
+     * @see removeFromFabricTableOnShutdown
+     */
+    bool deleteFromFabricTableOnShutdown = false;
+
     /**
      * Specifies whether to utilize the fabric table entry for the given FabricIndex
      * for initialization. If provided and neither the operational key pair nor the NOC
@@ -394,6 +406,7 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
     FabricIndex mFabricIndex = kUndefinedFabricIndex;
 
     bool mRemoveFromFabricTableOnShutdown = true;
+    bool mDeleteFromFabricTableOnShutdown = false;
 
     FabricTable::AdvertiseIdentity mAdvertiseIdentity = FabricTable::AdvertiseIdentity::Yes;
 
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
index 115d865e0ac0cb..e4e419978d8a2d 100644
--- a/src/controller/CHIPDeviceControllerFactory.cpp
+++ b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -305,6 +305,7 @@ void DeviceControllerFactory::PopulateInitParams(ControllerInitParams & controll
     controllerParams.controllerRCAC                       = params.controllerRCAC;
     controllerParams.permitMultiControllerFabrics         = params.permitMultiControllerFabrics;
     controllerParams.removeFromFabricTableOnShutdown      = params.removeFromFabricTableOnShutdown;
+    controllerParams.deleteFromFabricTableOnShutdown      = params.deleteFromFabricTableOnShutdown;
 
     controllerParams.systemState        = mSystemState;
     controllerParams.controllerVendorId = params.controllerVendorId;
@@ -391,9 +392,9 @@ void DeviceControllerFactory::RetainSystemState()
     (void) mSystemState->Retain();
 }
 
-void DeviceControllerFactory::ReleaseSystemState()
+bool DeviceControllerFactory::ReleaseSystemState()
 {
-    mSystemState->Release();
+    return mSystemState->Release();
 }
 
 DeviceControllerFactory::~DeviceControllerFactory()
diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h
index 3bb560a9ac321f..19b19e54eab414 100644
--- a/src/controller/CHIPDeviceControllerFactory.h
+++ b/src/controller/CHIPDeviceControllerFactory.h
@@ -93,15 +93,27 @@ struct SetupParams
 
     /**
      * Controls whether shutdown of the controller removes the corresponding
-     * entry from the fabric table.  For now the removal is just from the
-     * in-memory table, not from storage, which means that after controller
-     * shutdown the storage and the in-memory fabric table will be out of sync.
-     * This is acceptable for implementations that don't actually store any of
-     * the fabric table information, but if someone wants a true removal at some
-     * point another option will need to be added here.
+     * entry from the in-memory fabric table, but NOT from storage.
+     *
+     * Note that this means that after controller shutdown the storage and
+     * in-memory versions of the fabric table will be out of sync.
+     * For compatibility reasons this is the default behavior.
+     *
+     * @see deleteFromFabricTableOnShutdown
      */
     bool removeFromFabricTableOnShutdown = true;
 
+    /**
+     * Controls whether shutdown of the controller deletes the corresponding
+     * entry from the fabric table (both in-memory and storage).
+     *
+     * If both `removeFromFabricTableOnShutdown` and this setting are true,
+     * this setting will take precedence.
+     *
+     * @see removeFromFabricTableOnShutdown
+     */
+    bool deleteFromFabricTableOnShutdown = false;
+
     /**
      * Specifies whether to utilize the fabric table entry for the given FabricIndex
      * for initialization. If provided and neither the operational key pair nor the NOC
@@ -193,7 +205,9 @@ class DeviceControllerFactory
     //
     // This should only be invoked if a matching call to RetainSystemState() was called prior.
     //
-    void ReleaseSystemState();
+    // Returns true if stack was shut down in response to this call, or false otherwise.
+    //
+    bool ReleaseSystemState();
 
     //
     // Retrieve a read-only pointer to the system state object that contains pointers to key stack
diff --git a/src/controller/CHIPDeviceControllerSystemState.h b/src/controller/CHIPDeviceControllerSystemState.h
index bc89d6c1d21ec2..707f1befacec94 100644
--- a/src/controller/CHIPDeviceControllerSystemState.h
+++ b/src/controller/CHIPDeviceControllerSystemState.h
@@ -167,8 +167,9 @@ class DeviceControllerSystemState
     // should be called to release the reference once it is no longer needed.
     DeviceControllerSystemState * Retain()
     {
-        VerifyOrDie(mRefCount < std::numeric_limits<uint32_t>::max());
-        ++mRefCount;
+        auto count = mRefCount++;
+        VerifyOrDie(count < std::numeric_limits<decltype(count)>::max()); // overflow
+        VerifyOrDie(!IsShutdown());                                       // avoid zombie
         return this;
     };
 
@@ -178,14 +179,15 @@ class DeviceControllerSystemState
     //
     // NB: The system state is owned by the factory; Relase() will not free it
     // but will free its members (Shutdown()).
-    void Release()
+    //
+    // Returns true if the system state was shut down in response to this call.
+    bool Release()
     {
-        VerifyOrDie(mRefCount > 0);
-
-        if (--mRefCount == 0)
-        {
-            Shutdown();
-        }
+        auto count = mRefCount--;
+        VerifyOrDie(count > 0); // underflow
+        VerifyOrReturnValue(count == 1, false);
+        Shutdown();
+        return true;
     };
     bool IsInitialized()
     {
@@ -195,6 +197,7 @@ class DeviceControllerSystemState
             mGroupDataProvider != nullptr && mReportScheduler != nullptr && mTimerDelegate != nullptr &&
             mSessionKeystore != nullptr && mSessionResumptionStorage != nullptr && mBDXTransferServer != nullptr;
     };
+    bool IsShutdown() { return mHaveShutDown; }
 
     System::Layer * SystemLayer() const { return mSystemLayer; };
     Inet::EndPointManager<Inet::TCPEndPoint> * TCPEndPointManager() const { return mTCPEndPointManager; };
diff --git a/src/controller/ExamplePersistentStorage.cpp b/src/controller/ExamplePersistentStorage.cpp
index 90c84421f7481a..054469900b39a9 100644
--- a/src/controller/ExamplePersistentStorage.cpp
+++ b/src/controller/ExamplePersistentStorage.cpp
@@ -21,7 +21,9 @@
 #include <lib/support/IniEscaping.h>
 
 #include <fstream>
+#include <map>
 #include <memory>
+#include <string>
 
 using String   = std::basic_string<char>;
 using Section  = std::map<String, String>;
diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp
index db09d91fd74441..3a995a6e93579a 100644
--- a/src/controller/SetUpCodePairer.cpp
+++ b/src/controller/SetUpCodePairer.cpp
@@ -332,23 +332,22 @@ bool SetUpCodePairer::IdIsPresent(uint16_t vendorOrProductID)
 
 bool SetUpCodePairer::NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData & nodeData) const
 {
-    if (nodeData.commissionData.commissioningMode == 0)
+    if (nodeData.nodeData.commissioningMode == 0)
     {
         ChipLogProgress(Controller, "Discovered device does not have an open commissioning window.");
         return false;
     }
 
     // The advertisement may not include a vendor id.
-    if (IdIsPresent(mPayloadVendorID) && IdIsPresent(nodeData.commissionData.vendorId) &&
-        mPayloadVendorID != nodeData.commissionData.vendorId)
+    if (IdIsPresent(mPayloadVendorID) && IdIsPresent(nodeData.nodeData.vendorId) && mPayloadVendorID != nodeData.nodeData.vendorId)
     {
         ChipLogProgress(Controller, "Discovered device does not match our vendor id.");
         return false;
     }
 
     // The advertisement may not include a product id.
-    if (IdIsPresent(mPayloadProductID) && IdIsPresent(nodeData.commissionData.productId) &&
-        mPayloadProductID != nodeData.commissionData.productId)
+    if (IdIsPresent(mPayloadProductID) && IdIsPresent(nodeData.nodeData.productId) &&
+        mPayloadProductID != nodeData.nodeData.productId)
     {
         ChipLogProgress(Controller, "Discovered device does not match our product id.");
         return false;
@@ -358,10 +357,10 @@ bool SetUpCodePairer::NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData &
     switch (mCurrentFilter.type)
     {
     case Dnssd::DiscoveryFilterType::kShortDiscriminator:
-        discriminatorMatches = (((nodeData.commissionData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code);
+        discriminatorMatches = (((nodeData.nodeData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code);
         break;
     case Dnssd::DiscoveryFilterType::kLongDiscriminator:
-        discriminatorMatches = (nodeData.commissionData.longDiscriminator == mCurrentFilter.code);
+        discriminatorMatches = (nodeData.nodeData.longDiscriminator == mCurrentFilter.code);
         break;
     default:
         ChipLogError(Controller, "Unknown filter type; all matches will fail");
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
index fc9fbe02f12292..8e0f5e9a684e67 100644
--- a/src/controller/java/AndroidCallbacks.cpp
+++ b/src/controller/java/AndroidCallbacks.cpp
@@ -31,6 +31,7 @@
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/PlatformManager.h>
+#include <string>
 #include <type_traits>
 
 namespace chip {
diff --git a/src/controller/java/AndroidCommissioningWindowOpener.cpp b/src/controller/java/AndroidCommissioningWindowOpener.cpp
index 581b81073769c8..ff0d73133ef20a 100644
--- a/src/controller/java/AndroidCommissioningWindowOpener.cpp
+++ b/src/controller/java/AndroidCommissioningWindowOpener.cpp
@@ -26,6 +26,8 @@
 #include <setup_payload/ManualSetupPayloadGenerator.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 using namespace chip::app::Clusters;
 using namespace chip::System::Clock;
 
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index e0e709e1f946fd..c5b3863524e153 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <string.h>
diff --git a/src/controller/java/AndroidInteractionClient.cpp b/src/controller/java/AndroidInteractionClient.cpp
index ec809570bcb1c7..a62e0c82723f7b 100644
--- a/src/controller/java/AndroidInteractionClient.cpp
+++ b/src/controller/java/AndroidInteractionClient.cpp
@@ -28,6 +28,8 @@
 
 #include <lib/support/jsontlv/JsonToTlv.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::Controller;
 
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index aa1dd41149189e..82a0485718a21e 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1905,7 +1905,7 @@ JNI_METHOD(jobject, getDiscoveredDevice)(JNIEnv * env, jobject self, jlong handl
 
     jobject discoveredObj = env->NewObject(discoveredDeviceCls, constructor);
 
-    env->SetLongField(discoveredObj, discrminatorID, data->commissionData.longDiscriminator);
+    env->SetLongField(discoveredObj, discrminatorID, data->nodeData.longDiscriminator);
 
     char ipAddress[100];
     data->resolutionData.ipAddress[0].ToString(ipAddress, 100);
@@ -1913,13 +1913,13 @@ JNI_METHOD(jobject, getDiscoveredDevice)(JNIEnv * env, jobject self, jlong handl
 
     env->SetObjectField(discoveredObj, ipAddressID, jniipAdress);
     env->SetIntField(discoveredObj, portID, static_cast<jint>(data->resolutionData.port));
-    env->SetLongField(discoveredObj, deviceTypeID, static_cast<jlong>(data->commissionData.deviceType));
-    env->SetIntField(discoveredObj, vendorIdID, static_cast<jint>(data->commissionData.vendorId));
-    env->SetIntField(discoveredObj, productIdID, static_cast<jint>(data->commissionData.productId));
+    env->SetLongField(discoveredObj, deviceTypeID, static_cast<jlong>(data->nodeData.deviceType));
+    env->SetIntField(discoveredObj, vendorIdID, static_cast<jint>(data->nodeData.vendorId));
+    env->SetIntField(discoveredObj, productIdID, static_cast<jint>(data->nodeData.productId));
 
     jbyteArray jRotatingId;
-    CHIP_ERROR err = JniReferences::GetInstance().N2J_ByteArray(
-        env, data->commissionData.rotatingId, static_cast<jsize>(data->commissionData.rotatingIdLen), jRotatingId);
+    CHIP_ERROR err = JniReferences::GetInstance().N2J_ByteArray(env, data->nodeData.rotatingId,
+                                                                static_cast<jsize>(data->nodeData.rotatingIdLen), jRotatingId);
 
     if (err != CHIP_NO_ERROR)
     {
@@ -1927,12 +1927,12 @@ JNI_METHOD(jobject, getDiscoveredDevice)(JNIEnv * env, jobject self, jlong handl
         return nullptr;
     }
     env->SetObjectField(discoveredObj, rotatingIdID, static_cast<jobject>(jRotatingId));
-    env->SetObjectField(discoveredObj, instanceNameID, env->NewStringUTF(data->commissionData.instanceName));
-    env->SetObjectField(discoveredObj, deviceNameID, env->NewStringUTF(data->commissionData.deviceName));
-    env->SetObjectField(discoveredObj, pairingInstructionID, env->NewStringUTF(data->commissionData.pairingInstruction));
+    env->SetObjectField(discoveredObj, instanceNameID, env->NewStringUTF(data->nodeData.instanceName));
+    env->SetObjectField(discoveredObj, deviceNameID, env->NewStringUTF(data->nodeData.deviceName));
+    env->SetObjectField(discoveredObj, pairingInstructionID, env->NewStringUTF(data->nodeData.pairingInstruction));
 
-    env->CallVoidMethod(discoveredObj, setCommissioningModeID, static_cast<jint>(data->commissionData.commissioningMode));
-    env->CallVoidMethod(discoveredObj, setPairingHintID, static_cast<jint>(data->commissionData.pairingHint));
+    env->CallVoidMethod(discoveredObj, setCommissioningModeID, static_cast<jint>(data->nodeData.commissioningMode));
+    env->CallVoidMethod(discoveredObj, setPairingHintID, static_cast<jint>(data->nodeData.pairingHint));
 
     return discoveredObj;
 }
diff --git a/src/controller/java/OTAProviderDelegateBridge.cpp b/src/controller/java/OTAProviderDelegateBridge.cpp
index 10f9ae12801558..4565d42416c19a 100644
--- a/src/controller/java/OTAProviderDelegateBridge.cpp
+++ b/src/controller/java/OTAProviderDelegateBridge.cpp
@@ -23,6 +23,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
index c82dd13f0e452f..39d70e350ae4db 100644
--- a/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
+++ b/src/controller/python/ChipCommissionableNodeController-ScriptBinding.cpp
@@ -82,22 +82,22 @@ void pychip_CommissionableNodeController_PrintDiscoveredCommissioners(
             continue;
         }
         char rotatingId[chip::Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
-        Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
-                                            rotatingId, sizeof(rotatingId));
+        Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+                                            sizeof(rotatingId));
 
         ChipLogProgress(Discovery, "Commissioner %d", i);
-        ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->commissionData.instanceName);
+        ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->nodeData.instanceName);
         ChipLogProgress(Discovery, "\tHost name:\t\t%s", dnsSdInfo->resolutionData.hostName);
         ChipLogProgress(Discovery, "\tPort:\t\t\t%u", dnsSdInfo->resolutionData.port);
-        ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->commissionData.longDiscriminator);
-        ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->commissionData.vendorId);
-        ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->commissionData.productId);
-        ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->commissionData.commissioningMode);
-        ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->commissionData.deviceType);
-        ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->commissionData.deviceName);
+        ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->nodeData.longDiscriminator);
+        ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->nodeData.vendorId);
+        ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->nodeData.productId);
+        ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->nodeData.commissioningMode);
+        ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->nodeData.deviceType);
+        ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->nodeData.deviceName);
         ChipLogProgress(Discovery, "\tRotating Id\t\t%s", rotatingId);
-        ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->commissionData.pairingInstruction);
-        ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->commissionData.pairingHint);
+        ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->nodeData.pairingInstruction);
+        ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->nodeData.pairingHint);
         if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
         {
             ChipLogProgress(Discovery, "\tMrp Interval idle\t%u",
diff --git a/src/controller/python/ChipDeviceController-Discovery.cpp b/src/controller/python/ChipDeviceController-Discovery.cpp
index 7b502140a36bb6..a8896628680a8f 100644
--- a/src/controller/python/ChipDeviceController-Discovery.cpp
+++ b/src/controller/python/ChipDeviceController-Discovery.cpp
@@ -110,21 +110,21 @@ void pychip_DeviceController_IterateDiscoveredCommissionableNodes(Controller::De
         Json::Value jsonVal;
 
         char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
-        Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
-                                            rotatingId, sizeof(rotatingId));
+        Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+                                            sizeof(rotatingId));
 
         ChipLogProgress(Discovery, "Commissionable Node %d", i);
-        jsonVal["instanceName"]       = dnsSdInfo->commissionData.instanceName;
+        jsonVal["instanceName"]       = dnsSdInfo->nodeData.instanceName;
         jsonVal["hostName"]           = dnsSdInfo->resolutionData.hostName;
         jsonVal["port"]               = dnsSdInfo->resolutionData.port;
-        jsonVal["longDiscriminator"]  = dnsSdInfo->commissionData.longDiscriminator;
-        jsonVal["vendorId"]           = dnsSdInfo->commissionData.vendorId;
-        jsonVal["productId"]          = dnsSdInfo->commissionData.productId;
-        jsonVal["commissioningMode"]  = dnsSdInfo->commissionData.commissioningMode;
-        jsonVal["deviceType"]         = dnsSdInfo->commissionData.deviceType;
-        jsonVal["deviceName"]         = dnsSdInfo->commissionData.deviceName;
-        jsonVal["pairingInstruction"] = dnsSdInfo->commissionData.pairingInstruction;
-        jsonVal["pairingHint"]        = dnsSdInfo->commissionData.pairingHint;
+        jsonVal["longDiscriminator"]  = dnsSdInfo->nodeData.longDiscriminator;
+        jsonVal["vendorId"]           = dnsSdInfo->nodeData.vendorId;
+        jsonVal["productId"]          = dnsSdInfo->nodeData.productId;
+        jsonVal["commissioningMode"]  = dnsSdInfo->nodeData.commissioningMode;
+        jsonVal["deviceType"]         = dnsSdInfo->nodeData.deviceType;
+        jsonVal["deviceName"]         = dnsSdInfo->nodeData.deviceName;
+        jsonVal["pairingInstruction"] = dnsSdInfo->nodeData.pairingInstruction;
+        jsonVal["pairingHint"]        = dnsSdInfo->nodeData.pairingHint;
         if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
         {
             jsonVal["mrpRetryIntervalIdle"] = dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().Value().count();
@@ -152,7 +152,7 @@ void pychip_DeviceController_IterateDiscoveredCommissionableNodes(Controller::De
         {
             jsonVal["isICDOperatingAsLIT"] = dnsSdInfo->resolutionData.isICDOperatingAsLIT.Value();
         }
-        if (dnsSdInfo->commissionData.rotatingIdLen > 0)
+        if (dnsSdInfo->nodeData.rotatingIdLen > 0)
         {
             jsonVal["rotatingId"] = rotatingId;
         }
@@ -174,22 +174,22 @@ void pychip_DeviceController_PrintDiscoveredDevices(Controller::DeviceCommission
             continue;
         }
         char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1] = "";
-        Encoding::BytesToUppercaseHexString(dnsSdInfo->commissionData.rotatingId, dnsSdInfo->commissionData.rotatingIdLen,
-                                            rotatingId, sizeof(rotatingId));
+        Encoding::BytesToUppercaseHexString(dnsSdInfo->nodeData.rotatingId, dnsSdInfo->nodeData.rotatingIdLen, rotatingId,
+                                            sizeof(rotatingId));
 
         ChipLogProgress(Discovery, "Commissionable Node %d", i);
-        ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->commissionData.instanceName);
+        ChipLogProgress(Discovery, "\tInstance name:\t\t%s", dnsSdInfo->nodeData.instanceName);
         ChipLogProgress(Discovery, "\tHost name:\t\t%s", dnsSdInfo->resolutionData.hostName);
         ChipLogProgress(Discovery, "\tPort:\t\t\t%u", dnsSdInfo->resolutionData.port);
-        ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->commissionData.longDiscriminator);
-        ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->commissionData.vendorId);
-        ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->commissionData.productId);
-        ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->commissionData.commissioningMode);
-        ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->commissionData.deviceType);
-        ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->commissionData.deviceName);
+        ChipLogProgress(Discovery, "\tLong discriminator:\t%u", dnsSdInfo->nodeData.longDiscriminator);
+        ChipLogProgress(Discovery, "\tVendor ID:\t\t%u", dnsSdInfo->nodeData.vendorId);
+        ChipLogProgress(Discovery, "\tProduct ID:\t\t%u", dnsSdInfo->nodeData.productId);
+        ChipLogProgress(Discovery, "\tCommissioning Mode\t%u", dnsSdInfo->nodeData.commissioningMode);
+        ChipLogProgress(Discovery, "\tDevice Type\t\t%u", dnsSdInfo->nodeData.deviceType);
+        ChipLogProgress(Discovery, "\tDevice Name\t\t%s", dnsSdInfo->nodeData.deviceName);
         ChipLogProgress(Discovery, "\tRotating Id\t\t%s", rotatingId);
-        ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->commissionData.pairingInstruction);
-        ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->commissionData.pairingHint);
+        ChipLogProgress(Discovery, "\tPairing Instruction\t%s", dnsSdInfo->nodeData.pairingInstruction);
+        ChipLogProgress(Discovery, "\tPairing Hint\t\t%u", dnsSdInfo->nodeData.pairingHint);
         if (dnsSdInfo->resolutionData.GetMrpRetryIntervalIdle().HasValue())
         {
             ChipLogProgress(Discovery, "\tMrp Interval idle\t%u",
diff --git a/src/controller/python/ChipDeviceController-ScriptDevicePairingDelegate.cpp b/src/controller/python/ChipDeviceController-ScriptDevicePairingDelegate.cpp
index 9908c53c7eeeae..c1df8125793d02 100644
--- a/src/controller/python/ChipDeviceController-ScriptDevicePairingDelegate.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptDevicePairingDelegate.cpp
@@ -23,6 +23,8 @@
 #include <setup_payload/ManualSetupPayloadGenerator.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
+#include <string>
+
 namespace chip {
 namespace Controller {
 
diff --git a/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp b/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
index e5cb7d768e4d18..a83a56c1b813f9 100644
--- a/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptPairingDeviceDiscoveryDelegate.cpp
@@ -24,7 +24,7 @@ namespace Controller {
 void ScriptPairingDeviceDiscoveryDelegate::OnDiscoveredDevice(const Dnssd::DiscoveredNodeData & nodeData)
 {
     // Ignore nodes with closed comissioning window
-    VerifyOrReturn(nodeData.commissionData.commissioningMode != 0);
+    VerifyOrReturn(nodeData.nodeData.commissioningMode != 0);
     VerifyOrReturn(mActiveDeviceCommissioner != nullptr);
 
     const uint16_t port = nodeData.resolutionData.port;
diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py
index ed091858d289a8..6d4017a5b70ed8 100644
--- a/src/controller/python/test/test_scripts/base.py
+++ b/src/controller/python/test/test_scripts/base.py
@@ -749,9 +749,9 @@ def OnValueChange(path: Attribute.TypedAttributePath, transaction: Attribute.Sub
 
         #
         # Now write the attribute from fabric2, give it some time before checking if the report
-        # was received.
+        # was received.  Use a different value from before, so there is an actual change.
         #
-        await self.devCtrl2.WriteAttribute(nodeid, [(1, Clusters.UnitTesting.Attributes.Int8u(4))])
+        await self.devCtrl2.WriteAttribute(nodeid, [(1, Clusters.UnitTesting.Attributes.Int8u(5))])
         time.sleep(2)
 
         sub.Shutdown()
@@ -761,7 +761,8 @@ def OnValueChange(path: Attribute.TypedAttributePath, transaction: Attribute.Sub
             return False
 
         #
-        # Do the same test again, but reversing the roles of fabric1 and fabric2.
+        # Do the same test again, but reversing the roles of fabric1 and fabric2.  And again
+        # writing a different value, so there is an actual value change.
         #
         self.logger.info("Testing fabric-isolated CASE eviction (reverse)")
 
@@ -773,7 +774,7 @@ def OnValueChange(path: Attribute.TypedAttributePath, transaction: Attribute.Sub
             self.devCtrl.CloseSession(nodeid)
             await self.devCtrl.ReadAttribute(nodeid, [(Clusters.BasicInformation.Attributes.ClusterRevision)])
 
-        await self.devCtrl.WriteAttribute(nodeid, [(1, Clusters.UnitTesting.Attributes.Int8u(4))])
+        await self.devCtrl.WriteAttribute(nodeid, [(1, Clusters.UnitTesting.Attributes.Int8u(6))])
         time.sleep(2)
 
         sub.Shutdown()
diff --git a/src/controller/tests/TestCommissionableNodeController.cpp b/src/controller/tests/TestCommissionableNodeController.cpp
index c2aafe500c293d..760b62e97386b0 100644
--- a/src/controller/tests/TestCommissionableNodeController.cpp
+++ b/src/controller/tests/TestCommissionableNodeController.cpp
@@ -38,9 +38,10 @@ class MockResolver : public Resolver
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {}
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override { return ResolveNodeIdStatus; }
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override {}
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext &) override { return DiscoverCommissionersStatus; }
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext &) override
+    CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext &) override
     {
+        if (DiscoveryType::kCommissionerNode == type)
+            return DiscoverCommissionersStatus;
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
     CHIP_ERROR StopDiscovery(DiscoveryContext &) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
diff --git a/src/controller/tests/TestEventChunking.cpp b/src/controller/tests/TestEventChunking.cpp
index 74bee0f9aab0e4..0555e3ef94560b 100644
--- a/src/controller/tests/TestEventChunking.cpp
+++ b/src/controller/tests/TestEventChunking.cpp
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AppConfig.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/BufferedReadCallback.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/EventLogging.h>
diff --git a/src/controller/tests/TestReadChunking.cpp b/src/controller/tests/TestReadChunking.cpp
index ecc53c941977c9..1095e0f26ebf61 100644
--- a/src/controller/tests/TestReadChunking.cpp
+++ b/src/controller/tests/TestReadChunking.cpp
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AppConfig.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/BufferedReadCallback.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/GlobalAttributes.h>
@@ -31,6 +32,7 @@
 #include <app/tests/AppTestContext.h>
 #include <app/util/DataModelHandler.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/endpoint-config-api.h>
 #include <controller/InvokeInteraction.h>
 #include <functional>
 #include <lib/core/ErrorStr.h>
diff --git a/src/controller/tests/TestWriteChunking.cpp b/src/controller/tests/TestWriteChunking.cpp
index d0555b8d2440af..2190195887ad41 100644
--- a/src/controller/tests/TestWriteChunking.cpp
+++ b/src/controller/tests/TestWriteChunking.cpp
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/AppConfig.h>
 #include <app/AttributeAccessInterface.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/InteractionModelEngine.h>
 #include <app/WriteClient.h>
diff --git a/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp b/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp
index 1efbfbd46e208f..c3dd0fcdec0447 100644
--- a/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp
+++ b/src/crypto/tests/TestPersistentStorageOpKeyStore.cpp
@@ -28,6 +28,8 @@
 #include <lib/support/UnitTestRegistration.h>
 #include <nlunit-test.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::Crypto;
 
diff --git a/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm b/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm
index be839561c1be33..eff85b1b0cb503 100644
--- a/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm
+++ b/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm
@@ -33,20 +33,6 @@ typedef NS_ENUM(NSInteger, MTRAsyncWorkItemState) {
     MTRAsyncWorkItemRetryCountBase = MTRAsyncWorkItemRunning, // values >= MTRAsyncWorkItemRunning encode retryCount
 };
 
-// A helper struct that facilitates access to _context while
-//  - only reading the _context weak reference once and retaining a strong
-//    reference for the duration of a particular queue method call
-//  - avoiding calls to `[context description]` under our lock
-struct ContextSnapshot {
-    id _Nullable reference;
-    NSString * _Nullable description;
-    ContextSnapshot(id _Nullable context)
-    {
-        reference = context;
-        description = [context description];
-    }
-};
-
 MTR_DIRECT_MEMBERS
 @implementation MTRAsyncWorkItem {
     dispatch_queue_t _queue;
@@ -214,6 +200,21 @@ @implementation MTRAsyncWorkQueue {
     NSInteger _runningWorkItemCount;
 }
 
+// A helper struct that facilitates access to _context while
+//  - only reading the _context weak reference once and retaining a strong
+//    reference for the duration of a particular queue method call
+//  - avoiding calls to `[context description]` under our lock
+struct ContextSnapshot {
+    id _Nullable reference;
+    NSString * _Nullable description;
+    ContextSnapshot(MTRAsyncWorkQueue * queue)
+    {
+        os_unfair_lock_assert_not_owner(&queue->_lock);
+        reference = queue->_context;
+        description = [reference description];
+    }
+};
+
 - (instancetype)initWithContext:(id)context
 {
     NSParameterAssert(context);
@@ -226,11 +227,9 @@ - (instancetype)initWithContext:(id)context
 
 - (NSString *)description
 {
-    NSUInteger itemsCount;
-    os_unfair_lock_lock(&_lock);
-    itemsCount = _items.count;
-    os_unfair_lock_unlock(&_lock);
-    return [NSString stringWithFormat:@"<%@ context: %@ items count: %tu>", self.class, _context, itemsCount];
+    ContextSnapshot context(self);
+    std::lock_guard lock(_lock);
+    return [NSString stringWithFormat:@"<%@ context: %@, items count: %tu>", self.class, context.description, _items.count];
 }
 
 - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
@@ -251,10 +250,10 @@ - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
             description:(nullable NSString *)description
 {
     NSParameterAssert(item);
-    ContextSnapshot context(_context); // outside of lock
+    ContextSnapshot context(self); // outside of lock
     NSAssert(context.reference, @"context has been lost");
 
-    os_unfair_lock_lock(&_lock);
+    std::lock_guard lock(_lock);
     [item markEnqueued];
     [_items addObject:item];
 
@@ -262,18 +261,17 @@ - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
         // Logging the description once is enough because other log messages
         // related to the work item (execution, completion etc) can easily be
         // correlated using the unique id.
-        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@> enqueued work item [%llu]: %@", context.description, item.uniqueID, description);
+        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]: %@", context.description, _items.count, item.uniqueID, description);
     } else {
-        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@> enqueued work item [%llu]", context.description, item.uniqueID);
+        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]", context.description, _items.count, item.uniqueID);
     }
 
     [self _callNextReadyWorkItemWithContext:context];
-    os_unfair_lock_unlock(&_lock);
 }
 
 - (void)invalidate
 {
-    ContextSnapshot context(_context); // outside of lock
+    ContextSnapshot context(self); // outside of lock
     std::lock_guard lock(_lock);
     MTR_LOG_INFO("MTRAsyncWorkQueue<%@> invalidate %tu items", context.description, _items.count);
     for (MTRAsyncWorkItem * item in _items) {
@@ -299,7 +297,7 @@ - (void)_postProcessWorkItem:(MTRAsyncWorkItem *)workItem
     } else {
         [workItem markComplete];
         [_items removeObjectAtIndex:0];
-        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@> completed work item [%llu]", context.description, workItem.uniqueID);
+        MTR_LOG_DEFAULT("MTRAsyncWorkQueue<%@, items count: %tu> completed work item [%llu]", context.description, _items.count, workItem.uniqueID);
     }
 
     // when "concurrency width" is implemented this will be decremented instead
@@ -362,13 +360,12 @@ - (void)_callNextReadyWorkItemWithContext:(ContextSnapshot const &)context
         mtr_strongify(self);
         BOOL handled = NO;
         if (self) {
-            ContextSnapshot context(self->_context); // re-acquire a new snapshot
-            os_unfair_lock_lock(&self->_lock);
+            ContextSnapshot context(self); // re-acquire a new snapshot
+            std::lock_guard lock(self->_lock);
             if (!workItem.isComplete) {
                 [self _postProcessWorkItem:workItem context:context retry:(outcome == MTRAsyncWorkNeedsRetry)];
                 handled = YES;
             }
-            os_unfair_lock_unlock(&self->_lock);
         }
         return handled;
     }];
diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
index 914917a77adcde..ccefbb18497414 100644
--- a/src/darwin/Framework/CHIP/MTRBaseDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
@@ -365,7 +365,7 @@ - (void)subscribeWithQueue:(dispatch_queue_t)queue
 
     [self.deviceController getSessionForNode:self.nodeID
                                   completion:^(ExchangeManager * _Nullable exchangeManager, const Optional<SessionHandle> & session,
-                                      NSError * _Nullable error) {
+                                      NSError * _Nullable error, NSNumber * _Nullable retryDelay) {
                                       if (error != nil) {
                                           dispatch_async(queue, ^{
                                               errorHandler(error);
@@ -1603,7 +1603,7 @@ - (void)subscribeToAttributePaths:(NSArray<MTRAttributeRequestPath *> * _Nullabl
     [self.deviceController
         getSessionForNode:self.nodeID
                completion:^(ExchangeManager * _Nullable exchangeManager, const Optional<SessionHandle> & session,
-                   NSError * _Nullable error) {
+                   NSError * _Nullable error, NSNumber * _Nullable retryDelay) {
                    if (error != nil) {
                        dispatch_async(queue, ^{
                            reportHandler(nil, error);
@@ -2597,6 +2597,7 @@ - (nullable instancetype)initWithCoder:(NSCoder *)decoder
 
 - (void)encodeWithCoder:(NSCoder *)coder
 {
+    [super encodeWithCoder:coder];
     [coder encodeObject:_attribute forKey:sAttributeKey];
 }
 
@@ -2663,6 +2664,35 @@ - (ConcreteEventPath)_asConcretePath
     return ConcreteEventPath([self.endpoint unsignedShortValue], static_cast<ClusterId>([self.cluster unsignedLongValue]),
         static_cast<EventId>([self.event unsignedLongValue]));
 }
+
+static NSString * const sEventKey = @"eventKey";
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    self = [super initWithCoder:decoder];
+    if (self == nil) {
+        return nil;
+    }
+
+    _event = [decoder decodeObjectOfClass:[NSNumber class] forKey:sEventKey];
+    if (_event && ![_event isKindOfClass:[NSNumber class]]) {
+        MTR_LOG_ERROR("MTREventPath decoded %@ for event, not NSNumber.", _event);
+        return nil;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [super encodeWithCoder:coder];
+    [coder encodeObject:_event forKey:sEventKey];
+}
 @end
 
 @implementation MTREventPath (Deprecated)
@@ -2718,6 +2748,35 @@ - (id)copyWithZone:(NSZone *)zone
 {
     return [MTRCommandPath commandPathWithEndpointID:self.endpoint clusterID:self.cluster commandID:_command];
 }
+
+static NSString * const sCommandKey = @"commandKey";
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    self = [super initWithCoder:decoder];
+    if (self == nil) {
+        return nil;
+    }
+
+    _command = [decoder decodeObjectOfClass:[NSNumber class] forKey:sCommandKey];
+    if (_command && ![_command isKindOfClass:[NSNumber class]]) {
+        MTR_LOG_ERROR("MTRCommandPath decoded %@ for command, not NSNumber.", _command);
+        return nil;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [super encodeWithCoder:coder];
+    [coder encodeObject:_command forKey:sCommandKey];
+}
 @end
 
 @implementation MTRCommandPath (Deprecated)
diff --git a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h
index d113b5dedc86a1..6631e2d132bb54 100644
--- a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h
+++ b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h
@@ -83,7 +83,7 @@ class MTRCallbackBridgeBase {
 
         [device.deviceController getSessionForCommissioneeDevice:device.nodeID
                                                       completion:^(chip::Messaging::ExchangeManager * exchangeManager,
-                                                          const chip::Optional<chip::SessionHandle> & session, NSError * error) {
+                                                          const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error, NSNumber * _Nullable retryDelay) {
                                                           MaybeDoAction(exchangeManager, session, error);
                                                       }];
     }
@@ -93,8 +93,8 @@ class MTRCallbackBridgeBase {
         LogRequestStart();
 
         [controller getSessionForNode:nodeID
-                           completion:^(chip::Messaging::ExchangeManager * exchangeManager,
-                               const chip::Optional<chip::SessionHandle> & session, NSError * error) {
+                           completion:^(chip::Messaging::ExchangeManager * _Nullable exchangeManager,
+                               const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error, NSNumber * _Nullable retryDelay) {
                                MaybeDoAction(exchangeManager, session, error);
                            }];
     }
diff --git a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
index a0ccfd380a232d..bf975b672decd5 100644
--- a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
+++ b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
@@ -53,7 +53,7 @@ @interface MTRCommissionableBrowserResult ()
 @implementation MTRCommissionableBrowserResult
 @end
 
-class CommissionableBrowserInternal : public CommissioningResolveDelegate,
+class CommissionableBrowserInternal : public DiscoverNodeDelegate,
                                       public DnssdBrowseDelegate
 #if CONFIG_NETWORK_LAYER_BLE
     ,
@@ -156,12 +156,12 @@ void ClearDnssdDiscoveredDevices()
         mDiscoveredResults = discoveredResultsCopy;
     }
 
-    /////////// CommissioningResolveDelegate Interface /////////
+    /////////// DiscoverNodeDelegate Interface /////////
     void OnNodeDiscovered(const DiscoveredNodeData & nodeData) override
     {
         assertChipStackLockedByCurrentThread();
 
-        auto & commissionData = nodeData.commissionData;
+        auto & commissionData = nodeData.nodeData;
         auto key = [NSString stringWithUTF8String:commissionData.instanceName];
         if ([mDiscoveredResults objectForKey:key] == nil) {
             // It should not happens.
diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
index fb8fed4f678ab8..ce4e80de8b1a6b 100644
--- a/src/darwin/Framework/CHIP/MTRDefines.h
+++ b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -102,10 +102,6 @@
 #define MTR_UNSTABLE_API _MTR_UNAVAILABLE
 #endif
 
-#ifndef MTR_PER_CONTROLLER_STORAGE_ENABLED
-#define MTR_PER_CONTROLLER_STORAGE_ENABLED 1
-#endif
-
 #pragma mark - Types
 
 typedef NSData * MTRTLVBytes;
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index d42c2e0a70e868..ee72c4cc815ad1 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -785,7 +785,7 @@ - (void)_handleResubscriptionNeeded
     [self _changeState:MTRDeviceStateUnknown];
 }
 
-- (void)_handleSubscriptionReset
+- (void)_handleSubscriptionReset:(NSNumber * _Nullable)retryDelay
 {
     std::lock_guard lock(_lock);
     // if there is no delegate then also do not retry
@@ -804,17 +804,29 @@ - (void)_handleSubscriptionReset
 
     self.reattemptingSubscription = YES;
 
+    NSTimeInterval secondsToWait;
     if (_lastSubscriptionAttemptWait < MTRDEVICE_SUBSCRIPTION_ATTEMPT_MIN_WAIT_SECONDS) {
         _lastSubscriptionAttemptWait = MTRDEVICE_SUBSCRIPTION_ATTEMPT_MIN_WAIT_SECONDS;
+        secondsToWait = _lastSubscriptionAttemptWait;
+    } else if (retryDelay != nil) {
+        // The device responded but is currently busy. Reset our backoff
+        // counter, so that we don't end up waiting for a long time if the next
+        // attempt fails for some reason, and retry after whatever time period
+        // the device told us to use.
+        _lastSubscriptionAttemptWait = 0;
+        secondsToWait = retryDelay.doubleValue;
+        MTR_LOG_INFO("%@ resetting resubscribe attempt counter, and delaying by the server-provided delay: %f",
+            self, secondsToWait);
     } else {
         _lastSubscriptionAttemptWait *= 2;
         if (_lastSubscriptionAttemptWait > MTRDEVICE_SUBSCRIPTION_ATTEMPT_MAX_WAIT_SECONDS) {
             _lastSubscriptionAttemptWait = MTRDEVICE_SUBSCRIPTION_ATTEMPT_MAX_WAIT_SECONDS;
         }
+        secondsToWait = _lastSubscriptionAttemptWait;
     }
 
-    MTR_LOG_DEFAULT("%@ scheduling to reattempt subscription in %u seconds", self, _lastSubscriptionAttemptWait);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (_lastSubscriptionAttemptWait * NSEC_PER_SEC)), self.queue, ^{
+    MTR_LOG_DEFAULT("%@ scheduling to reattempt subscription in %f seconds", self, secondsToWait);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) (secondsToWait * NSEC_PER_SEC)), self.queue, ^{
         os_unfair_lock_lock(&self->_lock);
         [self _reattemptSubscriptionNowIfNeeded];
         os_unfair_lock_unlock(&self->_lock);
@@ -1147,12 +1159,13 @@ - (void)_setupSubscription
     [_deviceController
         getSessionForNode:_nodeID.unsignedLongLongValue
                completion:^(chip::Messaging::ExchangeManager * _Nullable exchangeManager,
-                   const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error) {
+                   const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error,
+                   NSNumber * _Nullable retryDelay) {
                    if (error != nil) {
                        MTR_LOG_ERROR("%@ getSessionForNode error %@", self, error);
                        dispatch_async(self.queue, ^{
                            [self _handleSubscriptionError:error];
-                           [self _handleSubscriptionReset];
+                           [self _handleSubscriptionReset:retryDelay];
                        });
                        return;
                    }
@@ -1207,7 +1220,7 @@ - (void)_setupSubscription
 
                            dispatch_async(self.queue, ^{
                                // OnDone
-                               [self _handleSubscriptionReset];
+                               [self _handleSubscriptionReset:nil];
                            });
                            os_unfair_lock_unlock(&self->_lock);
                        },
@@ -1314,7 +1327,7 @@ - (void)_setupSubscription
                        MTR_LOG_ERROR("%@ SendAutoResubscribeRequest error %@", self, error);
                        dispatch_async(self.queue, ^{
                            [self _handleSubscriptionError:error];
-                           [self _handleSubscriptionReset];
+                           [self _handleSubscriptionReset:nil];
                        });
 
                        return;
@@ -1523,14 +1536,14 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
             while (readRequestsNext.count) {
                 // Can only read up to 9 paths at a time, per spec
                 if (readRequestsCurrent.count >= 9) {
-                    MTR_LOG_INFO("Batching read attribute work item [%llu]: cannot add more work, item is full [%@:%@:%@:%@]", workItemID, nodeID, endpointID, clusterID, attributeID);
+                    MTR_LOG_INFO("Batching read attribute work item [%llu]: cannot add more work, item is full [0x%016llX:%@:0x%llx:0x%llx]", workItemID, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                     return outcome;
                 }
 
                 // if params don't match then they cannot be merged
                 if (![readRequestsNext[0][MTRDeviceReadRequestFieldParamsIndex]
                         isEqual:readRequestsCurrent[0][MTRDeviceReadRequestFieldParamsIndex]]) {
-                    MTR_LOG_INFO("Batching read attribute work item [%llu]: cannot add more work, parameter mismatch [%@:%@:%@:%@]", workItemID, nodeID, endpointID, clusterID, attributeID);
+                    MTR_LOG_INFO("Batching read attribute work item [%llu]: cannot add more work, parameter mismatch [0x%016llX:%@:0x%llx:0x%llx]", workItemID, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                     return outcome;
                 }
 
@@ -1538,8 +1551,8 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
                 auto readItem = readRequestsNext.firstObject;
                 [readRequestsNext removeObjectAtIndex:0];
                 [readRequestsCurrent addObject:readItem];
-                MTR_LOG_INFO("Batching read attribute work item [%llu]: added %@ (now %tu requests total) [%@:%@:%@:%@]",
-                    workItemID, readItem, readRequestsCurrent.count, nodeID, endpointID, clusterID, attributeID);
+                MTR_LOG_INFO("Batching read attribute work item [%llu]: added %@ (now %tu requests total) [0x%016llX:%@:0x%llx:0x%llx]",
+                    workItemID, readItem, readRequestsCurrent.count, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                 outcome = MTRBatchedPartially;
             }
             NSCAssert(readRequestsNext.count == 0, @"should have batched everything or returned early");
@@ -1549,7 +1562,7 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
             mtr_hide(self); // don't capture self accidentally
             for (NSArray * readItem in readRequests) {
                 if ([readItem isEqual:opaqueItemData]) {
-                    MTR_LOG_DEFAULT("Read attribute work item [%llu] report duplicate %@ [%@:%@:%@:%@]", workItemID, readItem, nodeID, endpointID, clusterID, attributeID);
+                    MTR_LOG_DEFAULT("Read attribute work item [%llu] report duplicate %@ [0x%016llX:%@:0x%llx:0x%llx]", workItemID, readItem, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                     *isDuplicate = YES;
                     *stop = YES;
                     return;
@@ -1586,23 +1599,23 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
                             if (values) {
                                 // Since the format is the same data-value dictionary, this looks like an
                                 // attribute report
-                                MTR_LOG_INFO("Read attribute work item [%llu] result: %@  [%@:%@:%@:%@]", workItemID, values, nodeID, endpointID, clusterID, attributeID);
+                                MTR_LOG_INFO("Read attribute work item [%llu] result: %@  [0x%016llX:%@:0x%llX:0x%llX]", workItemID, values, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                                 [self _handleAttributeReport:values];
                             }
 
                             // TODO: better retry logic
                             if (error && (retryCount < 2)) {
-                                MTR_LOG_ERROR("Read attribute work item [%llu] failed (will retry): %@   [%@:%@:%@:%@]", workItemID, error, nodeID, endpointID, clusterID, attributeID);
+                                MTR_LOG_ERROR("Read attribute work item [%llu] failed (will retry): %@   [0x%016llX:%@:0x%llx:0x%llx]", workItemID, error, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                                 completion(MTRAsyncWorkNeedsRetry);
                             } else {
                                 if (error) {
-                                    MTR_LOG_DEFAULT("Read attribute work item [%llu] failed (giving up): %@   [%@:%@:%@:%@]", workItemID, error, nodeID, endpointID, clusterID, attributeID);
+                                    MTR_LOG_DEFAULT("Read attribute work item [%llu] failed (giving up): %@   [0x%016llX:%@:0x%llx:0x%llx]", workItemID, error, nodeID.unsignedLongLongValue, endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue);
                                 }
                                 completion(MTRAsyncWorkComplete);
                             }
                         }];
         }];
-        [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"read %@ %@ %@ %@", self.nodeID, endpointID, clusterID, attributeID];
+        [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"read %@ 0x%llx 0x%llx", endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue];
     }
 
     return attributeValueToReturn;
@@ -1670,7 +1683,7 @@ - (void)writeAttributeWithEndpointID:(NSNumber *)endpointID
                                   completion(MTRAsyncWorkComplete);
                               }];
     }];
-    [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"write %@ %@ %@ %@", self.nodeID, endpointID, clusterID, attributeID];
+    [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"write %@ 0x%llx 0x%llx", endpointID, clusterID.unsignedLongLongValue, attributeID.unsignedLongLongValue];
 }
 
 - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID
@@ -1820,7 +1833,7 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
                                   workDone(values, error);
                               }];
     }];
-    [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"invoke %@ %@ %@", endpointID, clusterID, commandID];
+    [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"invoke %@ 0x%llx 0x%llx", endpointID, clusterID.unsignedLongLongValue, commandID.unsignedLongLongValue];
 }
 
 - (void)_invokeKnownCommandWithEndpointID:(NSNumber *)endpointID
@@ -2022,7 +2035,7 @@ - (BOOL)_attributeDataValue:(NSDictionary *)one isEqualToDataValue:(NSDictionary
         return YES;
     }
     if (!one || !theOther) {
-        MTR_LOG_ERROR("%@ attribute data-value comparison does not expect a dictionary to be nil: %@ %@", self, one, theOther);
+        // Comparing against nil is expected, and should return NO quietly
         return NO;
     }
 
@@ -2158,13 +2171,9 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
             // if expected values exists, purge and update read cache
             NSArray * expectedValue = _expectedValueCache[attributePath];
             if (expectedValue) {
-                if (![self _attributeDataValue:attributeDataValue
-                            isEqualToDataValue:expectedValue[MTRDeviceExpectedValueFieldValueIndex]]) {
-                    shouldReportAttribute = YES;
-                    previousValue = expectedValue[MTRDeviceExpectedValueFieldValueIndex];
-                }
-                _expectedValueCache[attributePath] = nil;
+                previousValue = expectedValue[MTRDeviceExpectedValueFieldValueIndex];
                 _readCache[attributePath] = attributeDataValue;
+                shouldReportAttribute = NO;
             } else if (readCacheValueChanged) {
                 // otherwise compare and update read cache
                 previousValue = _readCache[attributePath];
diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
index 01d248102b692d..e4d2dda652d0d0 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
@@ -19,6 +19,7 @@
 
 #import <Foundation/Foundation.h>
 
+#include <app/OperationalSessionSetup.h>
 #include <controller/CHIPDeviceController.h>
 #include <lib/core/ReferenceCounted.h>
 #include <messaging/ExchangeMgr.h>
@@ -27,9 +28,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 // Either exchangeManager will be non-nil and session will have a value, or
-// error will be non-nil.
+// error will be non-nil.  If error is non-nil, retryDelay might be non-nil.  In
+// that case it will contain an NSTimeInterval indicating how long consumers
+// should delay before trying again (e.g. based on the information communicated
+// in a BUSY response).
 typedef void (^MTRInternalDeviceConnectionCallback)(chip::Messaging::ExchangeManager * _Nullable exchangeManager,
-    const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error);
+    const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error, NSNumber * _Nullable retryDelay);
 
 /**
  * Helper to establish or look up a CASE session and hand its session
@@ -62,11 +66,11 @@ class MTRDeviceConnectionBridge : public chip::ReferenceCounted<MTRDeviceConnect
 private:
     MTRInternalDeviceConnectionCallback mCompletionHandler;
     chip::Callback::Callback<chip::OnDeviceConnected> mOnConnected;
-    chip::Callback::Callback<chip::OnDeviceConnectionFailure> mOnConnectFailed;
+    chip::Callback::Callback<chip::OperationalSessionSetup::OnSetupFailure> mOnConnectFailed;
 
     static void OnConnected(
         void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle);
-    static void OnConnectionFailure(void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error);
+    static void OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnnectionFailureInfo & failureInfo);
 };
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
index 490fe3e7bb4443..3fa1c45028adcd 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
@@ -23,13 +23,17 @@
     void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle)
 {
     auto * object = static_cast<MTRDeviceConnectionBridge *>(context);
-    object->mCompletionHandler(&exchangeMgr, chip::MakeOptional<chip::SessionHandle>(*sessionHandle->AsSecureSession()), nil);
+    object->mCompletionHandler(&exchangeMgr, chip::MakeOptional<chip::SessionHandle>(*sessionHandle->AsSecureSession()), nil, nil);
     object->Release();
 }
 
-void MTRDeviceConnectionBridge::OnConnectionFailure(void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error)
+void MTRDeviceConnectionBridge::OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnnectionFailureInfo & failureInfo)
 {
+    NSNumber * retryDelay;
+    if (failureInfo.requestedBusyDelay.HasValue()) {
+        retryDelay = @(static_cast<double>(failureInfo.requestedBusyDelay.Value().count()) / MSEC_PER_SEC);
+    }
     auto * object = static_cast<MTRDeviceConnectionBridge *>(context);
-    object->mCompletionHandler(nil, chip::NullOptional, [MTRError errorForCHIPErrorCode:error]);
+    object->mCompletionHandler(nil, chip::NullOptional, [MTRError errorForCHIPErrorCode:failureInfo.error], retryDelay);
     object->Release();
 }
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.h b/src/darwin/Framework/CHIP/MTRDeviceController.h
index ea2f6497a45edb..2662d4b54e0f6d 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.h
@@ -24,9 +24,7 @@
 @class MTRBaseDevice;
 @class MTRServerEndpoint; // Defined in MTRServerEndpoint.h, which imports MTRAccessGrant.h, which imports MTRBaseClusters.h, which imports this file, so we can't import it.
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 @class MTRDeviceControllerAbstractParameters;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -49,7 +47,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 /**
  * Initialize a device controller with the provided parameters.  This will:
  *
@@ -62,19 +59,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters
                                       error:(NSError * __autoreleasing *)error MTR_NEWLY_AVAILABLE;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 /**
  * If true, the controller has not been shut down yet.
  */
 @property (readonly, nonatomic, getter=isRunning) BOOL running;
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 /**
  * The ID assigned to this controller at creation time.
  */
 @property (readonly, nonatomic) NSUUID * uniqueIdentifier MTR_NEWLY_AVAILABLE;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 /**
  * Return the Node ID assigned to the controller.  Will return nil if the
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index 3d11b53418bc3f..ab2bba520b2675 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -15,12 +15,7 @@
  *    limitations under the License.
  */
 #import <Matter/MTRDefines.h>
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #import "MTRDeviceController_Internal.h"
 
@@ -78,6 +73,7 @@
 
 #include <atomic>
 #include <dns_sd.h>
+#include <string>
 
 #import <os/lock.h>
 
@@ -138,25 +134,15 @@ - (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParamete
 {
     if (![parameters isKindOfClass:MTRDeviceControllerParameters.class]) {
         MTR_LOG_ERROR("Unsupported type of MTRDeviceControllerAbstractParameters: %@", parameters);
-
         if (error) {
             *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_ARGUMENT];
         }
         return nil;
     }
+    auto * controllerParameters = static_cast<MTRDeviceControllerParameters *>(parameters);
 
-    __auto_type * factory = [MTRDeviceControllerFactory sharedInstance];
-    if (!factory.isRunning) {
-        auto * params = [[MTRDeviceControllerFactoryParams alloc] initWithoutStorage];
-
-        if (![factory startControllerFactory:params error:error]) {
-            return nil;
-        }
-    }
-
-    auto * parametersForFactory = static_cast<MTRDeviceControllerParameters *>(parameters);
-
-    return [factory initializeController:self withParameters:parametersForFactory error:error];
+    // MTRDeviceControllerFactory will auto-start in per-controller-storage mode if necessary
+    return [MTRDeviceControllerFactory.sharedInstance initializeController:self withParameters:controllerParameters error:error];
 }
 
 - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
@@ -178,11 +164,9 @@ - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
             }
 
             id<MTRDeviceControllerStorageDelegate> storageDelegateToUse = storageDelegate;
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
             if (MTRDeviceControllerLocalTestStorage.localTestStorageEnabled) {
                 storageDelegateToUse = [[MTRDeviceControllerLocalTestStorage alloc] initWithPassThroughStorage:storageDelegate];
             }
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
             _controllerDataStore = [[MTRDeviceControllerDataStore alloc] initWithController:self
                                                                             storageDelegate:storageDelegateToUse
                                                                        storageDelegateQueue:storageDelegateQueue];
@@ -190,7 +174,6 @@ - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
                 return nil;
             }
         } else {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
             if (MTRDeviceControllerLocalTestStorage.localTestStorageEnabled) {
                 dispatch_queue_t localTestStorageQueue = dispatch_queue_create("org.csa-iot.matter.framework.devicecontroller.localteststorage", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
                 MTRDeviceControllerLocalTestStorage * localTestStorage = [[MTRDeviceControllerLocalTestStorage alloc] initWithPassThroughStorage:nil];
@@ -201,7 +184,6 @@ - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
                     return nil;
                 }
             }
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
         }
 
         // Ensure the otaProviderDelegate, if any, is valid.
@@ -508,11 +490,15 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams
         }
         commissionerParams.controllerVendorId = static_cast<chip::VendorId>([startupParams.vendorID unsignedShortValue]);
         commissionerParams.enableServerInteractions = startupParams.advertiseOperational;
-        // We don't want to remove things from the fabric table on controller
-        // shutdown, since our controller setup depends on being able to fetch
-        // fabric information for the relevant fabric indices on controller
-        // bring-up.
+
+        // We never want plain "removal" from the fabric table since this leaves
+        // the in-memory state out of sync with what's in storage. In per-controller
+        // storage mode, have the controller delete itself from the fabric table on shutdown.
+        // In factory storage mode we need to keep fabric information around so we can
+        // start another controller on that existing fabric at a later time.
         commissionerParams.removeFromFabricTableOnShutdown = false;
+        commissionerParams.deleteFromFabricTableOnShutdown = (startupParams.storageDelegate != nil);
+
         commissionerParams.permitMultiControllerFabrics = startupParams.allowMultipleControllersPerFabric;
 
         // Set up our attestation verifier.  Assume we want to use the default
@@ -1252,7 +1238,7 @@ - (void)getSessionForNode:(chip::NodeId)nodeID completion:(MTRInternalDeviceConn
             connectionBridge->connect(commissioner, nodeID);
         }
         errorHandler:^(NSError * error) {
-            completion(nullptr, chip::NullOptional, error);
+            completion(nullptr, chip::NullOptional, error, nil);
         }];
 }
 
@@ -1263,20 +1249,20 @@ - (void)getSessionForCommissioneeDevice:(chip::NodeId)deviceID completion:(MTRIn
             chip::CommissioneeDeviceProxy * deviceProxy;
             CHIP_ERROR err = commissioner->GetDeviceBeingCommissioned(deviceID, &deviceProxy);
             if (err != CHIP_NO_ERROR) {
-                completion(nullptr, chip::NullOptional, [MTRError errorForCHIPErrorCode:err]);
+                completion(nullptr, chip::NullOptional, [MTRError errorForCHIPErrorCode:err], nil);
                 return;
             }
 
             chip::Optional<chip::SessionHandle> session = deviceProxy->GetSecureSession();
             if (!session.HasValue() || !session.Value()->AsSecureSession()->IsPASESession()) {
-                completion(nullptr, chip::NullOptional, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
+                completion(nullptr, chip::NullOptional, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
                 return;
             }
 
-            completion(deviceProxy->GetExchangeManager(), session, nil);
+            completion(deviceProxy->GetExchangeManager(), session, nil, nil);
         }
         errorHandler:^(NSError * error) {
-            completion(nullptr, chip::NullOptional, error);
+            completion(nullptr, chip::NullOptional, error, nil);
         }];
 }
 
@@ -1656,7 +1642,7 @@ - (BOOL)getBaseDevice:(uint64_t)deviceID queue:(dispatch_queue_t)queue completio
     // that we are running.
     [self getSessionForNode:deviceID
                  completion:^(chip::Messaging::ExchangeManager * _Nullable exchangeManager,
-                     const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error) {
+                     const chip::Optional<chip::SessionHandle> & session, NSError * _Nullable error, NSNumber * _Nullable retryDelay) {
                      // Create an MTRBaseDevice for the node id involved, now that our
                      // CASE session is primed.  We don't actually care about the session
                      // information here.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.h b/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.h
index e337d13a755bb4..bc3b8f37f90fbb 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.h
@@ -17,12 +17,8 @@
 #import <Foundation/Foundation.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
-#import <Matter/MTRDevice_Internal.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
+#import <Matter/MTRDevice_Internal.h>
 
 #include <lib/core/CHIPError.h>
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
index 53500caed103b8..016f1c1d630d72 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
@@ -19,13 +19,8 @@
 
 #import <Matter/MTRDefines.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #import <Matter/MTRClusterConstants.h>
+#import <Matter/MTRDeviceControllerParameters.h>
 #import <Matter/MTRServerCluster.h>
 
 #import "MTRCertificates.h"
@@ -54,7 +49,6 @@
 #import <os/lock.h>
 
 #include <app/server/Dnssd.h>
-#include <app/util/af.h>
 #include <controller/CHIPDeviceControllerFactory.h>
 #include <credentials/CHIPCert.h>
 #include <credentials/FabricTable.h>
@@ -216,6 +210,10 @@ - (instancetype)init
         return nil;
     }
 
+    // Start the work queue and leave it running. There is no performance
+    // cost to having an idle dispatch queue, and it simplifies our logic.
+    DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
+
     _running = NO;
     _chipWorkQueue = DeviceLayer::PlatformMgrImpl().GetWorkQueue();
     _controllerFactory = &DeviceControllerFactory::GetInstance();
@@ -327,6 +325,7 @@ - (void)cleanupInitObjects
 
 - (void)cleanupStartupObjects
 {
+    assertChipStackLockedByCurrentThread();
     MTR_LOG_INFO("Cleaning startup objects in controller factory");
 
     // Make sure the deinit order here is the reverse of the init order in
@@ -380,7 +379,7 @@ - (CHIP_ERROR)_initFabricTable:(FabricTable &)fabricTable
 
     __block NSMutableArray<MTRFabricInfo *> * fabricList;
     __block BOOL listFilled = NO;
-    auto fillListBlock = ^{
+    dispatch_sync(_chipWorkQueue, ^{
         FabricTable fabricTable;
         CHIP_ERROR err = [self _initFabricTable:fabricTable];
         if (err != CHIP_NO_ERROR) {
@@ -400,25 +399,23 @@ - (CHIP_ERROR)_initFabricTable:(FabricTable &)fabricTable
         }
 
         listFilled = YES;
-    };
-
-    if ([_controllers count] > 0) {
-        // We have a controller running already, so our task queue is live.
-        // Make sure we run on that queue so we don't race against it.
-        dispatch_sync(_chipWorkQueue, fillListBlock);
-    } else {
-        // Not currently running the task queue; just run the block directly.
-        fillListBlock();
-    }
+    });
 
     if (listFilled == NO) {
         return nil;
     }
 
-    return [NSArray arrayWithArray:fabricList];
+    return fabricList;
 }
 
-- (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams error:(NSError * __autoreleasing *)error;
+- (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams error:(NSError * __autoreleasing *)error
+{
+    return [self _startControllerFactory:startupParams startingController:NO error:error];
+}
+
+- (BOOL)_startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
+             startingController:(BOOL)startingController
+                          error:(NSError * __autoreleasing *)error
 {
     [self _assertCurrentQueueIsNotMatterQueue];
 
@@ -427,18 +424,13 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
         return YES;
     }
 
-    // Register any tracing backends. This has to be done before starting the event loop to run registering
-    // the tracing backend in the right queue context
-    StartupMetricsCollection();
-
-    DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
-
     __block CHIP_ERROR errorCode = CHIP_NO_ERROR;
     dispatch_sync(_chipWorkQueue, ^{
         if ([self isRunning]) {
             return;
         }
 
+        StartupMetricsCollection();
         InitializeServerAccessControl();
 
         if (startupParams.hasStorage) {
@@ -536,6 +528,7 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
         // state is brought up live on factory init, and not when it comes time
         // to actually start a controller, and does not actually clean itself up
         // until its refcount (which starts as 0) goes to 0.
+        // TODO: Don't cause a stack shutdown and restart if startingController
         _controllerFactory->RetainSystemState();
         _controllerFactory->ReleaseSystemState();
 
@@ -543,17 +536,17 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
         self->_running = YES;
     });
 
-    // Make sure to stop the event loop again before returning, so we are not running it while we don't have any controllers.
-    DeviceLayer::PlatformMgrImpl().StopEventLoopTask();
-
     if (![self isRunning]) {
-        [self cleanupStartupObjects];
+        dispatch_sync(_chipWorkQueue, ^{
+            [self cleanupStartupObjects];
+        });
         if (error != nil) {
             *error = [MTRError errorForCHIPErrorCode:errorCode];
         }
+        return NO;
     }
 
-    return [self isRunning];
+    return YES;
 }
 
 - (void)stopControllerFactory
@@ -568,10 +561,12 @@ - (void)stopControllerFactory
         [_controllers[0] shutdown];
     }
 
-    MTR_LOG_INFO("Shutting down the Matter controller factory");
-    _controllerFactory->Shutdown();
+    dispatch_sync(_chipWorkQueue, ^{
+        MTR_LOG_INFO("Shutting down the Matter controller factory");
+        _controllerFactory->Shutdown();
 
-    [self cleanupStartupObjects];
+        [self cleanupStartupObjects];
+    });
 
     // NOTE: we do not call cleanupInitObjects because we can be restarted, and
     // that does not re-create the objects that we create inside init.
@@ -598,11 +593,6 @@ - (MTRDeviceController * _Nullable)_startDeviceController:(MTRDeviceController *
 {
     [self _assertCurrentQueueIsNotMatterQueue];
 
-    if (![self checkIsRunning:error]) {
-        MTR_LOG_ERROR("Trying to start controller while Matter controller factory is not running");
-        return nil;
-    }
-
     id<MTRDeviceControllerStorageDelegate> _Nullable storageDelegate;
     dispatch_queue_t _Nullable storageDelegateQueue;
     NSUUID * uniqueIdentifier;
@@ -624,9 +614,28 @@ - (MTRDeviceController * _Nullable)_startDeviceController:(MTRDeviceController *
         otaProviderDelegateQueue = nil;
     } else {
         MTR_LOG_ERROR("Unknown kind of startup params: %@", startupParams);
+        if (error != nil) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_ARGUMENT];
+        }
         return nil;
     }
 
+    if (![self isRunning]) {
+        if (storageDelegate != nil) {
+            MTR_LOG_DEFAULT("Auto-starting Matter controller factory in per-controller storage mode");
+            auto * params = [[MTRDeviceControllerFactoryParams alloc] initWithoutStorage];
+            if (![self _startControllerFactory:params startingController:YES error:error]) {
+                return nil;
+            }
+        } else {
+            MTR_LOG_ERROR("Trying to start controller while Matter controller factory is not running");
+            if (error != nil) {
+                *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+            }
+            return nil;
+        }
+    }
+
     if (_usingPerControllerStorage && storageDelegate == nil) {
         MTR_LOG_ERROR("Must have a controller storage delegate when we do not have storage for the controller factory");
         if (error != nil) {
@@ -665,9 +674,6 @@ - (MTRDeviceController * _Nullable)_startDeviceController:(MTRDeviceController *
     }
 
     if ([_controllers count] == 0) {
-        // Bringing up the first controller.  Start the event loop now.  If we
-        // fail to bring it up, its cleanup will stop the event loop again.
-        chip::DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
         dispatch_sync(_chipWorkQueue, ^{
             self->_operationalBrowser = new MTROperationalBrowser(self, self->_chipWorkQueue);
         });
@@ -680,8 +686,9 @@ - (MTRDeviceController * _Nullable)_startDeviceController:(MTRDeviceController *
     os_unfair_lock_unlock(&_controllersLock);
 
     __block MTRDeviceControllerStartupParamsInternal * params = nil;
-    __block CHIP_ERROR fabricError = CHIP_NO_ERROR;
+    __block CHIP_ERROR fabricError = CHIP_ERROR_INTERNAL;
 
+    // Create a temporary FabricTable instance for the fabricChecker logic.
     // We want the block to end up with just a pointer to the fabric table,
     // since we know our on-stack instance will outlive the block.
     FabricTable fabricTableInstance;
@@ -1018,18 +1025,6 @@ - (void)controllerShuttingDown:(MTRDeviceController *)controller
         return;
     }
 
-    if (_groupDataProvider != nullptr) {
-        dispatch_sync(_chipWorkQueue, ^{
-            FabricIndex idx = [controller fabricIndex];
-            if (idx != kUndefinedFabricIndex) {
-                // Clear out out group keys for this fabric index, just in case fabric
-                // indices get reused later.  If a new controller is started on the
-                // same fabric it will be handed the IPK at that point.
-                self->_groupDataProvider->RemoveGroupKeys(idx);
-            }
-        });
-    }
-
     os_unfair_lock_lock(&_controllersLock);
     // Make sure to set _controllerBeingShutDown and do the remove in the same
     // locked section, so there is never a time when the controller is gone from
@@ -1039,88 +1034,46 @@ - (void)controllerShuttingDown:(MTRDeviceController *)controller
     [_controllers removeObject:controller];
     os_unfair_lock_unlock(&_controllersLock);
 
-    // Snapshot the controller's fabric index, if any, before it clears it
-    // out in shutDownCppController.
-    __block FabricIndex controllerFabricIndex = controller.fabricIndex;
-
-    // This block runs either during sync dispatch to the Matter queue or after
-    // Matter queue shutdown, so it can touch any of our members without
-    // worrying about locking, since nothing else will race it.
-    auto sharedCleanupBlock = ^{
-        assertChipStackLockedByCurrentThread();
-
-        [controller shutDownCppController];
-
-        self->_controllerBeingShutDown = nil;
-        if (self->_controllerBeingStarted == controller) {
-            controllerFabricIndex = self->_nextAvailableFabricIndex;
-            self->_controllerBeingStarted = nil;
+    // Do the controller shutdown on the Matter work queue.
+    dispatch_sync(_chipWorkQueue, ^{
+        FabricIndex fabricIndex = controller.fabricIndex;
+        if (fabricIndex != kUndefinedFabricIndex) {
+            // Clear out out group keys for this fabric index, in case fabric
+            // indices get reused later.  If a new controller is started on the
+            // same fabric it will be handed the IPK at that point.
+            self->_groupDataProvider->RemoveGroupKeys(fabricIndex);
         }
-    };
 
-    if ([_controllers count] == 0) {
-        dispatch_sync(_chipWorkQueue, ^{
+        // If there are no other controllers left, we can shut down some things.
+        // Do this before we shut down the controller itself, because the
+        // OtaProviderDelegateBridge uses some services provided by the system
+        // state without retaining it.
+        if (_controllers.count == 0) {
             delete self->_operationalBrowser;
             self->_operationalBrowser = nullptr;
-        });
-        // That was our last controller.  Stop the event loop before it
-        // shuts down, because shutdown of the last controller will tear
-        // down most of the world.
-        DeviceLayer::PlatformMgrImpl().StopEventLoopTask();
-
-        if (_otaProviderDelegateBridge) {
-            _otaProviderDelegateBridge->Shutdown();
-            _otaProviderDelegateBridge.reset();
-        }
-
-        if (_otaProviderEndpoint != nil) {
-            [_otaProviderEndpoint unregisterMatterEndpoint];
-            [_otaProviderEndpoint invalidate];
 
-            [self removeServerEndpoint:_otaProviderEndpoint];
-
-            _otaProviderEndpoint = nil;
-        }
-
-        sharedCleanupBlock();
-
-        // Now that our per-controller storage for the controller being shut
-        // down is guaranteed to be disconnected, go ahead and clean up the
-        // fabric table entry for the controller if we're in per-controller
-        // storage mode.
-        if (self->_usingPerControllerStorage) {
-            // We have to use a new fabric table to do this cleanup, because
-            // our system state is gone now.
-            FabricTable fabricTable;
-            CHIP_ERROR err = [self _initFabricTable:fabricTable];
-            if (err != CHIP_NO_ERROR) {
-                MTR_LOG_ERROR("Failed to clean up fabric entries.  Expect things to act oddly: %" CHIP_ERROR_FORMAT, err.Format());
-            } else {
-                fabricTable.Delete(controllerFabricIndex);
-            }
-        }
-    } else {
-        // Do the controller shutdown on the Matter work queue.
-        dispatch_sync(_chipWorkQueue, ^{
             if (_otaProviderDelegateBridge) {
-                _otaProviderDelegateBridge->ControllerShuttingDown(controller);
+                _otaProviderDelegateBridge->Shutdown();
+                _otaProviderDelegateBridge.reset();
             }
 
-            sharedCleanupBlock();
-
-            // Now that our per-controller storage for the controller being shut
-            // down is guaranteed to be disconnected, go ahead and clean up the
-            // fabric table entry for the controller if we're in per-controller
-            // storage mode.
-            if (self->_usingPerControllerStorage) {
-                // Make sure to delete controllerFabricIndex from the system state's
-                // fabric table.  We know there's a system state here, because we
-                // still have a running controller.
-                auto * systemState = _controllerFactory->GetSystemState();
-                systemState->Fabrics()->Delete(controllerFabricIndex);
+            if (_otaProviderEndpoint != nil) {
+                [_otaProviderEndpoint unregisterMatterEndpoint];
+                [_otaProviderEndpoint invalidate];
+                [self removeServerEndpoint:_otaProviderEndpoint];
+                _otaProviderEndpoint = nil;
             }
-        });
-    }
+        } else if (_otaProviderDelegateBridge) {
+            _otaProviderDelegateBridge->ControllerShuttingDown(controller);
+        }
+
+        [controller shutDownCppController];
+
+        self->_controllerBeingShutDown = nil;
+        if (self->_controllerBeingStarted == controller) {
+            self->_controllerBeingStarted = nil;
+        }
+    });
 
     [controller deinitFromFactory];
 }
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
index 4e0290bc041860..0f157b8f89092f 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
@@ -24,15 +24,10 @@
 #import <Matter/MTRBaseDevice.h> // for MTRClusterPath
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
+#import <Matter/MTRDeviceControllerParameters.h>
 #import <Matter/MTRDiagnosticLogsType.h>
 #import <Matter/MTRServerEndpoint.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #import "MTRDeviceControllerFactory.h"
 
 #include <lib/core/CHIPPersistentStorageDelegate.h>
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
index 92670f1721c3e2..064a4f866c5cc0 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h
@@ -18,8 +18,6 @@
 #import <Foundation/Foundation.h>
 #import <Matter/Matter.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 NS_ASSUME_NONNULL_BEGIN
 
 MTR_EXTERN MTR_EXPORT @interface MTRDeviceControllerLocalTestStorage : NSObject<MTRDeviceControllerStorageDelegate>
@@ -33,5 +31,3 @@ MTR_EXTERN MTR_EXPORT @interface MTRDeviceControllerLocalTestStorage : NSObject<
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.mm
index a1ffca632c940a..f51dae7bbbcaff 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.mm
@@ -18,8 +18,6 @@
 #import "MTRDeviceControllerLocalTestStorage.h"
 #import "MTRLogging_Internal.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 static NSString * const kLocalTestUserDefaultDomain = @"org.csa-iot.matter.darwintest";
 static NSString * const kLocalTestUserDefaultEnabledKey = @"enableTestStorage";
 
@@ -161,5 +159,3 @@ - (BOOL)controller:(MTRDeviceController *)controller storeValues:(NSDictionary<N
     }
 }
 @end
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
index 73369cdf0d1361..9c07f3f82dfced 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
@@ -16,12 +16,6 @@
 
 #import <Matter/MTRDefines.h>
 
-#if defined(MTR_INTERNAL_INCLUDE) && defined(MTR_INCLUDED_FROM_UMBRELLA_HEADER)
-#error Internal includes should not happen from the umbrella header
-#endif
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
-
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
 #import <Matter/MTROTAProviderDelegate.h>
 
@@ -32,9 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  * interfaces inheriting from this one should be used to actually do the
  * initialization.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerAbstractParameters : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -44,9 +36,7 @@ MTR_NEWLY_AVAILABLE
  * Parameters that can be used to initialize an MTRDeviceController which
  * has a node identity.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerParameters : MTRDeviceControllerAbstractParameters
 
 /**
@@ -89,9 +79,7 @@ MTR_NEWLY_AVAILABLE
 
 @end
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerExternalCertificateParameters : MTRDeviceControllerParameters
 
 - (instancetype)init NS_UNAVAILABLE;
@@ -142,5 +130,3 @@ MTR_NEWLY_AVAILABLE
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters_Wrapper.h b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters_Wrapper.h
deleted file mode 100644
index 4f26e1a49c9d18..00000000000000
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters_Wrapper.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <Matter/MTRDefines.h>
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#error Should be including Matter/MTRDeviceControllerParameters.h
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
-#define MTR_INTERNAL_INCLUDE
-#import <Matter/MTRDeviceControllerParameters.h>
-#undef MTR_INTERNAL_INCLUDE
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
index 74a9681ca3e619..c48c48c4a424d2 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
@@ -23,11 +23,7 @@
 #import "MTRP256KeypairBridge.h"
 #import "NSDataSpanConversion.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #include <controller/OperationalCredentialsDelegate.h>
 #include <credentials/CHIPCert.h>
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
index 66ced06e8e1673..6b8c762633578a 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h
@@ -20,11 +20,7 @@
 #import <Foundation/Foundation.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/DataModelTypes.h>
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h
index 2c98efb2afd631..3e4e0575e56834 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h
@@ -18,12 +18,6 @@
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
 
-#if defined(MTR_INTERNAL_INCLUDE) && defined(MTR_INCLUDED_FROM_UMBRELLA_HEADER)
-#error Internal includes should not happen from the umbrella header
-#endif
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
-
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSUInteger, MTRStorageSecurityLevel) {
@@ -71,9 +65,7 @@ typedef NS_ENUM(NSUInteger, MTRStorageSharingType) {
  *    and are provided to describe the data should the storage delegate choose to
  *    implement separating storage location by security level and sharing type.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @protocol MTRDeviceControllerStorageDelegate <NSObject>
 @required
 /**
@@ -133,13 +125,8 @@ MTR_NEWLY_AVAILABLE
        sharingType:(MTRStorageSharingType)sharingType;
 @end
 
-// TODO: FIXME: Is this a sane place to put this API?
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_EXTERN MTR_NEWLY_AVAILABLE
-#endif
     NSSet<Class> *
     MTRDeviceControllerStorageClasses(void);
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate_Wrapper.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate_Wrapper.h
deleted file mode 100644
index 774fff9f48a179..00000000000000
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate_Wrapper.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <Matter/MTRDefines.h>
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#error Should be including Matter/MTRDeviceControllerStorageDelegate.h
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
-#define MTR_INTERNAL_INCLUDE
-#import <Matter/MTRDeviceControllerStorageDelegate.h>
-#undef MTR_INTERNAL_INCLUDE
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
index b55d41b8d8a59e..aa9c8c1e906ee3 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
@@ -35,12 +35,8 @@
 
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceControllerStartupParams.h>
-#import <Matter/MTRDiagnosticLogsType.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
+#import <Matter/MTRDiagnosticLogsType.h>
 #import <Matter/MTROTAProviderDelegate.h>
 
 @class MTRDeviceControllerStartupParamsInternal;
@@ -59,13 +55,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MTRDeviceController ()
 
-#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
-/**
- * The ID assigned to this controller at creation time.
- */
-@property (readonly, nonatomic) NSUUID * uniqueIdentifier;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #pragma mark - MTRDeviceControllerFactory methods
 
 /**
diff --git a/src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.mm b/src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.mm
index 3a0435de6dc99d..2f909fdc4b2e37 100644
--- a/src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.mm
+++ b/src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.mm
@@ -24,6 +24,8 @@
 #import <setup_payload/ManualSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>
 
+#include <string>
+
 @implementation MTRManualSetupPayloadParser {
     NSString * _decimalStringRepresentation;
     chip::ManualSetupPayloadParser * _chipManualSetupPayloadParser;
diff --git a/src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.mm b/src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.mm
index bbb8042bb65e6e..53b8e733367a4f 100644
--- a/src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.mm
+++ b/src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.mm
@@ -24,6 +24,8 @@
 #import <setup_payload/QRCodeSetupPayloadParser.h>
 #import <setup_payload/SetupPayload.h>
 
+#include <string>
+
 @implementation MTRQRCodeSetupPayloadParser {
     NSString * _base38Representation;
     chip::QRCodeSetupPayloadParser * _chipQRCodeSetupPayloadParser;
diff --git a/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm b/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm
index 56fe7bc7beb6f8..65e8eac55ed830 100644
--- a/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm
+++ b/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm
@@ -104,20 +104,19 @@
 {
     assertChipStackLockedByCurrentThread();
 
-    // NOTE: During controller startup, the Matter SDK thinks that the cert for
-    // a fabric index is changing and hence that it must remove session
-    // resumption data for that fabric index.  For us that does not matter,
-    // since we don't key that data on fabric index anyway.  But we do want to
-    // avoid doing this delete-on-startup so we can actually store session
-    // resumption data persistently.
+    // NOTE: During controller startup and shutdown, the SDK DeviceControllerFactory
+    // calls this method from ClearCASEResumptionStateOnFabricChange() due to fabric
+    // update or removal.  For us that does not matter, since we don't key resumption
+    // data on fabric index anyway.  But we do want to avoid executing the DeleteAll
+    // so we can actually store session resumption data persistently.
 
     // And that is the only use of DeleteAll for controllers in practice, in the
     // situations where we are using MTRSessionResumptionStorageBridge at all.
     // So just no-op this function, but verify that our assumptions hold.
     auto * controller = [mFactory runningControllerForFabricIndex:fabricIndex
                                       includeControllerStartingUp:NO
-                                    includeControllerShuttingDown:YES];
-    VerifyOrDieWithMsg(controller == nil, Controller, "Deleting resumption storage for controller outside startup");
+                                    includeControllerShuttingDown:NO];
+    VerifyOrDieWithMsg(controller == nil, Controller, "ResumptionStorage::DeleteAll called for running controller");
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/darwin/Framework/CHIP/MTRSetupPayload.mm b/src/darwin/Framework/CHIP/MTRSetupPayload.mm
index 42bd7babdf3bc8..309494e3a01922 100644
--- a/src/darwin/Framework/CHIP/MTRSetupPayload.mm
+++ b/src/darwin/Framework/CHIP/MTRSetupPayload.mm
@@ -24,6 +24,8 @@
 #import "setup_payload/QRCodeSetupPayloadGenerator.h"
 #import <setup_payload/SetupPayload.h>
 
+#include <string>
+
 @implementation MTROptionalQRCodeInfo
 @end
 
diff --git a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAttribute.mm b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAttribute.mm
index 638b6f5ea48e28..ba8eb555cc4214 100644
--- a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAttribute.mm
+++ b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAttribute.mm
@@ -173,12 +173,8 @@ - (BOOL)associateWithController:(nullable MTRDeviceController *)controller
 
     MTRDeviceController * existingController = _deviceController;
     if (existingController != nil) {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
         MTR_LOG_ERROR("Cannot associate MTRServerAttribute with controller %@; already associated with controller %@",
             controller.uniqueIdentifier, existingController.uniqueIdentifier);
-#else
-        MTR_LOG_ERROR("Cannot associate MTRServerAttribute with controller; already associated with a different controller");
-#endif
         return NO;
     }
 
diff --git a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerCluster.mm b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerCluster.mm
index 7439c0ff6a453a..dcd2f1eff9314e 100644
--- a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerCluster.mm
+++ b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerCluster.mm
@@ -35,7 +35,8 @@
 #include <lib/support/SafeInt.h>
 #include <protocols/interaction_model/StatusCode.h>
 
-// TODO: These attribute-*.h bits are a hack that should eventually go away.
+// TODO: These attribute-*.h and AttributeAccessInterfaceRegistry.h bits are a hack that should eventually go away.
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/util/attribute-metadata.h>
 #include <app/util/attribute-storage.h>
 
@@ -250,12 +251,8 @@ - (BOOL)associateWithController:(nullable MTRDeviceController *)controller
 
     MTRDeviceController * existingController = _deviceController;
     if (existingController != nil) {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
         MTR_LOG_ERROR("Cannot associate MTRServerCluster with controller %@; already associated with controller %@",
             controller.uniqueIdentifier, existingController.uniqueIdentifier);
-#else
-        MTR_LOG_ERROR("Cannot associate MTRServerCluster with controller; already associated with a different controller");
-#endif
         return NO;
     }
 
diff --git a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm
index 1d7b466d92d2d9..44da6a6cb6016a 100644
--- a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm
+++ b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm
@@ -187,12 +187,8 @@ - (BOOL)associateWithController:(nullable MTRDeviceController *)controller
 {
     MTRDeviceController * existingController = _deviceController;
     if (existingController != nil) {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
         MTR_LOG_ERROR("Cannot associate MTRServerEndpoint with controller %@; already associated with controller %@",
             controller.uniqueIdentifier, existingController.uniqueIdentifier);
-#else
-        MTR_LOG_ERROR("Cannot associate MTRServerEndpoint with controller; already associated with a different controller");
-#endif
         return NO;
     }
 
diff --git a/src/darwin/Framework/CHIPTests/MTRControllerAdvertisingTests.m b/src/darwin/Framework/CHIPTests/MTRControllerAdvertisingTests.m
index b7fa9a1cfa574f..4092a38b56f84e 100644
--- a/src/darwin/Framework/CHIPTests/MTRControllerAdvertisingTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRControllerAdvertisingTests.m
@@ -24,8 +24,6 @@
 #import "MTRTestKeys.h"
 #import "MTRTestPerControllerStorage.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 static const uint16_t kTestVendorId = 0xFFF1u;
 static const uint16_t kTimeoutInSeconds = 3;
 
@@ -275,5 +273,3 @@ - (void)test001_CheckAdvertisingAsExpected
 }
 
 @end
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
index 1d71c7b00ea4ce..777fb584d24419 100644
--- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -119,18 +119,14 @@ @interface MTRDeviceTests : XCTestCase
 
 @implementation MTRDeviceTests
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 static BOOL slocalTestStorageEnabledBeforeUnitTest;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 + (void)setUp
 {
     XCTestExpectation * pairingExpectation = [[XCTestExpectation alloc] initWithDescription:@"Pairing Complete"];
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
     slocalTestStorageEnabledBeforeUnitTest = MTRDeviceControllerLocalTestStorage.localTestStorageEnabled;
     MTRDeviceControllerLocalTestStorage.localTestStorageEnabled = YES;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
     __auto_type * factory = [MTRDeviceControllerFactory sharedInstance];
     XCTAssertNotNil(factory);
@@ -181,13 +177,11 @@ + (void)tearDown
 {
     ResetCommissionee(GetConnectedDevice(), dispatch_get_main_queue(), nil, kTimeoutInSeconds);
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
     // Restore testing setting to previous state, and remove all persisted attributes
     MTRDeviceControllerLocalTestStorage.localTestStorageEnabled = slocalTestStorageEnabledBeforeUnitTest;
     [sController.controllerDataStore clearAllStoredAttributes];
     NSArray * storedAttributesAfterClear = [sController.controllerDataStore getStoredAttributesForNodeID:@(kDeviceId)];
     XCTAssertEqual(storedAttributesAfterClear.count, 0);
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
     MTRDeviceController * controller = sController;
     XCTAssertNotNil(controller);
@@ -2839,7 +2833,6 @@ - (void)test030_DeviceAndClusterProperties
     XCTAssertEqualObjects(cluster.endpointID, @(0));
 }
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 - (void)test031_MTRDeviceAttributeCacheLocalTestStorage
 {
     dispatch_queue_t queue = dispatch_get_main_queue();
@@ -2912,7 +2905,50 @@ - (void)test031_MTRDeviceAttributeCacheLocalTestStorage
     NSUInteger storedAttributeCountDifferenceFromMTRDeviceReport = dataStoreValuesAfterSecondSubscription.count - attributesReportedWithSecondSubscription;
     XCTAssertTrue(storedAttributeCountDifferenceFromMTRDeviceReport > 300);
 }
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
+
+- (void)test032_MTRPathClassesEncoding
+{
+    NSError * encodeError;
+    NSData * encodedData;
+    NSError * decodeError;
+    id decodedValue;
+
+    // Test attribute path encode / decode
+    MTRAttributePath * originalAttributePath = [MTRAttributePath attributePathWithEndpointID:@(101) clusterID:@(102) attributeID:@(103)];
+    encodedData = [NSKeyedArchiver archivedDataWithRootObject:originalAttributePath requiringSecureCoding:YES error:&encodeError];
+    XCTAssertNil(encodeError);
+
+    decodedValue = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet setWithObject:[MTRAttributePath class]] fromData:encodedData error:&decodeError];
+    XCTAssertNil(decodeError);
+    XCTAssertTrue([decodedValue isKindOfClass:[MTRAttributePath class]]);
+
+    MTRAttributePath * decodedAttributePath = decodedValue;
+    XCTAssertEqualObjects(originalAttributePath, decodedAttributePath);
+
+    // Test event path encode / decode
+    MTREventPath * originalEventPath = [MTREventPath eventPathWithEndpointID:@(201) clusterID:@(202) eventID:@(203)];
+    encodedData = [NSKeyedArchiver archivedDataWithRootObject:originalEventPath requiringSecureCoding:YES error:&encodeError];
+    XCTAssertNil(encodeError);
+
+    decodedValue = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet setWithObject:[MTREventPath class]] fromData:encodedData error:&decodeError];
+    XCTAssertNil(decodeError);
+    XCTAssertTrue([decodedValue isKindOfClass:[MTREventPath class]]);
+
+    MTREventPath * decodedEventPath = decodedValue;
+    XCTAssertEqualObjects(originalEventPath, decodedEventPath);
+
+    // Test command path encode / decode
+    MTRCommandPath * originalCommandPath = [MTRCommandPath commandPathWithEndpointID:@(301) clusterID:@(302) commandID:@(303)];
+    encodedData = [NSKeyedArchiver archivedDataWithRootObject:originalCommandPath requiringSecureCoding:YES error:&encodeError];
+    XCTAssertNil(encodeError);
+
+    decodedValue = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet setWithObject:[MTRCommandPath class]] fromData:encodedData error:&decodeError];
+    XCTAssertNil(decodeError);
+    XCTAssertTrue([decodedValue isKindOfClass:[MTRCommandPath class]]);
+
+    MTRCommandPath * decodedCommandPath = decodedValue;
+    XCTAssertEqualObjects(originalCommandPath, decodedCommandPath);
+}
 
 @end
 
diff --git a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
index 61159ac9b18901..e652d2f9fddc0e 100644
--- a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
@@ -28,8 +28,6 @@
 #import "MTRTestPerControllerStorage.h"
 #import "MTRTestResetCommissioneeHelper.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 static const uint16_t kPairingTimeoutInSeconds = 10;
 static const uint16_t kTimeoutInSeconds = 3;
 static NSString * kOnboardingPayload = @"MT:-24J0AFN00KA0648G00";
@@ -1971,5 +1969,3 @@ - (void)testControllerServer
 }
 
 @end
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.h
index 4e854403064a90..b02bff9c01a46b 100644
--- a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.h
+++ b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.h
@@ -17,8 +17,6 @@
 #import <Foundation/Foundation.h>
 #import <Matter/Matter.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MTRTestPerControllerStorage : NSObject <MTRDeviceControllerStorageDelegate>
@@ -54,5 +52,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.m
index ecf252f1bbe3e3..f0bce87bc47af1 100644
--- a/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.m
+++ b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestPerControllerStorage.m
@@ -18,8 +18,6 @@
 
 #import "MTRTestPerControllerStorage.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 @interface MTRTestPerControllerStorage ()
 @property (nonatomic, readonly) NSMutableDictionary<NSString *, NSData *> * storage;
 @end
@@ -116,5 +114,3 @@ - (BOOL)controller:(MTRDeviceController *)controller storeValues:(NSDictionary<N
 }
 
 @end
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index 1e540620fe2632..846db8bd08ee26 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -2193,6 +2193,8 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2256,6 +2258,7 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-fno-c++-static-destructors",
+					"-DCHIP_CONFIG_GLOBALS_NO_DESTRUCT=1",
 				);
 				OTHER_LDFLAGS = "";
 				"OTHER_LDFLAGS[sdk=*]" = (
@@ -2293,6 +2296,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
+				STRIP_STYLE = "non-global";
 				SYSTEM_HEADER_SEARCH_PATHS = (
 					"$(TEMP_DIR)/out/gen/include",
 					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
@@ -2360,6 +2364,8 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -2421,6 +2427,7 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-fno-c++-static-destructors",
+					"-DCHIP_CONFIG_GLOBALS_NO_DESTRUCT=1",
 				);
 				OTHER_LDFLAGS = "";
 				"OTHER_LDFLAGS[sdk=*]" = (
@@ -2458,6 +2465,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
+				STRIP_STYLE = "non-global";
 				SYSTEM_HEADER_SEARCH_PATHS = (
 					"$(TEMP_DIR)/out/gen/include",
 					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index 30002484c33a3d..90bab2a5ba5e76 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -24,7 +24,6 @@
 #pragma once
 #include <memory>
 
-#include <app/AttributeAccessInterface.h>
 #include <app/icd/server/ICDServerConfig.h>
 #include <inet/UDPEndPoint.h>
 #include <lib/support/CodeUtils.h>
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
index 540fb773e57c2c..a28aea640ba46e 100644
--- a/src/include/platform/ThreadStackManager.h
+++ b/src/include/platform/ThreadStackManager.h
@@ -25,7 +25,6 @@
 
 #include <app/icd/server/ICDServerConfig.h>
 
-#include <app/AttributeAccessInterface.h>
 #include <app/util/basic-types.h>
 #include <inet/IPAddress.h>
 #include <lib/support/Span.h>
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
index 865feb9b55845b..b8901cda078f50 100755
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
@@ -24,7 +24,6 @@
 
 #pragma once
 #include <app-common/zap-generated/ids/Attributes.h>
-#include <app/AttributeAccessInterface.h>
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
index f20412fda3aa3e..cf9a4a490d0f26 100755
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
 #include <app/icd/server/ICDServerConfig.h>
 #include <lib/support/BitFlags.h>
 #include <platform/ThreadStackManager.h>
diff --git a/src/inet/IPAddress.cpp b/src/inet/IPAddress.cpp
index c6059fb1f56bdb..a5b191d20e4804 100644
--- a/src/inet/IPAddress.cpp
+++ b/src/inet/IPAddress.cpp
@@ -319,7 +319,7 @@ bool IPAddress::IsIPv6GlobalUnicast() const
 // Is address an IPv6 Unique Local Address?
 bool IPAddress::IsIPv6ULA() const
 {
-    return (ntohl(Addr[0]) & 0xFF000000U) == 0xFD000000U;
+    return (ntohl(Addr[0]) & 0xFE000000U) == 0xFC000000U;
 }
 
 // Is address an IPv6 Link-local Address?
diff --git a/src/inet/tests/TestInetCommonOptions.cpp b/src/inet/tests/TestInetCommonOptions.cpp
index fc9c8df320a5c6..fdc79b11954a27 100644
--- a/src/inet/tests/TestInetCommonOptions.cpp
+++ b/src/inet/tests/TestInetCommonOptions.cpp
@@ -243,6 +243,7 @@ FaultInjectionOptions::FaultInjectionOptions()
     ExtraCleanupTimeMsec = 0;
 }
 
+#if defined(CHIP_WITH_NLFAULTINJECTION) && CHIP_WITH_NLFAULTINJECTION
 bool FaultInjectionOptions::HandleOption(const char * progName, OptionSet * optSet, int id, const char * name, const char * arg)
 {
     using namespace nl::FaultInjection;
@@ -292,3 +293,4 @@ bool FaultInjectionOptions::HandleOption(const char * progName, OptionSet * optS
 
     return true;
 }
+#endif // defined(CHIP_WITH_NLFAULTINJECTION) && CHIP_WITH_NLFAULTINJECTION
diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
index 07c3559af66ded..6e461a4b99c72d 100644
--- a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
+++ b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
@@ -97,7 +97,8 @@ NodeLookupAction NodeLookupHandle::NextAction(System::Clock::Timestamp now)
 {
     const System::Clock::Timestamp elapsed = now - mRequestStartTime;
 
-    ChipLogProgress(Discovery, "Checking node lookup status after %lu ms", static_cast<unsigned long>(elapsed.count()));
+    ChipLogProgress(Discovery, "Checking node lookup status for " ChipLogFormatPeerId " after %lu ms",
+                    ChipLogValuePeerId(mRequest.GetPeerId()), static_cast<unsigned long>(elapsed.count()));
 
     // We are still within the minimal search time. Wait for more results.
     if (elapsed < mRequest.GetMinLookupTime())
@@ -186,9 +187,11 @@ CHIP_ERROR Resolver::LookupNode(const NodeLookupRequest & request, Impl::NodeLoo
     VerifyOrReturnError(mSystemLayer != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     handle.ResetForLookup(mTimeSource.GetMonotonicTimestamp(), request);
-    ReturnErrorOnFailure(Dnssd::Resolver::Instance().ResolveNodeId(request.GetPeerId()));
+    auto & peerId = request.GetPeerId();
+    ReturnErrorOnFailure(Dnssd::Resolver::Instance().ResolveNodeId(peerId));
     mActiveLookups.PushBack(&handle);
     ReArmTimer();
+    ChipLogProgress(Discovery, "Lookup started for " ChipLogFormatPeerId, ChipLogValuePeerId(peerId));
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/lib/core/Global.h b/src/lib/core/Global.h
index 26de6b58381ccd..ddecf2bbeddb5b 100644
--- a/src/lib/core/Global.h
+++ b/src/lib/core/Global.h
@@ -19,9 +19,48 @@
 
 #include <lib/core/CHIPConfig.h>
 
+#include <mutex>
 #include <new>
 
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
+#include <dispatch/dispatch.h>
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
+
 namespace chip {
+namespace detail {
+
+#if CHIP_CONFIG_GLOBALS_LAZY_INIT
+
+struct NonAtomicOnce
+{
+    bool mInitialized = false;
+    void call(void (*func)(void *), void * context)
+    {
+        if (!mInitialized)
+        {
+            mInitialized = true;
+            func(context);
+        }
+    }
+};
+
+struct AtomicOnce
+{
+// dispatch_once (if available) is more efficient than std::call_once because
+// it takes advantage of the additional assumption that the dispatch_once_t
+// is allocated within a static / global.
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
+    dispatch_once_t mOnce = 0;
+    void call(void (*func)(void *), void * context) { dispatch_once_f(&mOnce, context, func); }
+#else // CHIP_SYSTEM_CONFIG_USE_DISPATCH
+    std::once_flag mOnce;
+    void call(void (*func)(void *), void * context) { std::call_once(mOnce, func, context); }
+#endif
+};
+
+#endif // CHIP_CONFIG_GLOBALS_LAZY_INIT
+
+} // namespace detail
 
 /**
  * A wrapper for global object that enables initialization and destruction to
@@ -29,9 +68,16 @@ namespace chip {
  *
  * The contained object of type T is default constructed, possibly lazily.
  *
- * This class is generally NOT thread-safe; external synchronization is required.
+ * Values of this type MUST be globals or static class members.
+ *
+ * This class is not thread-safe; external synchronization is required.
+ * @see AtomicGlobal<T> for a thread-safe variant.
  */
+#if CHIP_CONFIG_GLOBALS_LAZY_INIT
+template <class T, class OnceStrategy = detail::NonAtomicOnce>
+#else  // CHIP_CONFIG_GLOBALS_LAZY_INIT
 template <class T>
+#endif // CHIP_CONFIG_GLOBALS_LAZY_INIT
 class Global
 {
 public:
@@ -40,6 +86,11 @@ class Global
     T & get() { return _get(); }
     T * operator->() { return &_get(); }
 
+    // Globals are not copyable or movable
+    Global(const Global &)             = delete;
+    Global(const Global &&)            = delete;
+    Global & operator=(const Global &) = delete;
+
 #if CHIP_CONFIG_GLOBALS_LAZY_INIT
 public:
     constexpr Global() = default;
@@ -49,24 +100,22 @@ class Global
     // Zero-initialize everything. We should technically leave mStorage uninitialized,
     // but that can sometimes cause clang to be unable to constant-initialize the object.
     alignas(T) unsigned char mStorage[sizeof(T)] = {};
-    bool mInitialized                            = false;
-
-    T & _value() { return *reinterpret_cast<T *>(mStorage); }
+    OnceStrategy mOnce;
 
     T & _get()
     {
-        if (!mInitialized)
-        {
-            new (mStorage) T();
-            mInitialized = true;
+        T * value = reinterpret_cast<T *>(mStorage);
+        mOnce.call(&create, value);
+        return *value;
+    }
+    static void create(void * value)
+    {
+        new (value) T();
 #if !CHIP_CONFIG_GLOBALS_NO_DESTRUCT
-            CHIP_CXA_ATEXIT(&destroy, this);
+        CHIP_CXA_ATEXIT(&destroy, value);
 #endif // CHIP_CONFIG_GLOBALS_NO_DESTRUCT
-        }
-        return _value();
     }
-
-    static void destroy(void * context) { static_cast<Global<T> *>(context)->_value().~T(); }
+    static void destroy(void * value) { static_cast<T *>(value)->~T(); }
 
 #else // CHIP_CONFIG_GLOBALS_LAZY_INIT
 public:
@@ -100,4 +149,15 @@ class Global
 #endif // CHIP_CONFIG_GLOBALS_LAZY_INIT
 };
 
+/**
+ * A variant of Global<T> that is thread-safe.
+ */
+template <class T>
+using AtomicGlobal =
+#if CHIP_CONFIG_GLOBALS_LAZY_INIT
+    Global<T, detail::AtomicOnce>;
+#else  // CHIP_CONFIG_GLOBALS_LAZY_INIT
+    Global<T>; // eager globals are already thread-safe
+#endif // CHIP_CONFIG_GLOBALS_LAZY_INIT
+
 } // namespace chip
diff --git a/src/lib/dnssd/ActiveResolveAttempts.h b/src/lib/dnssd/ActiveResolveAttempts.h
index 15796abf85b20c..ba6d8cf7a54f6e 100644
--- a/src/lib/dnssd/ActiveResolveAttempts.h
+++ b/src/lib/dnssd/ActiveResolveAttempts.h
@@ -159,17 +159,17 @@ class ActiveResolveAttempts
             case chip::Dnssd::DiscoveryFilterType::kNone:
                 return true;
             case chip::Dnssd::DiscoveryFilterType::kShortDiscriminator:
-                return browse.filter.code == static_cast<uint64_t>((data.commissionData.longDiscriminator >> 8) & 0x0F);
+                return browse.filter.code == static_cast<uint64_t>((data.nodeData.longDiscriminator >> 8) & 0x0F);
             case chip::Dnssd::DiscoveryFilterType::kLongDiscriminator:
-                return browse.filter.code == data.commissionData.longDiscriminator;
+                return browse.filter.code == data.nodeData.longDiscriminator;
             case chip::Dnssd::DiscoveryFilterType::kVendorId:
-                return browse.filter.code == data.commissionData.vendorId;
+                return browse.filter.code == data.nodeData.vendorId;
             case chip::Dnssd::DiscoveryFilterType::kDeviceType:
-                return browse.filter.code == data.commissionData.deviceType;
+                return browse.filter.code == data.nodeData.deviceType;
             case chip::Dnssd::DiscoveryFilterType::kCommissioningMode:
-                return browse.filter.code == data.commissionData.commissioningMode;
+                return browse.filter.code == data.nodeData.commissioningMode;
             case chip::Dnssd::DiscoveryFilterType::kInstanceName:
-                return strncmp(browse.filter.instanceName, data.commissionData.instanceName,
+                return strncmp(browse.filter.instanceName, data.nodeData.instanceName,
                                chip::Dnssd::Commission::kInstanceNameMaxLength + 1) == 0;
             case chip::Dnssd::DiscoveryFilterType::kCommissioner:
             case chip::Dnssd::DiscoveryFilterType::kCompressedFabricId:
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index 6904480a4d1691..c12019ca60b5fd 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -340,7 +340,7 @@ void DiscoveryImplPlatform::HandleNodeIdResolve(void * context, DnssdService * r
 void DnssdService::ToDiscoveredNodeData(const Span<Inet::IPAddress> & addresses, DiscoveredNodeData & nodeData)
 {
     auto & resolutionData = nodeData.resolutionData;
-    auto & commissionData = nodeData.commissionData;
+    auto & commissionData = nodeData.nodeData;
 
     Platform::CopyString(resolutionData.hostName, mHostName);
     Platform::CopyString(commissionData.instanceName, mName);
@@ -743,6 +743,21 @@ CHIP_ERROR DiscoveryImplPlatform::DiscoverCommissioners(DiscoveryFilter filter,
     return error;
 }
 
+CHIP_ERROR DiscoveryImplPlatform::StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context)
+{
+    switch (type)
+    {
+    case DiscoveryType::kCommissionableNode:
+        return DiscoverCommissionableNodes(filter, context);
+    case DiscoveryType::kCommissionerNode:
+        return DiscoverCommissioners(filter, context);
+    case DiscoveryType::kOperational:
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    default:
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+}
+
 CHIP_ERROR DiscoveryImplPlatform::StopDiscovery(DiscoveryContext & context)
 {
     if (!context.GetBrowseIdentifier().HasValue())
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.h b/src/lib/dnssd/Discovery_ImplPlatform.h
index a3f79796ca535c..34fedf831b5ecf 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.h
+++ b/src/lib/dnssd/Discovery_ImplPlatform.h
@@ -53,8 +53,9 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context);
+    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context);
+    CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override;
     CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
 
@@ -94,7 +95,7 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver
     uint8_t mCommissionableInstanceName[sizeof(uint64_t)];
     OperationalResolveDelegate * mOperationalDelegate = nullptr;
 
-    friend class Global<DiscoveryImplPlatform>;
+    friend Global<DiscoveryImplPlatform>;
     static Global<DiscoveryImplPlatform> sManager;
 };
 
diff --git a/src/lib/dnssd/IncrementalResolve.cpp b/src/lib/dnssd/IncrementalResolve.cpp
index c36efbde177a6d..766d979e33a4ba 100644
--- a/src/lib/dnssd/IncrementalResolve.cpp
+++ b/src/lib/dnssd/IncrementalResolve.cpp
@@ -189,7 +189,7 @@ CHIP_ERROR IncrementalResolver::InitializeParsing(mdns::Minimal::SerializedQName
         break;
     case ServiceNameType::kCommissioner:
     case ServiceNameType::kCommissionable:
-        mSpecificResolutionData.Set<CommissionNodeData>();
+        mSpecificResolutionData.Set<DnssdNodeData>();
 
         {
             // Commission addresses start with instance name
@@ -199,10 +199,10 @@ CHIP_ERROR IncrementalResolver::InitializeParsing(mdns::Minimal::SerializedQName
                 return CHIP_ERROR_INVALID_ARGUMENT;
             }
 
-            Platform::CopyString(mSpecificResolutionData.Get<CommissionNodeData>().instanceName, nameCopy.Value());
+            Platform::CopyString(mSpecificResolutionData.Get<DnssdNodeData>().instanceName, nameCopy.Value());
         }
 
-        LogFoundCommissionSrvRecord(mSpecificResolutionData.Get<CommissionNodeData>().instanceName, mTargetHostName.Get());
+        LogFoundCommissionSrvRecord(mSpecificResolutionData.Get<DnssdNodeData>().instanceName, mTargetHostName.Get());
         break;
     default:
         return CHIP_ERROR_INVALID_ARGUMENT;
@@ -304,9 +304,9 @@ CHIP_ERROR IncrementalResolver::OnTxtRecord(const ResourceData & data, BytesRang
         }
     }
 
-    if (IsActiveCommissionParse())
+    if (IsActiveBrowseParse())
     {
-        TxtParser<CommissionNodeData> delegate(mSpecificResolutionData.Get<CommissionNodeData>());
+        TxtParser<DnssdNodeData> delegate(mSpecificResolutionData.Get<DnssdNodeData>());
         if (!ParseTxtRecord(data.GetData(), &delegate))
         {
             return CHIP_ERROR_INVALID_ARGUMENT;
@@ -343,12 +343,12 @@ CHIP_ERROR IncrementalResolver::OnIpAddress(Inet::InterfaceId interface, const I
 
 CHIP_ERROR IncrementalResolver::Take(DiscoveredNodeData & outputData)
 {
-    VerifyOrReturnError(IsActiveCommissionParse(), CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(IsActiveBrowseParse(), CHIP_ERROR_INCORRECT_STATE);
 
     IPAddressSorter::Sort(mCommonResolutionData.ipAddress, mCommonResolutionData.numIPs, mCommonResolutionData.interfaceId);
 
     outputData.resolutionData = mCommonResolutionData;
-    outputData.commissionData = mSpecificResolutionData.Get<CommissionNodeData>();
+    outputData.nodeData       = mSpecificResolutionData.Get<DnssdNodeData>();
 
     ResetToInactive();
 
diff --git a/src/lib/dnssd/IncrementalResolve.h b/src/lib/dnssd/IncrementalResolve.h
index b28b3cb897b5f3..9d2386472d7eba 100644
--- a/src/lib/dnssd/IncrementalResolve.h
+++ b/src/lib/dnssd/IncrementalResolve.h
@@ -99,7 +99,7 @@ class IncrementalResolver
     /// method.
     bool IsActive() const { return mSpecificResolutionData.Valid(); }
 
-    bool IsActiveCommissionParse() const { return mSpecificResolutionData.Is<CommissionNodeData>(); }
+    bool IsActiveBrowseParse() const { return mSpecificResolutionData.Is<DnssdNodeData>(); }
     bool IsActiveOperationalParse() const { return mSpecificResolutionData.Is<OperationalNodeData>(); }
 
     ServiceNameType GetCurrentType() const { return mServiceNameType; }
@@ -143,7 +143,7 @@ class IncrementalResolver
 
     /// Take the current value of the object and clear it once returned.
     ///
-    /// Object must be in `IsActiveCommissionParse()` for this to succeed.
+    /// Object must be in `IsActiveBrowseParse()` for this to succeed.
     /// Data will be returned (and cleared) even if not yet complete based
     /// on `GetMissingRequiredInformation()`. This method takes as much data as
     /// it was parsed so far.
@@ -170,7 +170,7 @@ class IncrementalResolver
     /// Input data MUST have GetType() == QType::TXT
     CHIP_ERROR OnTxtRecord(const mdns::Minimal::ResourceData & data, mdns::Minimal::BytesRange packetRange);
 
-    /// Notify that a new IP addres has been found.
+    /// Notify that a new IP address has been found.
     ///
     /// This is to be called on both A (if IPv4 support is enabled) and AAAA
     /// addresses.
@@ -178,7 +178,7 @@ class IncrementalResolver
     /// Prerequisite: IP address belongs to the right nost name
     CHIP_ERROR OnIpAddress(Inet::InterfaceId interface, const Inet::IPAddress & addr);
 
-    using ParsedRecordSpecificData = Variant<OperationalNodeData, CommissionNodeData>;
+    using ParsedRecordSpecificData = Variant<OperationalNodeData, DnssdNodeData>;
 
     StoredServerName mRecordName;     // Record name for what is parsed (SRV/PTR/TXT)
     StoredServerName mTargetHostName; // `Target` for the SRV record
diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h
index 6f9827b82218a6..bf684cef6a12a5 100644
--- a/src/lib/dnssd/Resolver.h
+++ b/src/lib/dnssd/Resolver.h
@@ -78,12 +78,12 @@ class DiscoveryContext : public ReferenceCounted<DiscoveryContext>
     void ClearBrowseIdentifier() { mBrowseIdentifier.ClearValue(); }
     const Optional<intptr_t> & GetBrowseIdentifier() const { return mBrowseIdentifier; }
 
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) { mCommissioningDelegate = delegate; }
+    void SetDiscoveryDelegate(DiscoverNodeDelegate * delegate) { mDelegate = delegate; }
     void OnNodeDiscovered(const DiscoveredNodeData & nodeData)
     {
-        if (mCommissioningDelegate != nullptr)
+        if (mDelegate != nullptr)
         {
-            mCommissioningDelegate->OnNodeDiscovered(nodeData);
+            mDelegate->OnNodeDiscovered(nodeData);
         }
         else
         {
@@ -92,7 +92,7 @@ class DiscoveryContext : public ReferenceCounted<DiscoveryContext>
     }
 
 private:
-    CommissioningResolveDelegate * mCommissioningDelegate = nullptr;
+    DiscoverNodeDelegate * mDelegate = nullptr;
     Optional<intptr_t> mBrowseIdentifier;
 };
 
@@ -168,31 +168,19 @@ class Resolver
     virtual void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) = 0;
 
     /**
-     * Finds all commissionable nodes matching the given filter.
+     * Finds all nodes of given type matching the given filter.
      *
      * Whenever a new matching node is found, the node information is passed to
-     * the `OnNodeDiscovered` method of the commissioning delegate configured
+     * the `OnNodeDiscovered` method of the discovery delegate configured
      * in the context object.
      *
      * This method is expected to increase the reference count of the context
      * object for as long as it takes to complete the discovery request.
      */
-    virtual CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) = 0;
+    virtual CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) = 0;
 
     /**
-     * Finds all commissioner nodes matching the given filter.
-     *
-     * Whenever a new matching node is found, the node information is passed to
-     * the `OnNodeDiscovered` method of the commissioning delegate configured
-     * in the context object.
-     *
-     * This method is expected to increase the reference count of the context
-     * object for as long as it takes to complete the discovery request.
-     */
-    virtual CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) = 0;
-
-    /**
-     * Stop discovery (of commissionable or commissioner nodes).
+     * Stop discovery (of all node types).
      *
      * Some back ends may not support stopping discovery, so consumers should
      * not assume they will stop getting callbacks after calling this.
diff --git a/src/lib/dnssd/ResolverProxy.cpp b/src/lib/dnssd/ResolverProxy.cpp
index 3e7446ebbbdc6b..e43028ee54023d 100644
--- a/src/lib/dnssd/ResolverProxy.cpp
+++ b/src/lib/dnssd/ResolverProxy.cpp
@@ -36,7 +36,7 @@ CHIP_ERROR ResolverProxy::Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEnd
 void ResolverProxy::Shutdown()
 {
     VerifyOrReturn(mContext != nullptr);
-    mContext->SetCommissioningDelegate(nullptr);
+    mContext->SetDiscoveryDelegate(nullptr);
     mContext->Release();
     mContext = nullptr;
 }
@@ -45,14 +45,14 @@ CHIP_ERROR ResolverProxy::DiscoverCommissionableNodes(DiscoveryFilter filter)
 {
     VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
-    return mResolver.DiscoverCommissionableNodes(filter, *mContext);
+    return mResolver.StartDiscovery(DiscoveryType::kCommissionableNode, filter, *mContext);
 }
 
 CHIP_ERROR ResolverProxy::DiscoverCommissioners(DiscoveryFilter filter)
 {
     VerifyOrReturnError(mContext != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
-    return mResolver.DiscoverCommissioners(filter, *mContext);
+    return mResolver.StartDiscovery(DiscoveryType::kCommissionerNode, filter, *mContext);
 }
 
 CHIP_ERROR ResolverProxy::StopDiscovery()
diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h
index 09a50e89c1a209..58617b0d0162d7 100644
--- a/src/lib/dnssd/ResolverProxy.h
+++ b/src/lib/dnssd/ResolverProxy.h
@@ -44,11 +44,11 @@ class ResolverProxy
     CHIP_ERROR Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint = nullptr);
     void Shutdown();
 
-    void SetCommissioningDelegate(CommissioningResolveDelegate * delegate)
+    void SetDiscoveryDelegate(DiscoverNodeDelegate * delegate)
     {
         if (mContext != nullptr)
         {
-            mContext->SetCommissioningDelegate(delegate);
+            mContext->SetDiscoveryDelegate(delegate);
         }
     }
 
diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
index b74d0ae87d8507..a5e7117a72a005 100644
--- a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
+++ b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
@@ -285,8 +285,7 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate
     void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; }
     CHIP_ERROR ResolveNodeId(const PeerId & peerId) override;
     void NodeIdResolutionNoLongerNeeded(const PeerId & peerId) override;
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override;
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override;
+    CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override;
     CHIP_ERROR StopDiscovery(DiscoveryContext & context) override;
     CHIP_ERROR ReconfirmRecord(const char * hostname, Inet::IPAddress address, Inet::InterfaceId interfaceId) override;
 
@@ -386,7 +385,7 @@ void MinMdnsResolver::AdvancePendingResolverStates()
         }
 
         // SUCCESS. Call the delegates
-        if (resolver->IsActiveCommissionParse())
+        if (resolver->IsActiveBrowseParse())
         {
             MATTER_TRACE_SCOPE("Active commissioning delegate call", "MinMdnsResolver");
             DiscoveredNodeData nodeData;
@@ -412,13 +411,15 @@ void MinMdnsResolver::AdvancePendingResolverStates()
             case IncrementalResolver::ServiceNameType::kCommissioner:
                 discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionerNode);
                 mActiveResolves.CompleteCommissioner(nodeData);
+                nodeData.nodeType = DiscoveryType::kCommissionerNode;
                 break;
             case IncrementalResolver::ServiceNameType::kCommissionable:
                 discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionableNode);
                 mActiveResolves.CompleteCommissionable(nodeData);
+                nodeData.nodeType = DiscoveryType::kCommissionableNode;
                 break;
             default:
-                ChipLogError(Discovery, "Unexpected type for commission data parsing");
+                ChipLogError(Discovery, "Unexpected type for browse data parsing");
                 continue;
             }
 
@@ -685,20 +686,12 @@ void MinMdnsResolver::ExpireIncrementalResolvers()
     }
 }
 
-CHIP_ERROR MinMdnsResolver::DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context)
+CHIP_ERROR MinMdnsResolver::StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context)
 {
     // minmdns currently supports only one discovery context at a time so override the previous context
     SetDiscoveryContext(&context);
 
-    return BrowseNodes(DiscoveryType::kCommissionableNode, filter);
-}
-
-CHIP_ERROR MinMdnsResolver::DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context)
-{
-    // minmdns currently supports only one discovery context at a time so override the previous context
-    SetDiscoveryContext(&context);
-
-    return BrowseNodes(DiscoveryType::kCommissionerNode, filter);
+    return BrowseNodes(type, filter);
 }
 
 CHIP_ERROR MinMdnsResolver::StopDiscovery(DiscoveryContext & context)
diff --git a/src/lib/dnssd/Resolver_ImplNone.cpp b/src/lib/dnssd/Resolver_ImplNone.cpp
index 36e2bd9aead89f..497c82af9e53d9 100644
--- a/src/lib/dnssd/Resolver_ImplNone.cpp
+++ b/src/lib/dnssd/Resolver_ImplNone.cpp
@@ -40,11 +40,7 @@ class NoneResolver : public Resolver
     {
         ChipLogError(Discovery, "Failed to stop resolving node ID: dnssd resolving not available");
     }
-    CHIP_ERROR DiscoverCommissionableNodes(DiscoveryFilter filter, DiscoveryContext & context) override
-    {
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
-    CHIP_ERROR DiscoverCommissioners(DiscoveryFilter filter, DiscoveryContext & context) override
+    CHIP_ERROR StartDiscovery(DiscoveryType type, DiscoveryFilter filter, DiscoveryContext & context) override
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
diff --git a/src/lib/dnssd/TxtFields.cpp b/src/lib/dnssd/TxtFields.cpp
index d43650748e53a2..b77d991784867d 100644
--- a/src/lib/dnssd/TxtFields.cpp
+++ b/src/lib/dnssd/TxtFields.cpp
@@ -225,7 +225,7 @@ TxtFieldKey GetTxtFieldKey(const ByteSpan & key)
 
 } // namespace Internal
 
-void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & val, CommissionNodeData & nodeData)
+void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & val, DnssdNodeData & nodeData)
 {
     TxtFieldKey keyType = Internal::GetTxtFieldKey(key);
     switch (keyType)
diff --git a/src/lib/dnssd/TxtFields.h b/src/lib/dnssd/TxtFields.h
index 5546493624119d..194750451289a4 100644
--- a/src/lib/dnssd/TxtFields.h
+++ b/src/lib/dnssd/TxtFields.h
@@ -192,7 +192,7 @@ constexpr size_t ValSize(TxtFieldKey key)
 }
 
 void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, CommonResolutionData & nodeData);
-void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, CommissionNodeData & nodeData);
+void FillNodeDataFromTxt(const ByteSpan & key, const ByteSpan & value, DnssdNodeData & nodeData);
 
 } // namespace Dnssd
 } // namespace chip
diff --git a/src/lib/dnssd/Types.h b/src/lib/dnssd/Types.h
index a835ebf5647a97..15dbf90670ac34 100644
--- a/src/lib/dnssd/Types.h
+++ b/src/lib/dnssd/Types.h
@@ -205,7 +205,7 @@ inline constexpr size_t kMaxRotatingIdLen         = 50;
 inline constexpr size_t kMaxPairingInstructionLen = 128;
 
 /// Data that is specific to commisionable/commissioning node discovery
-struct CommissionNodeData
+struct DnssdNodeData
 {
     size_t rotatingIdLen                                      = 0;
     uint32_t deviceType                                       = 0;
@@ -220,13 +220,13 @@ struct CommissionNodeData
     char deviceName[kMaxDeviceNameLen + 1]                    = {};
     char pairingInstruction[kMaxPairingInstructionLen + 1]    = {};
 
-    CommissionNodeData() {}
+    DnssdNodeData() {}
 
     void Reset()
     {
         // Let constructor clear things as default
-        this->~CommissionNodeData();
-        new (this) CommissionNodeData();
+        this->~DnssdNodeData();
+        new (this) DnssdNodeData();
     }
 
     bool IsInstanceName(const char * instance) const { return strcmp(instance, instanceName) == 0; }
@@ -289,9 +289,7 @@ struct ResolvedNodeData
 #if CHIP_PROGRESS_LOGGING
         // Would be nice to log the interface id, but sorting out how to do so
         // across our different InterfaceId implementations is a pain.
-        ChipLogProgress(Discovery, "Node ID resolved for " ChipLogFormatX64 ":" ChipLogFormatX64,
-                        ChipLogValueX64(operationalData.peerId.GetCompressedFabricId()),
-                        ChipLogValueX64(operationalData.peerId.GetNodeId()));
+        ChipLogProgress(Discovery, "Node ID resolved for " ChipLogFormatPeerId, ChipLogValuePeerId(operationalData.peerId));
         resolutionData.LogDetail();
 #endif // CHIP_PROGRESS_LOGGING
     }
@@ -300,12 +298,14 @@ struct ResolvedNodeData
 struct DiscoveredNodeData
 {
     CommonResolutionData resolutionData;
-    CommissionNodeData commissionData;
+    DnssdNodeData nodeData;
+    DiscoveryType nodeType;
 
     void Reset()
     {
         resolutionData.Reset();
-        commissionData.Reset();
+        nodeData.Reset();
+        nodeType = DiscoveryType::kUnknown;
     }
     DiscoveredNodeData() { Reset(); }
 
@@ -313,7 +313,7 @@ struct DiscoveredNodeData
     {
         ChipLogDetail(Discovery, "Discovered node:");
         resolutionData.LogDetail();
-        commissionData.LogDetail();
+        nodeData.LogDetail();
     }
 };
 
@@ -321,10 +321,10 @@ struct DiscoveredNodeData
 ///   - Commissioners
 ///   - Nodes in commissioning modes over IP (e.g. ethernet devices, devices already
 ///     connected to thread/wifi or devices with a commissioning window open)
-class CommissioningResolveDelegate
+class DiscoverNodeDelegate
 {
 public:
-    virtual ~CommissioningResolveDelegate() = default;
+    virtual ~DiscoverNodeDelegate() = default;
 
     /// Called within the CHIP event loop once a node is discovered.
     ///
diff --git a/src/lib/dnssd/platform/Dnssd.h b/src/lib/dnssd/platform/Dnssd.h
index 778e9bc05f1d9c..fcbeabe1ce8d51 100644
--- a/src/lib/dnssd/platform/Dnssd.h
+++ b/src/lib/dnssd/platform/Dnssd.h
@@ -288,8 +288,7 @@ CHIP_ERROR ChipDnssdResolve(DnssdService * browseResult, chip::Inet::InterfaceId
  * @retval Error code                   The resolve fails.
  *
  */
-CHIP_ERROR ChipDnssdResolve(DnssdService * browseResult, chip::Inet::InterfaceId interface,
-                            CommissioningResolveDelegate * delegate);
+CHIP_ERROR ChipDnssdResolve(DnssdService * browseResult, chip::Inet::InterfaceId interface, DiscoverNodeDelegate * delegate);
 #endif // CHIP_DEVICE_LAYER_TARGET_DARWIN
 
 /**
diff --git a/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp b/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
index 574268bb3c8e55..f4ef2f202c4def 100644
--- a/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
+++ b/src/lib/dnssd/tests/TestActiveResolveAttempts.cpp
@@ -126,7 +126,7 @@ void TestSingleBrowseAddRemove(nlTestSuite * inSuite, void * inContext)
 
     // once complete, nothing to schedule
     Dnssd::DiscoveredNodeData data;
-    data.commissionData.longDiscriminator = 1234;
+    data.nodeData.longDiscriminator = 1234;
     attempts.CompleteCommissionable(data);
     NL_TEST_ASSERT(inSuite, !attempts.GetTimeUntilNextExpectedResponse().HasValue());
     NL_TEST_ASSERT(inSuite, !attempts.NextScheduled().HasValue());
@@ -375,7 +375,7 @@ void TestCombination(nlTestSuite * inSuite, void * inContext)
     attempts.Complete(MakePeerId(2));
     attempts.Complete(MakePeerId(1));
     Dnssd::DiscoveredNodeData data;
-    data.commissionData.longDiscriminator = 1234;
+    data.nodeData.longDiscriminator = 1234;
     attempts.CompleteCommissionable(data);
 
     NL_TEST_ASSERT(inSuite, !attempts.GetTimeUntilNextExpectedResponse().HasValue());
diff --git a/src/lib/dnssd/tests/TestIncrementalResolve.cpp b/src/lib/dnssd/tests/TestIncrementalResolve.cpp
index 1cc3b714d28ae3..03b585c4ce14c3 100644
--- a/src/lib/dnssd/tests/TestIncrementalResolve.cpp
+++ b/src/lib/dnssd/tests/TestIncrementalResolve.cpp
@@ -163,7 +163,7 @@ void TestCreation(nlTestSuite * inSuite, void * inContext)
     IncrementalResolver resolver;
 
     NL_TEST_ASSERT(inSuite, !resolver.IsActive());
-    NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
     NL_TEST_ASSERT(
         inSuite,
@@ -183,7 +183,7 @@ void TestInactiveResetOnInitError(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestHostName.Serialized(), srvRecord) != CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, !resolver.IsActive());
-    NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
 }
 
@@ -199,7 +199,7 @@ void TestStartOperational(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestOperationalName.Serialized(), srvRecord) == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, resolver.IsActive());
-    NL_TEST_ASSERT(inSuite, !resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, !resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite, resolver.IsActiveOperationalParse());
     NL_TEST_ASSERT(inSuite,
                    resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -218,7 +218,7 @@ void TestStartCommissionable(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionableNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, resolver.IsActive());
-    NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
     NL_TEST_ASSERT(inSuite,
                    resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -237,7 +237,7 @@ void TestStartCommissioner(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionerNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, resolver.IsActive());
-    NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite, !resolver.IsActiveOperationalParse());
     NL_TEST_ASSERT(inSuite,
                    resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
@@ -336,7 +336,7 @@ void TestParseCommissionable(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, resolver.InitializeParsing(kTestCommissionableNode.Serialized(), srvRecord) == CHIP_NO_ERROR);
 
     // once initialized, parsing should be ready however no IP address is available
-    NL_TEST_ASSERT(inSuite, resolver.IsActiveCommissionParse());
+    NL_TEST_ASSERT(inSuite, resolver.IsActiveBrowseParse());
     NL_TEST_ASSERT(inSuite,
                    resolver.GetMissingRequiredInformation().HasOnly(IncrementalResolver::RequiredInformationBitFlags::kIpAddress));
     NL_TEST_ASSERT(inSuite, resolver.GetTargetHostName() == kTestHostName.Serialized());
@@ -414,10 +414,10 @@ void TestParseCommissionable(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, nodeData.resolutionData.ipAddress[1] == addr);
 
     // parsed txt data for discovered nodes
-    NL_TEST_ASSERT(inSuite, nodeData.commissionData.longDiscriminator == 22345);
-    NL_TEST_ASSERT(inSuite, nodeData.commissionData.vendorId == 321);
-    NL_TEST_ASSERT(inSuite, nodeData.commissionData.productId == 654);
-    NL_TEST_ASSERT(inSuite, strcmp(nodeData.commissionData.deviceName, "mytest") == 0);
+    NL_TEST_ASSERT(inSuite, nodeData.nodeData.longDiscriminator == 22345);
+    NL_TEST_ASSERT(inSuite, nodeData.nodeData.vendorId == 321);
+    NL_TEST_ASSERT(inSuite, nodeData.nodeData.productId == 654);
+    NL_TEST_ASSERT(inSuite, strcmp(nodeData.nodeData.deviceName, "mytest") == 0);
 }
 
 const nlTest sTests[] = {
diff --git a/src/lib/dnssd/tests/TestTxtFields.cpp b/src/lib/dnssd/tests/TestTxtFields.cpp
index 95f13b5d60c091..4593a4903b1a01 100644
--- a/src/lib/dnssd/tests/TestTxtFields.cpp
+++ b/src/lib/dnssd/tests/TestTxtFields.cpp
@@ -304,20 +304,20 @@ void TestGetCommissionerPasscode(nlTestSuite * inSuite, void * inContext)
 bool NodeDataIsEmpty(const DiscoveredNodeData & node)
 {
 
-    if (node.commissionData.longDiscriminator != 0 || node.commissionData.vendorId != 0 || node.commissionData.productId != 0 ||
-        node.commissionData.commissioningMode != 0 || node.commissionData.deviceType != 0 ||
-        node.commissionData.rotatingIdLen != 0 || node.commissionData.pairingHint != 0 ||
-        node.resolutionData.mrpRetryIntervalIdle.HasValue() || node.resolutionData.mrpRetryIntervalActive.HasValue() ||
-        node.resolutionData.mrpRetryActiveThreshold.HasValue() || node.resolutionData.isICDOperatingAsLIT.HasValue() ||
-        node.resolutionData.supportsTcp || node.commissionData.commissionerPasscode != 0)
+    if (node.nodeData.longDiscriminator != 0 || node.nodeData.vendorId != 0 || node.nodeData.productId != 0 ||
+        node.nodeData.commissioningMode != 0 || node.nodeData.deviceType != 0 || node.nodeData.rotatingIdLen != 0 ||
+        node.nodeData.pairingHint != 0 || node.resolutionData.mrpRetryIntervalIdle.HasValue() ||
+        node.resolutionData.mrpRetryIntervalActive.HasValue() || node.resolutionData.mrpRetryActiveThreshold.HasValue() ||
+        node.resolutionData.isICDOperatingAsLIT.HasValue() || node.resolutionData.supportsTcp ||
+        node.nodeData.commissionerPasscode != 0)
     {
         return false;
     }
-    if (strcmp(node.commissionData.deviceName, "") != 0 || strcmp(node.commissionData.pairingInstruction, "") != 0)
+    if (strcmp(node.nodeData.deviceName, "") != 0 || strcmp(node.nodeData.pairingInstruction, "") != 0)
     {
         return false;
     }
-    for (uint8_t id : node.commissionData.rotatingId)
+    for (uint8_t id : node.nodeData.rotatingId)
     {
         if (id != 0)
         {
@@ -337,78 +337,78 @@ void TestFillDiscoveredNodeDataFromTxt(nlTestSuite * inSuite, void * inContext)
     // Long discriminator
     strcpy(key, "D");
     strcpy(val, "840");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.longDiscriminator == 840);
-    filled.commissionData.longDiscriminator = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.longDiscriminator == 840);
+    filled.nodeData.longDiscriminator = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // vendor and product
     strcpy(key, "VP");
     strcpy(val, "123+456");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.vendorId == 123);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.productId == 456);
-    filled.commissionData.vendorId  = 0;
-    filled.commissionData.productId = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.vendorId == 123);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.productId == 456);
+    filled.nodeData.vendorId  = 0;
+    filled.nodeData.productId = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Commissioning mode
     strcpy(key, "CM");
     strcpy(val, "1");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.commissioningMode == 1);
-    filled.commissionData.commissioningMode = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.commissioningMode == 1);
+    filled.nodeData.commissioningMode = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Commissioning mode
     strcpy(key, "CP");
     strcpy(val, "1");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.commissionerPasscode == 1);
-    filled.commissionData.commissionerPasscode = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.commissionerPasscode == 1);
+    filled.nodeData.commissionerPasscode = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Device type
     strcpy(key, "DT");
     strcpy(val, "1");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.deviceType == 1);
-    filled.commissionData.deviceType = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.deviceType == 1);
+    filled.nodeData.deviceType = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Device name
     strcpy(key, "DN");
     strcpy(val, "abc");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, strcmp(filled.commissionData.deviceName, "abc") == 0);
-    memset(filled.commissionData.deviceName, 0, sizeof(filled.commissionData.deviceName));
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, strcmp(filled.nodeData.deviceName, "abc") == 0);
+    memset(filled.nodeData.deviceName, 0, sizeof(filled.nodeData.deviceName));
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Rotating device id
     strcpy(key, "RI");
     strcpy(val, "1A2B");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingId[0] == 0x1A);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingId[1] == 0x2B);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.rotatingIdLen == 2);
-    filled.commissionData.rotatingIdLen = 0;
-    memset(filled.commissionData.rotatingId, 0, sizeof(filled.commissionData.rotatingId));
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingId[0] == 0x1A);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingId[1] == 0x2B);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.rotatingIdLen == 2);
+    filled.nodeData.rotatingIdLen = 0;
+    memset(filled.nodeData.rotatingId, 0, sizeof(filled.nodeData.rotatingId));
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Pairing instruction
     strcpy(key, "PI");
     strcpy(val, "hint");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, strcmp(filled.commissionData.pairingInstruction, "hint") == 0);
-    memset(filled.commissionData.pairingInstruction, 0, sizeof(filled.commissionData.pairingInstruction));
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, strcmp(filled.nodeData.pairingInstruction, "hint") == 0);
+    memset(filled.nodeData.pairingInstruction, 0, sizeof(filled.nodeData.pairingInstruction));
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 
     // Pairing hint
     strcpy(key, "PH");
     strcpy(val, "1");
-    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.commissionData);
-    NL_TEST_ASSERT(inSuite, filled.commissionData.pairingHint == 1);
-    filled.commissionData.pairingHint = 0;
+    FillNodeDataFromTxt(GetSpan(key), GetSpan(val), filled.nodeData);
+    NL_TEST_ASSERT(inSuite, filled.nodeData.pairingHint == 1);
+    filled.nodeData.pairingHint = 0;
     NL_TEST_ASSERT(inSuite, NodeDataIsEmpty(filled));
 }
 
diff --git a/src/lib/shell/BUILD.gn b/src/lib/shell/BUILD.gn
index 10dad73a268602..46981b83bb6bb0 100644
--- a/src/lib/shell/BUILD.gn
+++ b/src/lib/shell/BUILD.gn
@@ -89,8 +89,7 @@ static_library("shell") {
       "MainLoopDefault.cpp",
       "streamer_bouffalolab.cpp",
     ]
-  } else if (chip_device_platform == "cc13x2_26x2" ||
-             chip_device_platform == "cc13x4_26x4") {
+  } else if (chip_device_platform == "cc13x4_26x4") {
     sources += [
       "MainLoopDefault.cpp",
       "streamer_cc13x4_26x4.cpp",
diff --git a/src/lib/shell/MainLoopSilabs.cpp b/src/lib/shell/MainLoopSilabs.cpp
index 932d31ac39f92e..83ba4ea00ce619 100644
--- a/src/lib/shell/MainLoopSilabs.cpp
+++ b/src/lib/shell/MainLoopSilabs.cpp
@@ -55,7 +55,7 @@ void ReadLine(char * buffer, size_t max)
 
 #ifdef BRD4325A
         // for 917 SoC board, we need to create a rx event before we wait for the shell activity
-        // NotifyShellProcessFromISR() is called once the buffer is filled
+        // NotifyShellProcess() is called once the buffer is filled
         while (streamer_read(streamer_get(), buffer + read, 1) == 1)
         {
             // Count how many characters were read; usually one but could be copy/paste
diff --git a/src/lib/shell/commands/Dns.cpp b/src/lib/shell/commands/Dns.cpp
index 6abb2dc0393fec..14955335daaad0 100644
--- a/src/lib/shell/commands/Dns.cpp
+++ b/src/lib/shell/commands/Dns.cpp
@@ -40,7 +40,7 @@ Shell::Engine sShellDnsBrowseSubcommands;
 Shell::Engine sShellDnsSubcommands;
 Dnssd::ResolverProxy sResolverProxy;
 
-class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, public AddressResolve::NodeListener
+class DnsShellResolverDelegate : public Dnssd::DiscoverNodeDelegate, public AddressResolve::NodeListener
 {
 public:
     DnsShellResolverDelegate() { mSelfHandle.SetListener(this); }
@@ -92,20 +92,20 @@ class DnsShellResolverDelegate : public Dnssd::CommissioningResolveDelegate, pub
         }
 
         char rotatingId[Dnssd::kMaxRotatingIdLen * 2 + 1];
-        Encoding::BytesToUppercaseHexString(nodeData.commissionData.rotatingId, nodeData.commissionData.rotatingIdLen, rotatingId,
+        Encoding::BytesToUppercaseHexString(nodeData.nodeData.rotatingId, nodeData.nodeData.rotatingIdLen, rotatingId,
                                             sizeof(rotatingId));
 
         streamer_printf(streamer_get(), "DNS browse succeeded: \r\n");
+        streamer_printf(streamer_get(), "   Node Type: %u\r\n", nodeData.nodeType);
         streamer_printf(streamer_get(), "   Hostname: %s\r\n", nodeData.resolutionData.hostName);
-        streamer_printf(streamer_get(), "   Vendor ID: %u\r\n", nodeData.commissionData.vendorId);
-        streamer_printf(streamer_get(), "   Product ID: %u\r\n", nodeData.commissionData.productId);
-        streamer_printf(streamer_get(), "   Long discriminator: %u\r\n", nodeData.commissionData.longDiscriminator);
-        streamer_printf(streamer_get(), "   Device type: %u\r\n", nodeData.commissionData.deviceType);
-        streamer_printf(streamer_get(), "   Device name: %s\n", nodeData.commissionData.deviceName);
-        streamer_printf(streamer_get(), "   Commissioning mode: %d\r\n",
-                        static_cast<int>(nodeData.commissionData.commissioningMode));
-        streamer_printf(streamer_get(), "   Pairing hint: %u\r\n", nodeData.commissionData.pairingHint);
-        streamer_printf(streamer_get(), "   Pairing instruction: %s\r\n", nodeData.commissionData.pairingInstruction);
+        streamer_printf(streamer_get(), "   Vendor ID: %u\r\n", nodeData.nodeData.vendorId);
+        streamer_printf(streamer_get(), "   Product ID: %u\r\n", nodeData.nodeData.productId);
+        streamer_printf(streamer_get(), "   Long discriminator: %u\r\n", nodeData.nodeData.longDiscriminator);
+        streamer_printf(streamer_get(), "   Device type: %u\r\n", nodeData.nodeData.deviceType);
+        streamer_printf(streamer_get(), "   Device name: %s\n", nodeData.nodeData.deviceName);
+        streamer_printf(streamer_get(), "   Commissioning mode: %d\r\n", static_cast<int>(nodeData.nodeData.commissioningMode));
+        streamer_printf(streamer_get(), "   Pairing hint: %u\r\n", nodeData.nodeData.pairingHint);
+        streamer_printf(streamer_get(), "   Pairing instruction: %s\r\n", nodeData.nodeData.pairingInstruction);
         streamer_printf(streamer_get(), "   Rotating ID %s\r\n", rotatingId);
 
         auto retryInterval = nodeData.resolutionData.GetMrpRetryIntervalIdle();
@@ -237,7 +237,7 @@ CHIP_ERROR BrowseHandler(int argc, char ** argv)
     }
 
     sResolverProxy.Init(DeviceLayer::UDPEndPointManager());
-    sResolverProxy.SetCommissioningDelegate(&sDnsShellResolverDelegate);
+    sResolverProxy.SetDiscoveryDelegate(&sDnsShellResolverDelegate);
 
     return sShellDnsBrowseSubcommands.ExecCommand(argc, argv);
 }
diff --git a/src/lib/support/jsontlv/TextFormat.cpp b/src/lib/support/jsontlv/TextFormat.cpp
index c607df791be7cf..0485563fa45b37 100644
--- a/src/lib/support/jsontlv/TextFormat.cpp
+++ b/src/lib/support/jsontlv/TextFormat.cpp
@@ -16,6 +16,8 @@
  *    limitations under the License.
  */
 
+#include "TextFormat.h"
+
 #include <algorithm>
 #include <json/json.h>
 
diff --git a/src/lib/support/logging/TextOnlyLogging.h b/src/lib/support/logging/TextOnlyLogging.h
index b0abef9d00e722..dd9e73d0f5aeed 100644
--- a/src/lib/support/logging/TextOnlyLogging.h
+++ b/src/lib/support/logging/TextOnlyLogging.h
@@ -313,6 +313,14 @@ using LogRedirectCallback_t = void (*)(const char * module, uint8_t category, co
 #define ChipLogFormatScopedNodeId "<" ChipLogFormatX64 ", %d>"
 #define ChipLogValueScopedNodeId(id) ChipLogValueX64((id).GetNodeId()), (id).GetFabricIndex()
 
+/** Logging helpers for PeerId, which is a tuple of <Compressed Fabric Id, NodeId>
+ *
+ * This gets logged in the form that's used for the DNS-SD instance name for the
+ * peer.
+ */
+#define ChipLogFormatPeerId ChipLogFormatX64 "-" ChipLogFormatX64
+#define ChipLogValuePeerId(id) ChipLogValueX64((id).GetCompressedFabricId()), ChipLogValueX64((id).GetNodeId())
+
 /**
  * CHIP Logging Implementation internals.
  */
diff --git a/src/lib/support/tests/TestIniEscaping.cpp b/src/lib/support/tests/TestIniEscaping.cpp
index 784a8fffdcb156..734ddf85b31e7b 100644
--- a/src/lib/support/tests/TestIniEscaping.cpp
+++ b/src/lib/support/tests/TestIniEscaping.cpp
@@ -20,6 +20,8 @@
 #include <lib/support/UnitTestRegistration.h>
 #include <nlunit-test.h>
 
+#include <string>
+
 using namespace chip;
 using namespace chip::IniEscaping;
 
diff --git a/src/lib/support/tests/TestJsonToTlv.cpp b/src/lib/support/tests/TestJsonToTlv.cpp
index 3649764700a3ae..a53144712c2770 100644
--- a/src/lib/support/tests/TestJsonToTlv.cpp
+++ b/src/lib/support/tests/TestJsonToTlv.cpp
@@ -26,6 +26,8 @@
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <nlunit-test.h>
 
+#include <string>
+
 namespace {
 
 using namespace chip::Encoding;
diff --git a/src/lib/support/tests/TestJsonToTlvToJson.cpp b/src/lib/support/tests/TestJsonToTlvToJson.cpp
index b4f0a132f4c684..2ac64670d3d596 100644
--- a/src/lib/support/tests/TestJsonToTlvToJson.cpp
+++ b/src/lib/support/tests/TestJsonToTlvToJson.cpp
@@ -26,6 +26,8 @@
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <nlunit-test.h>
 
+#include <string>
+
 namespace {
 
 using namespace chip::Encoding;
diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp
index be25ef1055d224..1467744ba0478e 100644
--- a/src/lib/support/tests/TestTlvToJson.cpp
+++ b/src/lib/support/tests/TestTlvToJson.cpp
@@ -25,6 +25,8 @@
 #include <system/SystemPacketBuffer.h>
 #include <system/TLVPacketBufferBackingStore.h>
 
+#include <string>
+
 namespace {
 
 using namespace chip::Encoding;
diff --git a/src/platform/ASR/ConnectivityManagerImpl.cpp b/src/platform/ASR/ConnectivityManagerImpl.cpp
index fb023b7b3c3a0b..2a8734ec0010e2 100644
--- a/src/platform/ASR/ConnectivityManagerImpl.cpp
+++ b/src/platform/ASR/ConnectivityManagerImpl.cpp
@@ -52,7 +52,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/platform/Ameba/ConnectivityManagerImpl.cpp b/src/platform/Ameba/ConnectivityManagerImpl.cpp
index c72113db12bebd..6324989bbf4d68 100644
--- a/src/platform/Ameba/ConnectivityManagerImpl.cpp
+++ b/src/platform/Ameba/ConnectivityManagerImpl.cpp
@@ -55,7 +55,6 @@
 
 using namespace ::chip;
 using namespace ::chip::Inet;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 654875cde51b49..048b7e96af9025 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -171,10 +171,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       defines += [ "CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME=\"${chip_device_config_firmware_build_time}\"" ]
     }
 
-    if (chip_device_platform == "cc13x2_26x2") {
-      device_layer_target_define = "CC13X2_26X2"
-      defines += [ "CHIP_DEVICE_LAYER_TARGET=cc13xx_26xx/cc13x2_26x2" ]
-    } else if (chip_device_platform == "cc13x4_26x4") {
+    if (chip_device_platform == "cc13x4_26x4") {
       device_layer_target_define = "CC13X4_26X4"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=cc13xx_26xx/cc13x4_26x4" ]
     } else if (chip_device_platform == "cc32xx") {
@@ -320,7 +317,6 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
 
     found_device_layer_target_define = false
     possible_device_layer_target_defines = [
-      "CC13X2_26X2",
       "CC13X4_26X4",
       "CC32XX",
       "DARWIN",
@@ -519,9 +515,7 @@ if (chip_device_platform != "none") {
       "${chip_root}/src/lib/support",
     ]
 
-    if (chip_device_platform == "cc13x2_26x2") {
-      _platform_target = "cc13xx_26xx/cc13x2_26x2"
-    } else if (chip_device_platform == "cc13x4_26x4") {
+    if (chip_device_platform == "cc13x4_26x4") {
       _platform_target = "cc13xx_26xx/cc13x4_26x4"
     } else if (chip_device_platform == "cc32xx") {
       _platform_target = "cc32xx"
diff --git a/src/platform/Beken/ConnectivityManagerImpl.cpp b/src/platform/Beken/ConnectivityManagerImpl.cpp
index 3065b1fec3f99d..6adb1f8dae593c 100644
--- a/src/platform/Beken/ConnectivityManagerImpl.cpp
+++ b/src/platform/Beken/ConnectivityManagerImpl.cpp
@@ -55,7 +55,6 @@
 
 using namespace ::chip;
 using namespace ::chip::Inet;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/Darwin/ConnectivityManagerImpl.cpp b/src/platform/Darwin/ConnectivityManagerImpl.cpp
index e0a7711e18bbfb..a6518138bfc5e9 100644
--- a/src/platform/Darwin/ConnectivityManagerImpl.cpp
+++ b/src/platform/Darwin/ConnectivityManagerImpl.cpp
@@ -21,8 +21,6 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/internal/BLEManager.h>
 
-#include <new>
-
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -51,7 +49,6 @@
 #endif // TARGET_OS_OSX
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/Darwin/DnssdContexts.cpp b/src/platform/Darwin/DnssdContexts.cpp
index 66dc4c1afae8b2..7dc5956845414f 100644
--- a/src/platform/Darwin/DnssdContexts.cpp
+++ b/src/platform/Darwin/DnssdContexts.cpp
@@ -23,6 +23,8 @@
 
 #include <net/if.h>
 
+#include <string>
+
 using namespace chip::Dnssd;
 using namespace chip::Dnssd::Internal;
 
@@ -476,7 +478,7 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::
     consumerCounter = std::move(consumerCounterToUse);
 }
 
-ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
+ResolveContext::ResolveContext(DiscoverNodeDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
                                const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse) :
     browseThatCausedResolve(nullptr)
 {
@@ -490,10 +492,7 @@ ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::In
 
 ResolveContext::~ResolveContext()
 {
-    if (isSRPTimerRunning)
-    {
-        CancelSRPTimer();
-    }
+    CancelSRPTimerIfRunning();
 }
 
 void ResolveContext::DispatchFailure(const char * errorStr, CHIP_ERROR err)
@@ -524,6 +523,26 @@ void ResolveContext::DispatchSuccess()
     // ChipDnssdResolveNoLongerNeeded don't find us and try to also remove us.
     bool needDelete = MdnsContexts::GetInstance().RemoveWithoutDeleting(this);
 
+    class AutoSelfDeleter
+    {
+    public:
+        AutoSelfDeleter(bool needDelete, ResolveContext * self) : mNeedDelete(needDelete), mSelf(self) {}
+
+        ~AutoSelfDeleter()
+        {
+            if (mNeedDelete)
+            {
+                MdnsContexts::GetInstance().Delete(mSelf);
+            }
+        }
+
+    private:
+        bool mNeedDelete;
+        ResolveContext * mSelf;
+    };
+
+    AutoSelfDeleter selfDeleter(needDelete, this);
+
 #if TARGET_OS_TV
     // On tvOS, prioritize results from en0, en1, ir0 in that order, if those
     // interfaces are present, since those will generally have more up-to-date
@@ -542,12 +561,15 @@ void ResolveContext::DispatchSuccess()
 
     for (auto interfaceIndex : priorityInterfaceIndices)
     {
+        if (interfaceIndex == 0)
+        {
+            // Not actually an interface we have, since if_nametoindex
+            // returned 0.
+            continue;
+        }
+
         if (TryReportingResultsForInterfaceIndex(static_cast<uint32_t>(interfaceIndex)))
         {
-            if (needDelete)
-            {
-                MdnsContexts::GetInstance().Delete(this);
-            }
             return;
         }
     }
@@ -557,24 +579,16 @@ void ResolveContext::DispatchSuccess()
         if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname,
                                                  interface.first.isSRPResult))
         {
-            break;
+            return;
         }
     }
 
-    if (needDelete)
-    {
-        MdnsContexts::GetInstance().Delete(this);
-    }
+    ChipLogError(Discovery, "Successfully finalizing resolve for %s without finding any actual IP addresses.",
+                 instanceName.c_str());
 }
 
 bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, const std::string & hostname, bool isSRPResult)
 {
-    if (interfaceIndex == 0)
-    {
-        // Not actually an interface we have.
-        return false;
-    }
-
     InterfaceKey interfaceKey = { interfaceIndex, hostname, isSRPResult };
     auto & interface          = interfaces[interfaceKey];
     auto & ips                = interface.addresses;
@@ -591,7 +605,7 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde
     auto addresses = Span<Inet::IPAddress>(ips.data(), ips.size());
     if (nullptr == callback)
     {
-        auto delegate = static_cast<CommissioningResolveDelegate *>(context);
+        auto delegate = static_cast<DiscoverNodeDelegate *>(context);
         DiscoveredNodeData nodeData;
         service.ToDiscoveredNodeData(addresses, nodeData);
         delegate->OnNodeDiscovered(nodeData);
@@ -624,12 +638,20 @@ void ResolveContext::SRPTimerExpiredCallback(chip::System::Layer * systemLayer,
 {
     auto sdCtx = static_cast<ResolveContext *>(callbackContext);
     VerifyOrDie(sdCtx != nullptr);
+    sdCtx->isSRPTimerRunning = false;
+
+    ChipLogProgress(Discovery, "SRP resolve timer for %s expired; completing resolve", sdCtx->instanceName.c_str());
     sdCtx->Finalize();
 }
 
-void ResolveContext::CancelSRPTimer()
+void ResolveContext::CancelSRPTimerIfRunning()
 {
-    DeviceLayer::SystemLayer().CancelTimer(SRPTimerExpiredCallback, static_cast<void *>(this));
+    if (isSRPTimerRunning)
+    {
+        DeviceLayer::SystemLayer().CancelTimer(SRPTimerExpiredCallback, static_cast<void *>(this));
+        ChipLogProgress(Discovery, "SRP resolve timer for %s cancelled; resolve timed out", instanceName.c_str());
+        isSRPTimerRunning = false;
+    }
 }
 
 CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey, const struct sockaddr * address)
@@ -653,7 +675,8 @@ CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey, const
 #ifdef CHIP_PROGRESS_LOGGING
     char addrStr[INET6_ADDRSTRLEN];
     ip.ToString(addrStr, sizeof(addrStr));
-    ChipLogProgress(Discovery, "Mdns: %s interface: %" PRIu32 " ip:%s", __func__, interfaceId, addrStr);
+    ChipLogProgress(Discovery, "Mdns: %s instance: %s interface: %" PRIu32 " ip: %s", __func__, instanceName.c_str(), interfaceId,
+                    addrStr);
 #endif // CHIP_PROGRESS_LOGGING
 
     if (ip.IsIPv6LinkLocal() && interfaceId == kDNSServiceInterfaceIndexLocalOnly)
diff --git a/src/platform/Darwin/DnssdImpl.cpp b/src/platform/Darwin/DnssdImpl.cpp
index a6b1fd9cb5a891..4156c7a4bf0924 100644
--- a/src/platform/Darwin/DnssdImpl.cpp
+++ b/src/platform/Darwin/DnssdImpl.cpp
@@ -25,6 +25,8 @@
 #include <lib/support/SafeInt.h>
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <string>
+
 using namespace chip::Dnssd;
 using namespace chip::Dnssd::Internal;
 
@@ -75,6 +77,7 @@ void LogOnFailure(const char * name, DNSServiceErrorType err)
 CHIP_ERROR StartSRPTimer(uint16_t timeoutInMSecs, ResolveContext * ctx)
 {
     VerifyOrReturnValue(ctx != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    ChipLogProgress(Discovery, "Starting timer to wait for possible SRP resolve results for %s", ctx->instanceName.c_str());
     return chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Milliseconds16(timeoutInMSecs),
                                                        ResolveContext::SRPTimerExpiredCallback, static_cast<void *>(ctx));
 }
@@ -269,6 +272,13 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
 
     if (flags & kDNSServiceFlagsMoreComing)
     {
+        // If we now don't need to have a timer while we wait for SRP results, ensure that there is no such
+        // timer running.  Otherwise the timer could fire before we get the rest of the results that flags
+        // say are coming, and trigger a finalize before we have all the data that is already available.
+        if (!sdCtx->shouldStartSRPTimerForResolve)
+        {
+            sdCtx->CancelSRPTimerIfRunning();
+        }
         return;
     }
 
@@ -278,6 +288,7 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
     // we are done. Otherwise start the timer to give the resolve on SRP domain some extra time to complete.
     if (!sdCtx->shouldStartSRPTimerForResolve)
     {
+        ChipLogDetail(Discovery, "No need to start SRP resolve timer for %s; completing resolve", sdCtx->instanceName.c_str());
         sdCtx->Finalize();
     }
     else
@@ -361,8 +372,8 @@ static CHIP_ERROR ResolveWithContext(ResolveContext * sdCtx, uint32_t interfaceI
 static CHIP_ERROR Resolve(ResolveContext * sdCtx, uint32_t interfaceId, chip::Inet::IPAddressType addressType, const char * type,
                           const char * name, const char * domain)
 {
-    ChipLogProgress(Discovery, "Resolve type=%s name=%s interface=%" PRIu32, StringOrNullMarker(type), StringOrNullMarker(name),
-                    interfaceId);
+    ChipLogProgress(Discovery, "Resolve type=%s name=%s domain=%s interface=%" PRIu32, StringOrNullMarker(type),
+                    StringOrNullMarker(name), StringOrNullMarker(domain), interfaceId);
 
     auto err = DNSServiceCreateConnection(&sdCtx->serviceRef);
     VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
@@ -404,7 +415,7 @@ static CHIP_ERROR Resolve(void * context, DnssdResolveCallback callback, uint32_
     return Resolve(sdCtx, interfaceId, addressType, type, name, domain);
 }
 
-static CHIP_ERROR Resolve(CommissioningResolveDelegate * delegate, uint32_t interfaceId, chip::Inet::IPAddressType addressType,
+static CHIP_ERROR Resolve(DiscoverNodeDelegate * delegate, uint32_t interfaceId, chip::Inet::IPAddressType addressType,
                           const char * type, const char * name)
 {
     auto counterHolder = GetCounterHolder(name);
@@ -566,7 +577,7 @@ CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId inte
     return Resolve(context, callback, interfaceId, service->mAddressType, regtype.c_str(), service->mName, domain);
 }
 
-CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId interface, CommissioningResolveDelegate * delegate)
+CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId interface, DiscoverNodeDelegate * delegate)
 {
     VerifyOrReturnError(service != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(IsSupportedProtocol(service->mProtocol), CHIP_ERROR_INVALID_ARGUMENT);
diff --git a/src/platform/Darwin/DnssdImpl.h b/src/platform/Darwin/DnssdImpl.h
index 351926a7705dde..42ae55fdd9d4c0 100644
--- a/src/platform/Darwin/DnssdImpl.h
+++ b/src/platform/Darwin/DnssdImpl.h
@@ -131,7 +131,7 @@ class MdnsContexts
 
 private:
     MdnsContexts() = default;
-    friend class Global<MdnsContexts>;
+    friend Global<MdnsContexts>;
     static Global<MdnsContexts> sInstance;
 
     std::vector<GenericContext *> mContexts;
@@ -274,8 +274,8 @@ struct ResolveContext : public GenericContext
     ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::Inet::IPAddressType cbAddressType,
                    const char * instanceNameToResolve, BrowseContext * browseCausingResolve,
                    std::shared_ptr<uint32_t> && consumerCounterToUse);
-    ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
-                   const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse);
+    ResolveContext(DiscoverNodeDelegate * delegate, chip::Inet::IPAddressType cbAddressType, const char * instanceNameToResolve,
+                   std::shared_ptr<uint32_t> && consumerCounterToUse);
     virtual ~ResolveContext();
 
     void DispatchFailure(const char * errorStr, CHIP_ERROR err) override;
@@ -297,6 +297,12 @@ struct ResolveContext : public GenericContext
      */
     static void SRPTimerExpiredCallback(chip::System::Layer * systemLayer, void * callbackContext);
 
+    /**
+     * @brief Cancels the timer that was started to wait for the resolution on the kSRPDot domain to happen.
+     *
+     */
+    void CancelSRPTimerIfRunning();
+
 private:
     /**
      * Try reporting the results we got on the provided interface index.
@@ -306,12 +312,6 @@ struct ResolveContext : public GenericContext
     bool TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex, const std::string & hostname, bool isSRPResult);
 
     bool TryReportingResultsForInterfaceIndex(uint32_t interfaceIndex);
-
-    /**
-     * @brief Cancels the timer that was started to wait for the resolution on the kSRPDot domain to happen.
-     *
-     */
-    void CancelSRPTimer();
 };
 
 } // namespace Dnssd
diff --git a/src/platform/Darwin/DnssdType.cpp b/src/platform/Darwin/DnssdType.cpp
index 4b810a67ae66e1..919a9b379ee77a 100644
--- a/src/platform/Darwin/DnssdType.cpp
+++ b/src/platform/Darwin/DnssdType.cpp
@@ -18,6 +18,7 @@
 #include "DnssdType.h"
 
 #include <sstream>
+#include <string>
 
 constexpr char kProtocolTcp[] = "._tcp";
 constexpr char kProtocolUdp[] = "._udp";
diff --git a/src/platform/Darwin/DnssdType.h b/src/platform/Darwin/DnssdType.h
index c5904beaf03ef4..50154cb1ffa98b 100644
--- a/src/platform/Darwin/DnssdType.h
+++ b/src/platform/Darwin/DnssdType.h
@@ -19,6 +19,7 @@
 
 #include <lib/dnssd/platform/Dnssd.h>
 #include <string.h>
+#include <string>
 
 namespace chip {
 namespace Dnssd {
diff --git a/src/platform/Darwin/PlatformManagerImpl.cpp b/src/platform/Darwin/PlatformManagerImpl.cpp
index d0289f7b7e0a18..b7dc8b681fa8e8 100644
--- a/src/platform/Darwin/PlatformManagerImpl.cpp
+++ b/src/platform/Darwin/PlatformManagerImpl.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <platform/Darwin/DiagnosticDataProviderImpl.h>
+#include <platform/Darwin/PlatformMetricKeys.h>
 #include <platform/PlatformManager.h>
 
 // Include the non-inline definitions for the GenericPlatformManagerImpl<> template,
@@ -39,22 +40,28 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <tracing/metric_event.h>
 
-#import "PlatformMetricKeys.h"
 using namespace chip::Tracing::DarwinPlatform;
 
 namespace chip {
 namespace DeviceLayer {
 
-Global<PlatformManagerImpl> PlatformManagerImpl::sInstance;
+AtomicGlobal<PlatformManagerImpl> PlatformManagerImpl::sInstance;
 
-CHIP_ERROR PlatformManagerImpl::_InitChipStack()
+PlatformManagerImpl::PlatformManagerImpl() :
+    mWorkQueue(dispatch_queue_create("org.csa-iot.matter.workqueue",
+                                     dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL,
+                                                                             QOS_CLASS_USER_INITIATED, QOS_MIN_RELATIVE_PRIORITY)))
 {
-    CHIP_ERROR err;
+    // Tag our queue for IsWorkQueueCurrentQueue()
+    dispatch_queue_set_specific(mWorkQueue, this, this, nullptr);
+    dispatch_suspend(mWorkQueue);
+}
 
+CHIP_ERROR PlatformManagerImpl::_InitChipStack()
+{
     // Initialize the configuration system.
 #if !CHIP_DISABLE_PLATFORM_KVS
-    err = Internal::PosixConfig::Init();
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(Internal::PosixConfig::Init());
 #endif // CHIP_DISABLE_PLATFORM_KVS
 
 #if !CHIP_SYSTEM_CONFIG_USE_LIBEV
@@ -64,8 +71,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
 
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
-    err = Internal::GenericPlatformManagerImpl<PlatformManagerImpl>::_InitChipStack();
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(Internal::GenericPlatformManagerImpl<PlatformManagerImpl>::_InitChipStack());
 
 #if !CHIP_DISABLE_PLATFORM_KVS
     // Now set up our device instance info provider.  We couldn't do that
@@ -74,53 +80,36 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
 #endif // CHIP_DISABLE_PLATFORM_KVS
 
     mStartTime = System::SystemClock().GetMonotonicTimestamp();
-
-exit:
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR PlatformManagerImpl::_StartEventLoopTask()
 {
-    if (mIsWorkQueueSuspended)
-    {
-        mIsWorkQueueSuspended = false;
-        dispatch_resume(mWorkQueue);
-    }
-
+    auto expected = WorkQueueState::kSuspended;
+    VerifyOrReturnError(mWorkQueueState.compare_exchange_strong(expected, WorkQueueState::kRunning), CHIP_ERROR_INCORRECT_STATE);
+    dispatch_resume(mWorkQueue);
     return CHIP_NO_ERROR;
 };
 
 CHIP_ERROR PlatformManagerImpl::_StopEventLoopTask()
 {
-    if (!mIsWorkQueueSuspended && !mIsWorkQueueSuspensionPending)
-    {
-        mIsWorkQueueSuspensionPending = true;
-        if (!IsWorkQueueCurrentQueue())
-        {
-            // dispatch_sync is used in order to guarantee serialization of the caller with
-            // respect to any tasks that might already be on the queue, or running.
-            dispatch_sync(mWorkQueue, ^{
-                dispatch_suspend(mWorkQueue);
-            });
-
-            mIsWorkQueueSuspended         = true;
-            mIsWorkQueueSuspensionPending = false;
-        }
-        else
+    auto expected = WorkQueueState::kRunning;
+    VerifyOrReturnError(mWorkQueueState.compare_exchange_strong(expected, WorkQueueState::kSuspensionPending),
+                        CHIP_ERROR_INCORRECT_STATE);
+
+    // We need to dispatch to the work queue to ensure any currently queued jobs
+    // finish executing. When called from outside the work queue we also need to
+    // wait for them to complete before returning to the caller, so we use
+    // dispatch_sync in that case.
+    (IsWorkQueueCurrentQueue() ? dispatch_async : dispatch_sync)(mWorkQueue, ^{
+        dispatch_suspend(mWorkQueue);
+        mWorkQueueState.store(WorkQueueState::kSuspended);
+        auto * semaphore = mRunLoopSem;
+        if (semaphore != nullptr)
         {
-            // We are called from a task running on our work queue.  Dispatch async,
-            // so we don't deadlock ourselves.  Note that we do have to dispatch to
-            // guarantee that we don't signal the semaphore until we have ensured
-            // that no more tasks will run on the queue.
-            dispatch_async(mWorkQueue, ^{
-                dispatch_suspend(mWorkQueue);
-                mIsWorkQueueSuspended         = true;
-                mIsWorkQueueSuspensionPending = false;
-                dispatch_semaphore_signal(mRunLoopSem);
-            });
+            dispatch_semaphore_signal(semaphore);
         }
-    }
-
+    });
     return CHIP_NO_ERROR;
 }
 
@@ -147,14 +136,9 @@ void PlatformManagerImpl::_Shutdown()
 
 CHIP_ERROR PlatformManagerImpl::_PostEvent(const ChipDeviceEvent * event)
 {
-    if (mWorkQueue == nullptr)
-    {
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
-
     const ChipDeviceEvent eventCopy = *event;
     dispatch_async(mWorkQueue, ^{
-        Impl()->DispatchEvent(&eventCopy);
+        DispatchEvent(&eventCopy);
     });
     return CHIP_NO_ERROR;
 }
@@ -162,32 +146,14 @@ CHIP_ERROR PlatformManagerImpl::_PostEvent(const ChipDeviceEvent * event)
 #if CHIP_STACK_LOCK_TRACKING_ENABLED
 bool PlatformManagerImpl::_IsChipStackLockedByCurrentThread() const
 {
-    // If we have no work queue, or it's suspended, then we assume our caller
-    // knows what they are doing in terms of their own concurrency.
-    return !mWorkQueue || mIsWorkQueueSuspended || IsWorkQueueCurrentQueue();
+    // Assume our caller knows what they are doing in terms of concurrency if the work queue is suspended.
+    return IsWorkQueueCurrentQueue() || mWorkQueueState.load() == WorkQueueState::kSuspended;
 };
 #endif
 
-static int sPlatformManagerKey; // We use pointer to this as key.
-
-dispatch_queue_t PlatformManagerImpl::GetWorkQueue()
-{
-    if (mWorkQueue == nullptr)
-    {
-        mWorkQueue =
-            dispatch_queue_create(CHIP_CONTROLLER_QUEUE,
-                                  dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL,
-                                                                          QOS_CLASS_USER_INITIATED, QOS_MIN_RELATIVE_PRIORITY));
-        dispatch_suspend(mWorkQueue);
-        dispatch_queue_set_specific(mWorkQueue, &sPlatformManagerKey, this, nullptr);
-        mIsWorkQueueSuspended = true;
-    }
-    return mWorkQueue;
-}
-
 bool PlatformManagerImpl::IsWorkQueueCurrentQueue() const
 {
-    return dispatch_get_specific(&sPlatformManagerKey) == this;
+    return dispatch_get_specific(this) == this;
 }
 
 CHIP_ERROR PlatformManagerImpl::StartBleScan(BleScannerDelegate * delegate)
diff --git a/src/platform/Darwin/PlatformManagerImpl.h b/src/platform/Darwin/PlatformManagerImpl.h
index 7f3aba0b1a7b8e..12b515ae83d42f 100644
--- a/src/platform/Darwin/PlatformManagerImpl.h
+++ b/src/platform/Darwin/PlatformManagerImpl.h
@@ -26,10 +26,9 @@
 #include <lib/core/Global.h>
 #include <platform/internal/GenericPlatformManagerImpl.h>
 
+#include <atomic>
 #include <dispatch/dispatch.h>
 
-static constexpr const char * const CHIP_CONTROLLER_QUEUE = "org.csa-iot.matter.framework.controller.workqueue";
-
 namespace chip {
 namespace DeviceLayer {
 
@@ -47,7 +46,7 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
 public:
     // ===== Platform-specific members that may be accessed directly by the application.
 
-    dispatch_queue_t GetWorkQueue();
+    dispatch_queue_t GetWorkQueue() { return mWorkQueue; }
     bool IsWorkQueueCurrentQueue() const;
 
     CHIP_ERROR StartBleScan(BleScannerDelegate * delegate = nullptr);
@@ -80,21 +79,26 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     friend PlatformManager & PlatformMgr(void);
     friend PlatformManagerImpl & PlatformMgrImpl(void);
 
-    static Global<PlatformManagerImpl> sInstance;
+    friend AtomicGlobal<PlatformManagerImpl>;
+    static AtomicGlobal<PlatformManagerImpl> sInstance;
+
+    PlatformManagerImpl();
 
     System::Clock::Timestamp mStartTime = System::Clock::kZero;
 
-    dispatch_queue_t mWorkQueue = nullptr;
-    // Semaphore used to implement blocking behavior in _RunEventLoop.
-    dispatch_semaphore_t mRunLoopSem;
+    dispatch_queue_t mWorkQueue;
 
-    bool mIsWorkQueueSuspended = false;
-    // TODO: mIsWorkQueueSuspensionPending might need to be an atomic and use
-    // atomic ops, if we're worried about calls to StopEventLoopTask() from
-    // multiple threads racing somehow...
-    bool mIsWorkQueueSuspensionPending = false;
+    enum class WorkQueueState
+    {
+        kSuspended,
+        kRunning,
+        kSuspensionPending,
+    };
 
-    inline ImplClass * Impl() { return static_cast<PlatformManagerImpl *>(this); }
+    std::atomic<WorkQueueState> mWorkQueueState = WorkQueueState::kSuspended;
+
+    // Semaphore used to implement blocking behavior in _RunEventLoop.
+    dispatch_semaphore_t mRunLoopSem;
 };
 
 /**
@@ -112,7 +116,7 @@ inline PlatformManager & PlatformMgr(void)
  * Returns the platform-specific implementation of the PlatformManager singleton object.
  *
  * chip applications can use this to gain access to features of the PlatformManager
- * that are specific to the ESP32 platform.
+ * that are specific to the platform.
  */
 inline PlatformManagerImpl & PlatformMgrImpl(void)
 {
diff --git a/src/platform/ESP32/BLEManagerImpl.h b/src/platform/ESP32/BLEManagerImpl.h
index 5cb1421750786a..fc946c9aae3359 100644
--- a/src/platform/ESP32/BLEManagerImpl.h
+++ b/src/platform/ESP32/BLEManagerImpl.h
@@ -30,6 +30,8 @@
 
 #include "sdkconfig.h"
 
+#include <lib/core/Optional.h>
+
 #if CONFIG_BT_BLUEDROID_ENABLED
 
 #include "esp_bt.h"
diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
index 041b8e99612891..d9012d41da58a8 100644
--- a/src/platform/ESP32/CHIPPlatformConfig.h
+++ b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -101,3 +101,9 @@
 #ifdef CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
 #define CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER 1
 #endif // CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
+
+#ifdef CONFIG_BUILD_CHIP_TESTS
+// CHIP tests use APIs that are declared when CONFIG_BUILD_FOR_HOST_UNIT_TEST is enabled
+// Enable CONFIG_BUILD_FOR_HOST_UNIT_TEST when building CHIP test binaries
+#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
+#endif
diff --git a/src/platform/ESP32/ConnectivityManagerImpl.cpp b/src/platform/ESP32/ConnectivityManagerImpl.cpp
index 783ef4b99678be..85146257ebe985 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl.cpp
@@ -47,7 +47,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::app::Clusters::GeneralDiagnostics;
 
 namespace chip {
diff --git a/src/platform/ESP32/ConnectivityManagerImpl_Ethernet.cpp b/src/platform/ESP32/ConnectivityManagerImpl_Ethernet.cpp
index b36c4b8cb273d2..eacf3c41526e5e 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl_Ethernet.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl_Ethernet.cpp
@@ -43,7 +43,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using chip::DeviceLayer::Internal::ESP32Utils;
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
index 5fefcb5490f059..3810862a0f57b6 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
@@ -46,7 +46,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using chip::DeviceLayer::Internal::ESP32Utils;
 
 namespace chip {
diff --git a/src/platform/ESP32/KeyValueStoreManagerImpl.cpp b/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
index 5cd113e3e65c63..6617bb2cb11bf0 100644
--- a/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
+++ b/src/platform/ESP32/KeyValueStoreManagerImpl.cpp
@@ -24,12 +24,12 @@
 #include <platform/ESP32/ScopedNvsHandle.h>
 #include <platform/KeyValueStoreManager.h>
 
-#include <algorithm>
 #include <string.h>
 
 #include "nvs.h"
 #include "nvs_flash.h"
 #include <crypto/CHIPCryptoPAL.h>
+#include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/BytesToHex.h>
 #include <lib/support/CodeUtils.h>
 
diff --git a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
index 9ac41f5d211cbb..b78f6fe757286b 100644
--- a/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
+++ b/src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
@@ -55,7 +55,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
index e83a417359169a..448459d6962b5d 100644
--- a/src/platform/Linux/CHIPLinuxStorage.h
+++ b/src/platform/Linux/CHIPLinuxStorage.h
@@ -35,6 +35,7 @@
 
 #include <mutex>
 #include <platform/Linux/CHIPLinuxStorageIni.h>
+#include <string>
 
 #ifndef FATCONFDIR
 #define FATCONFDIR "/tmp"
diff --git a/src/platform/Linux/CHIPLinuxStorageIni.h b/src/platform/Linux/CHIPLinuxStorageIni.h
index 1c6e564c12bf35..8c308f116bbbc0 100644
--- a/src/platform/Linux/CHIPLinuxStorageIni.h
+++ b/src/platform/Linux/CHIPLinuxStorageIni.h
@@ -29,6 +29,9 @@
 #include <lib/support/ScopedBuffer.h>
 #include <platform/PersistedStorage.h>
 
+#include <map>
+#include <string>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 2a57a99d507976..f7edd474e2d7ea 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -67,7 +67,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::DeviceLayer::Internal;
@@ -209,7 +208,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationConnected()
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
+    if (mWpaSupplicant.state != GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED)
     {
         ChipLogProgress(DeviceLayer, "wpa_supplicant: _IsWiFiStationConnected: interface not connected");
         return false;
@@ -238,7 +237,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned()
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
+    if (mWpaSupplicant.state != GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED)
     {
         ChipLogProgress(DeviceLayer, "wpa_supplicant: _IsWiFiStationProvisioned: interface not connected");
         return false;
@@ -257,7 +256,7 @@ void ConnectivityManagerImpl::_ClearWiFiStationProvision()
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
+    if (mWpaSupplicant.state != GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED)
     {
         ChipLogProgress(DeviceLayer, "wpa_supplicant: _ClearWiFiStationProvision: interface not connected");
         return;
@@ -280,8 +279,8 @@ bool ConnectivityManagerImpl::_CanStartWiFiScan()
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED &&
-        mWpaSupplicant.scanState == GDBusWpaSupplicant::WIFI_SCANNING_IDLE;
+    bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED &&
+        mWpaSupplicant.scanState == GDBusWpaSupplicant::WpaScanningState::IDLE;
 
     return ret;
 }
@@ -507,7 +506,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
     if (iface != nullptr && err == nullptr)
     {
         mWpaSupplicant.iface = iface;
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: connected to wpa_supplicant interface proxy");
 
         g_signal_connect(
@@ -527,7 +526,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
         ChipLogProgress(DeviceLayer, "wpa_supplicant: failed to create wpa_supplicant interface proxy %s: %s",
                         mWpaSupplicant.interfacePath, err ? err->message : "unknown error");
 
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_NOT_CONNECTED;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::NOT_CONNECTED;
     }
 
     // We need to stop auto scan or it will block our network scan.
@@ -584,7 +583,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
                                                                           &err.GetReceiver());
     if (result)
     {
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_GOT_INTERFACE_PATH;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::GOT_INTERFACE_PATH;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface: %s", mWpaSupplicant.interfacePath);
 
         wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus(
@@ -623,7 +622,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
 
         if (result)
         {
-            mWpaSupplicant.state = GDBusWpaSupplicant::WPA_GOT_INTERFACE_PATH;
+            mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::GOT_INTERFACE_PATH;
             ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface: %s", mWpaSupplicant.interfacePath);
 
             Platform::CopyString(sWiFiIfName, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME);
@@ -649,7 +648,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
             ChipLogProgress(DeviceLayer, "wpa_supplicant: failed to create interface %s: %s",
                             CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, error ? error->message : "unknown error");
 
-            mWpaSupplicant.state = GDBusWpaSupplicant::WPA_NO_INTERFACE_PATH;
+            mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::NO_INTERFACE_PATH;
 
             if (mWpaSupplicant.interfacePath)
             {
@@ -676,7 +675,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * prox
     mWpaSupplicant.interfacePath = const_cast<gchar *>(path);
     if (mWpaSupplicant.interfacePath)
     {
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_GOT_INTERFACE_PATH;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::GOT_INTERFACE_PATH;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface added: %s", mWpaSupplicant.interfacePath);
 
         wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus(
@@ -710,7 +709,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * pr
     {
         ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface removed: %s", StringOrNullMarker(path));
 
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_NO_INTERFACE_PATH;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::NO_INTERFACE_PATH;
 
         if (mWpaSupplicant.interfacePath)
         {
@@ -730,7 +729,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * pr
             mWpaSupplicant.bss = nullptr;
         }
 
-        mWpaSupplicant.scanState = GDBusWpaSupplicant::WIFI_SCANNING_IDLE;
+        mWpaSupplicant.scanState = GDBusWpaSupplicant::WpaScanningState::IDLE;
     }
 }
 
@@ -747,7 +746,7 @@ void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * sourceObject, GAsyncRes
     mWpaSupplicant.proxy = wpa_fi_w1_wpa_supplicant1_proxy_new_for_bus_finish(res, &err.GetReceiver());
     if (mWpaSupplicant.proxy != nullptr && err.get() == nullptr)
     {
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_CONNECTED;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::CONNECTED;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: connected to wpa_supplicant proxy");
 
         g_signal_connect(
@@ -773,7 +772,7 @@ void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * sourceObject, GAsyncRes
     {
         ChipLogProgress(DeviceLayer, "wpa_supplicant: failed to create wpa_supplicant proxy %s",
                         err ? err->message : "unknown error");
-        mWpaSupplicant.state = GDBusWpaSupplicant::WPA_NOT_CONNECTED;
+        mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::NOT_CONNECTED;
     }
 }
 
@@ -793,7 +792,7 @@ bool ConnectivityManagerImpl::IsWiFiManagementStarted()
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED;
+    bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED;
 
     return ret;
 }
@@ -1322,7 +1321,7 @@ CHIP_ERROR ConnectivityManagerImpl::CommitConfig()
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
+    if (mWpaSupplicant.state != GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED)
     {
         ChipLogError(DeviceLayer, "wpa_supplicant: CommitConfig: interface proxy not connected");
         return CHIP_ERROR_INCORRECT_STATE;
@@ -1391,7 +1390,7 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(SecurityTypeEnum & secur
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
+    if (mWpaSupplicant.state != GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED)
     {
         ChipLogError(DeviceLayer, "wpa_supplicant: GetWiFiSecurityType: interface proxy not connected");
         return CHIP_ERROR_INCORRECT_STATE;
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index 26d6172ad438eb..ee5978faf6ff70 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -66,25 +66,25 @@ namespace DeviceLayer {
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
 struct GDBusWpaSupplicant
 {
-    enum WpaState
+    enum class WpaState
     {
         INIT,
-        WPA_CONNECTING,
-        WPA_CONNECTED,
-        WPA_NOT_CONNECTED,
-        WPA_NO_INTERFACE_PATH,
-        WPA_GOT_INTERFACE_PATH,
-        WPA_INTERFACE_CONNECTED,
+        CONNECTING,
+        CONNECTED,
+        NOT_CONNECTED,
+        NO_INTERFACE_PATH,
+        GOT_INTERFACE_PATH,
+        INTERFACE_CONNECTED,
     };
 
-    enum WpaScanning
+    enum class WpaScanningState
     {
-        WIFI_SCANNING_IDLE,
-        WIFI_SCANNING,
+        IDLE,
+        SCANNING,
     };
 
-    WpaState state                          = INIT;
-    WpaScanning scanState                   = WIFI_SCANNING_IDLE;
+    WpaState state                          = WpaState::INIT;
+    WpaScanningState scanState              = WpaScanningState::IDLE;
     WpaFiW1Wpa_supplicant1 * proxy          = nullptr;
     WpaFiW1Wpa_supplicant1Interface * iface = nullptr;
     WpaFiW1Wpa_supplicant1BSS * bss         = nullptr;
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index 3802d968d72c94..74f7003676c051 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -761,9 +761,12 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiOverrunCount(uint64_t & overrunCou
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxCount)
 {
-    beaconRxCount = mBeaconRxCount;
-
-    return CHIP_NO_ERROR;
+    if (DeviceLayer::ConnectivityMgrImpl().IsWiFiManagementStarted())
+    {
+        beaconRxCount = mBeaconRxCount;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
diff --git a/src/platform/Linux/DnssdImpl.cpp b/src/platform/Linux/DnssdImpl.cpp
index 2a1873072fbb9e..800064f52157de 100644
--- a/src/platform/Linux/DnssdImpl.cpp
+++ b/src/platform/Linux/DnssdImpl.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <sstream>
 #include <string.h>
+#include <string>
 #include <time.h>
 #include <vector>
 
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
index 846b2db4867154..40bd31ecaeee44 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.cpp
+++ b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -18,7 +18,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
-#include <app/AttributeAccessInterface.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/GLibTypeDeleter.h>
diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
index 374108dad176d1..e9c1a825d35a91 100755
--- a/src/platform/Linux/ThreadStackManagerImpl.h
+++ b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -20,7 +20,6 @@
 #include <memory>
 #include <vector>
 
-#include <app/AttributeAccessInterface.h>
 #include <app/icd/server/ICDServerConfig.h>
 #include <lib/support/ThreadOperationalDataset.h>
 #include <platform/GLibTypeDeleter.h>
diff --git a/src/platform/Linux/bluez/BluezObjectManager.cpp b/src/platform/Linux/bluez/BluezObjectManager.cpp
index 1025dda92cf95f..91a2ffb2bcd929 100644
--- a/src/platform/Linux/bluez/BluezObjectManager.cpp
+++ b/src/platform/Linux/bluez/BluezObjectManager.cpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 #include <string_view>
 
 #include <gio/gio.h>
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.cpp b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
index 2842da85256dad..28a9baa358b33f 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.cpp
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
@@ -65,14 +65,14 @@ CHIP_ERROR ChipDeviceScanner::Init(BluezAdapter1 * adapter, ChipDeviceScannerDel
     mAdapter.reset(reinterpret_cast<BluezAdapter1 *>(g_object_ref(adapter)));
     mDelegate = delegate;
 
-    mScannerState = ChipDeviceScannerState::SCANNER_INITIALIZED;
+    mScannerState = ChipDeviceScannerState::INITIALIZED;
 
     return CHIP_NO_ERROR;
 }
 
 void ChipDeviceScanner::Shutdown()
 {
-    VerifyOrReturn(mScannerState != ChipDeviceScannerState::SCANNER_UNINITIALIZED);
+    VerifyOrReturn(mScannerState != ChipDeviceScannerState::UNINITIALIZED);
 
     StopScan();
 
@@ -86,13 +86,13 @@ void ChipDeviceScanner::Shutdown()
         },
         this);
 
-    mScannerState = ChipDeviceScannerState::SCANNER_UNINITIALIZED;
+    mScannerState = ChipDeviceScannerState::UNINITIALIZED;
 }
 
 CHIP_ERROR ChipDeviceScanner::StartScan()
 {
     assertChipStackLockedByCurrentThread();
-    VerifyOrReturnError(mScannerState != ChipDeviceScannerState::SCANNER_SCANNING, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mScannerState != ChipDeviceScannerState::SCANNING, CHIP_ERROR_INCORRECT_STATE);
 
     mCancellable.reset(g_cancellable_new());
     CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(
@@ -104,7 +104,7 @@ CHIP_ERROR ChipDeviceScanner::StartScan()
         return err;
     }
 
-    mScannerState = ChipDeviceScannerState::SCANNER_SCANNING;
+    mScannerState = ChipDeviceScannerState::SCANNING;
     ChipLogDetail(Ble, "ChipDeviceScanner has started scanning!");
 
     return CHIP_NO_ERROR;
@@ -113,7 +113,7 @@ CHIP_ERROR ChipDeviceScanner::StartScan()
 CHIP_ERROR ChipDeviceScanner::StopScan()
 {
     assertChipStackLockedByCurrentThread();
-    VerifyOrReturnError(mScannerState == ChipDeviceScannerState::SCANNER_SCANNING, CHIP_NO_ERROR);
+    VerifyOrReturnError(mScannerState == ChipDeviceScannerState::SCANNING, CHIP_NO_ERROR);
 
     CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(
         +[](ChipDeviceScanner * self) { return self->StopScanImpl(); }, this);
@@ -124,7 +124,7 @@ CHIP_ERROR ChipDeviceScanner::StopScan()
     }
 
     // Stop scanning and return to initialization state
-    mScannerState = ChipDeviceScannerState::SCANNER_INITIALIZED;
+    mScannerState = ChipDeviceScannerState::INITIALIZED;
 
     ChipLogDetail(Ble, "ChipDeviceScanner has stopped scanning!");
 
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.h b/src/platform/Linux/bluez/ChipDeviceScanner.h
index d3730527589bfc..ead9467fdc29ef 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.h
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.h
@@ -79,7 +79,7 @@ class ChipDeviceScanner : public BluezObjectManagerAdapterNotificationsDelegate
     CHIP_ERROR StopScan();
 
     /// Check if the scanner is active
-    bool IsScanning() const { return mScannerState == ChipDeviceScannerState::SCANNER_SCANNING; }
+    bool IsScanning() const { return mScannerState == ChipDeviceScannerState::SCANNING; }
 
     /// Members that implement virtual methods on BluezObjectManagerAdapterNotificationsDelegate
     void OnDeviceAdded(BluezDevice1 & device) override;
@@ -87,11 +87,11 @@ class ChipDeviceScanner : public BluezObjectManagerAdapterNotificationsDelegate
     void OnDeviceRemoved(BluezDevice1 & device) override {}
 
 private:
-    enum ChipDeviceScannerState
+    enum class ChipDeviceScannerState
     {
-        SCANNER_UNINITIALIZED,
-        SCANNER_INITIALIZED,
-        SCANNER_SCANNING
+        UNINITIALIZED,
+        INITIALIZED,
+        SCANNING
     };
 
     CHIP_ERROR StartScanImpl();
@@ -108,7 +108,7 @@ class ChipDeviceScanner : public BluezObjectManagerAdapterNotificationsDelegate
     GAutoPtr<BluezAdapter1> mAdapter;
 
     ChipDeviceScannerDelegate * mDelegate = nullptr;
-    ChipDeviceScannerState mScannerState  = ChipDeviceScannerState::SCANNER_UNINITIALIZED;
+    ChipDeviceScannerState mScannerState  = ChipDeviceScannerState::UNINITIALIZED;
     GAutoPtr<GCancellable> mCancellable;
 };
 
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h
index a22eb71eb7deb2..4d982acac2bf97 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.h
+++ b/src/platform/Tizen/ConnectivityManagerImpl.h
@@ -28,6 +28,8 @@
 #include <system/SystemClock.h>
 #include <system/SystemLayer.h>
 
+#include <app-common/zap-generated/cluster-enums.h>
+
 #include "platform/internal/GenericConnectivityManagerImpl.h"
 #include "platform/internal/GenericConnectivityManagerImpl_UDP.h"
 #if INET_CONFIG_ENABLE_TCP_ENDPOINT
diff --git a/src/platform/Tizen/DiagnosticDataProviderImpl.h b/src/platform/Tizen/DiagnosticDataProviderImpl.h
index 80dd3ae7b09a2e..c234e23bc885c7 100644
--- a/src/platform/Tizen/DiagnosticDataProviderImpl.h
+++ b/src/platform/Tizen/DiagnosticDataProviderImpl.h
@@ -24,6 +24,8 @@
 
 #include <platform/DiagnosticDataProvider.h>
 
+#include <app-common/zap-generated/cluster-enums.h>
+
 namespace chip {
 namespace DeviceLayer {
 
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.cpp b/src/platform/Tizen/ThreadStackManagerImpl.cpp
index f92676b4d44114..950b6ec300292c 100644
--- a/src/platform/Tizen/ThreadStackManagerImpl.cpp
+++ b/src/platform/Tizen/ThreadStackManagerImpl.cpp
@@ -39,7 +39,6 @@
 #include <thread.h>
 #include <tizen_error.h>
 
-#include <app/AttributeAccessInterface.h>
 #include <inet/IPAddress.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>
diff --git a/src/platform/Tizen/ThreadStackManagerImpl.h b/src/platform/Tizen/ThreadStackManagerImpl.h
index e4b256cfc42d2f..3c0206cfd525fe 100644
--- a/src/platform/Tizen/ThreadStackManagerImpl.h
+++ b/src/platform/Tizen/ThreadStackManagerImpl.h
@@ -28,7 +28,6 @@
 
 #include <thread.h>
 
-#include <app/AttributeAccessInterface.h>
 #include <inet/IPAddress.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>
diff --git a/src/platform/Zephyr/ConnectivityManagerImpl.cpp b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
index c5029f37a67862..17cdf46370f2d2 100644
--- a/src/platform/Zephyr/ConnectivityManagerImpl.cpp
+++ b/src/platform/Zephyr/ConnectivityManagerImpl.cpp
@@ -38,7 +38,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.cpp b/src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.cpp
index 3fefcf709e1b9b..5bef79bb22fdc5 100644
--- a/src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.cpp
+++ b/src/platform/Zephyr/wifi/ConnectivityManagerImplWiFi.cpp
@@ -29,7 +29,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/android/ConnectivityManagerImpl.cpp b/src/platform/android/ConnectivityManagerImpl.cpp
index 390cb5ebb751f9..81fc070880ef33 100644
--- a/src/platform/android/ConnectivityManagerImpl.cpp
+++ b/src/platform/android/ConnectivityManagerImpl.cpp
@@ -46,7 +46,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/android/DnssdImpl.cpp b/src/platform/android/DnssdImpl.cpp
index 5a27b76c7ebae1..b272ed5a712414 100644
--- a/src/platform/android/DnssdImpl.cpp
+++ b/src/platform/android/DnssdImpl.cpp
@@ -219,6 +219,7 @@ CHIP_ERROR ChipDnssdStopBrowse(intptr_t browseIdentifier)
 
     env->CallVoidMethod(sBrowserObject.ObjectRef(), sStopBrowseMethod, reinterpret_cast<jlong>(ctx->callback));
 
+    chip::Platform::Delete(ctx);
     if (env->ExceptionCheck())
     {
         ChipLogError(Discovery, "Java exception in ChipDnssdStopBrowse");
@@ -226,7 +227,6 @@ CHIP_ERROR ChipDnssdStopBrowse(intptr_t browseIdentifier)
         env->ExceptionClear();
         return CHIP_JNI_ERROR_EXCEPTION_THROWN;
     }
-    chip::Platform::Delete(ctx);
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/bouffalolab/common/BLEManagerImpl.h b/src/platform/bouffalolab/common/BLEManagerImpl.h
index d5d571ef7949cd..a0c69fe242372b 100644
--- a/src/platform/bouffalolab/common/BLEManagerImpl.h
+++ b/src/platform/bouffalolab/common/BLEManagerImpl.h
@@ -14,11 +14,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 #pragma once
 
+#include <platform/CHIPDeviceConfig.h>
+
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
+#include <ble/BleLayer.h>
+
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/conn.h>
 #include <bluetooth/gatt.h>
diff --git a/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
index 5679674bc973fb..c6babf25e5f74c 100644
--- a/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
+++ b/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
@@ -53,7 +53,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/cc13xx_26xx/ConnectivityManagerImpl.cpp b/src/platform/cc13xx_26xx/ConnectivityManagerImpl.cpp
index 186f7d82cf590b..c8b3b35d26c42f 100644
--- a/src/platform/cc13xx_26xx/ConnectivityManagerImpl.cpp
+++ b/src/platform/cc13xx_26xx/ConnectivityManagerImpl.cpp
@@ -49,7 +49,6 @@
 #include <lwip/netif.h>
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
index 8e05a4e15a6297..278ad0f1df938c 100644
--- a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *          Provides an implementation of the DiagnosticDataProvider object
- *          for cc13x2 platform.
+ *          for cc13xx platform.
  */
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
diff --git a/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp b/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
index a338e915181ea8..46cb487eece86f 100644
--- a/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
+++ b/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
@@ -19,7 +19,7 @@
 /**
  *    @file
  *          Provides an implementation of the ThreadStackManager object for
- *          CC13X2_26X2 platforms using the Texas Instruments SDK and the
+ *          CC13XX_26XX platforms using the Texas Instruments SDK and the
  *          OpenThread stack.
  *
  */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h
deleted file mode 100644
index 34c517ed1c166b..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- * Provides an implementation of the BLEManager object for the Texas
- * Instruments CC13XX_26XX platform.
- */
-
-#pragma once
-
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#include "FreeRTOS.h"
-#include <queue.h>
-#include <task.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <icall.h>
-#include <icall_ble_api.h>
-
-#include "hal_types.h"
-
-#include "ti_ble_config.h"
-#include "ti_drivers_config.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "chipOBleProfile.h"
-
-namespace chip {
-namespace DeviceLayer {
-namespace Internal {
-
-using namespace chip::Ble;
-
-// Internal Events for RTOS application
-#define ICALL_EVT ICALL_MSG_EVENT_ID  // Event_Id_31
-#define QUEUE_EVT UTIL_QUEUE_EVENT_ID // Event_Id_30
-
-// Application events
-#define BLEManagerIMPL_STATE_UPDATE_EVT (0)
-
-// 500ms interval
-#define BLEMANAGERIMPL_ADV_INT_SLOW (800)
-// 100ms interval (Default)
-#define BLEMANAGERIMPL_ADV_INT_FAST (160)
-
-#define CHIPOBLE_ADV_SIZE_NO_DEVICE_ID_INFO (4)
-
-#define CHIPOBLE_SCANRES_SIZE_NO_NAME (6)
-
-#define CHIPOBLE_ADV_DATA_MAX_SIZE (GAP_DEVICE_NAME_LEN + CHIPOBLE_SCANRES_SIZE_NO_NAME)
-
-#define CHIPOBLE_DEVICE_DESC_LENGTH (4)
-
-// How often to read current current RPA (in ms)
-#define READ_RPA_EVT_PERIOD 3000
-
-// 15 Minute Advertisement CHIP Timeout period
-#define ADV_TIMEOUT (900000)
-
-#define STATE_CHANGE_EVT 0
-#define CHAR_CHANGE_EVT 1
-#define CHIPOBLE_CHAR_CHANGE_EVT 2
-#define BLEManagerIMPL_CHIPOBLE_TX_IND_EVT 3
-#define ADV_EVT 4
-#define PAIR_STATE_EVT 5
-#define PASSCODE_EVT 6
-#define READ_RPA_EVT 7
-#define SEND_PARAM_UPDATE_EVT 8
-#define BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT 9
-#define CONN_EVT 10
-
-// For storing the active connections
-#define RSSI_TRACK_CHNLS 1 // Max possible channels can be GAP_BONDINGS_MAX
-#define MAX_RSSI_STORE_DEPTH 5
-#define INVALID_HANDLE 0xFFFF
-#define RSSI_2M_THRSHLD -30
-#define RSSI_1M_THRSHLD -40
-#define RSSI_S2_THRSHLD -50
-#define RSSI_S8_THRSHLD -60
-#define PHY_NONE LL_PHY_NONE // No PHY set
-#define AUTO_PHY_UPDATE 0xFF
-// Set initial values to maximum, RX is set to max. by default(251 octets, 2120us)
-// Some brand smartphone is essentially needing 251/2120, so we set them here.
-#define BLEMANAGER_SUGGESTED_PDU_SIZE 251 // default is 27 octets(TX)
-#define BLEMANAGER_SUGGESTED_TX_TIME 2120 // default is 328us(TX)
-
-typedef struct
-{
-    uint8_t len;  // data length
-    void * pData; // pointer to message
-} CHIPoBLEIndEvt_t;
-
-typedef struct
-{
-    uint8_t paramId;     // Parameter written
-    uint16_t len;        //  data length
-    uint16_t connHandle; // Active connection which received the write
-} CHIPoBLEProfChgEvt_t;
-
-// App event passed from stack modules. This type is defined by the application
-// since it can queue events to itself however it wants.
-typedef struct
-{
-    uint8_t event; // event type
-    void * pData;  // pointer to message
-} QueuedEvt_t;
-
-// Container to store advertising event data when passing from advertising
-// callback to app event. See the respective event in GapAdvScan_Event_IDs
-// in gap_advertiser.h for the type that pBuf should be cast to.
-typedef struct
-{
-    uint32_t event;
-    void * pBuf;
-} GapAdvEventData_t;
-
-// Container to store information from clock expiration using a flexible array
-// since data is not always needed
-typedef struct
-{
-    uint8_t event;
-    uint8_t data[];
-} ClockEventData_t;
-
-// List element for parameter update and PHY command status lists
-typedef struct
-{
-    List_Elem elem;
-    uint16_t connHandle;
-} ConnHandleEntry_t;
-
-// Connected device information
-typedef struct
-{
-    uint16_t connHandle;          // Connection Handle
-    ClockP_Struct * pUpdateClock; // pointer to clock struct
-    int8_t rssiArr[MAX_RSSI_STORE_DEPTH];
-    uint8_t rssiCntr;
-    int8_t rssiAvg;
-    bool phyCngRq; // Set to true if PHY change request is in progress
-    uint8_t currPhy;
-    uint8_t rqPhy;
-    uint8_t phyRqFailCnt; // PHY change request count
-    bool isAutoPHYEnable; // Flag to indicate auto phy change
-    uint16_t mtu;
-    ClockEventData_t * pParamUpdateEventData;
-} ConnRec_t;
-
-// Container to store passcode data when passing from gapbondmgr callback
-// to app event. See the pfnPairStateCB_t documentation from the gapbondmgr.h
-// header file for more information on each parameter.
-typedef struct
-{
-    uint8_t state;
-    uint16_t connHandle;
-    uint8_t status;
-} PairStateData_t;
-
-// Container to store passcode data when passing from gapbondmgr callback
-// to app event. See the pfnPasscodeCB_t documentation from the gapbondmgr.h
-// header file for more information on each parameter.
-typedef struct
-{
-    uint8_t deviceAddr[B_ADDR_LEN];
-    uint16_t connHandle;
-    uint8_t uiInputs;
-    uint8_t uiOutputs;
-    uint32_t numComparison;
-} PasscodeData_t;
-
-/**
- * Concrete implementation of the BLEManager singleton object for CC13XX_26XX.
- */
-class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePlatformDelegate, private BleApplicationDelegate
-
-{
-    // Allow the BLEManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend BLEManager;
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-private:
-    // ===== Members that implement the BLEManager internal interface.
-
-    CHIP_ERROR _Init(void);
-    void _Shutdown() {}
-    bool _IsAdvertisingEnabled(void);
-    CHIP_ERROR _SetAdvertisingEnabled(bool val);
-    bool _IsAdvertising(void);
-    CHIP_ERROR _SetAdvertisingMode(BLEAdvertisingMode mode);
-    CHIP_ERROR _GetDeviceName(char * buf, size_t bufSize);
-    CHIP_ERROR _SetDeviceName(const char * deviceName);
-    uint16_t _NumConnections(void);
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
-    BleLayer * _GetBleLayer(void);
-
-    // ===== Members that implement virtual methods on BlePlatformDelegate.
-
-    bool SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
-                                 const Ble::ChipBleUUID * charId) override;
-    bool UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
-                                   const Ble::ChipBleUUID * charId) override;
-    bool CloseConnection(BLE_CONNECTION_OBJECT conId) override;
-    uint16_t GetMTU(BLE_CONNECTION_OBJECT conId) const override;
-
-    bool SendIndication(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                        System::PacketBufferHandle pBuf) override;
-    bool SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                          System::PacketBufferHandle pBuf) override;
-    bool SendReadRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                         System::PacketBufferHandle pBuf) override;
-    bool SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQUEST_CONTEXT requestContext, const Ble::ChipBleUUID * svcId,
-                          const Ble::ChipBleUUID * charId) override;
-
-    // ===== Members that implement virtual methods on BleApplicationDelegate.
-
-    void NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId) override;
-
-    const ChipBleUUID chipUUID_CHIPoBLEChar_RX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
-                                                     0x9F, 0x9D, 0x11 } };
-    const ChipBleUUID chipUUID_CHIPoBLEChar_TX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
-                                                     0x9F, 0x9D, 0x12 } };
-
-    friend BLEManager & BLEMgr(void);
-    friend BLEManagerImpl & BLEMgrImpl(void);
-
-    static BLEManagerImpl sInstance;
-
-    /* BLE stack task handle */
-    static TaskHandle_t sBleTaskHndl;
-    // Entity ID globally used to check for source and/or destination of messages
-    static ICall_EntityID sSelfEntity;
-
-    // Event globally used to post local events and pend on system and
-    // local events.
-    static ICall_SyncHandle sSyncEvent;
-    static QueueHandle_t sEventHandlerMsgQueueID;
-    static chipOBleProfileCBs_t CHIPoBLEProfile_CBs;
-    static gapBondCBs_t BLEMgr_BondMgrCBs;
-
-    enum class Flags : uint16_t
-    {
-        kAdvertisingEnabled       = 0x0001, /* App enabled CHIPoBLE advertising */
-        kFastAdvertisingEnabled   = 0x0002, /* App enabled Fash CHIPoBLE advertising */
-        kAdvertising              = 0x0004, /* TI BLE stack actively advertising */
-        kBLEStackInitialized      = 0x0008, /* TI BLE Stack GAP/GATT Intilization complete */
-        kBLEStackAdvInitialized   = 0x0010, /* TI BLE Stack Advertisement Intilization complete */
-        kBLEStackGATTNameUpdate   = 0x0020, /* Trigger TI BLE Stack name update, must be performed prior to adv start */
-        kBLEStackGATTNameSet      = 0x0040, /* Device name has been set externally*/
-        kAdvertisingRefreshNeeded = 0x0080, /* Advertising settings changed and it should be restarted */
-
-    };
-
-    BitFlags<Flags> mFlags;
-    CHIPoBLEServiceMode mServiceMode;
-    char mDeviceName[GAP_DEVICE_NAME_LEN];
-
-    ConnRec_t connList[MAX_NUM_BLE_CONNS];
-    // List to store connection handles for queued param updates
-    List_List paramUpdateList;
-
-    // Advertising handles
-    uint8_t advHandleLegacy;
-    // Address mode
-    GAP_Addr_Modes_t addrMode = DEFAULT_ADDRESS_MODE;
-    // Current Random Private Address
-    uint8_t rpa[B_ADDR_LEN] = { 0 };
-
-    uint8_t mAdvDatachipOBle[CHIPOBLE_ADV_DATA_MAX_SIZE];
-    uint8_t mScanResDatachipOBle[CHIPOBLE_ADV_DATA_MAX_SIZE];
-
-    ClockP_Struct clkRpaRead;
-    ClockP_Struct clkAdvTimeout;
-    // Memory to pass RPA read event ID to clock handler
-    ClockEventData_t argRpaRead = { .event = READ_RPA_EVT };
-
-    // ===== Private BLE Stack Helper functions.
-    void ConfigureAdvertisements(void);
-    void EventHandler_init(void);
-    void InitPHYRSSIArray(void);
-    CHIP_ERROR CreateEventHandler(void);
-    uint8_t ProcessStackEvent(ICall_Hdr * pMsg);
-    void ProcessEvtHdrMsg(QueuedEvt_t * pMsg);
-    void ProcessGapMessage(gapEventHdr_t * pMsg);
-    uint8_t ProcessGATTMsg(gattMsgEvent_t * pMsg);
-    void ProcessAdvEvent(GapAdvEventData_t * pEventData);
-    CHIP_ERROR ProcessParamUpdate(uint16_t connHandle);
-    status_t EnqueueEvtHdrMsg(uint8_t event, void * pData);
-    uint8_t AddBLEConn(uint16_t connHandle);
-    uint8_t RemoveBLEConn(uint16_t connHandle);
-    uint8_t GetBLEConnIndex(uint16_t connHandle) const;
-    uint8_t ClearBLEConnListEntry(uint16_t connHandle);
-    void ClearPendingBLEParamUpdate(uint16_t connHandle);
-    void UpdateBLERPA(void);
-
-    static void HandleIncomingBleConnection(Ble::BLEEndPoint * bleEP);
-
-    /* Static helper function */
-    static void EventHandler(void * arg);
-    static CHIP_ERROR DriveBLEState(void);
-
-    /* Declared static to acquire function ptr */
-    static void advCallback(uint32_t event, void * pBuf, uintptr_t arg);
-    static void ClockHandler(uintptr_t arg);
-    static void AdvTimeoutHandler(uintptr_t arg);
-    static void FastAdvTimeoutHandler(uintptr_t arg);
-    static void CHIPoBLEProfile_charValueChangeCB(uint8_t paramId, uint16_t len, uint16_t connHandle);
-    static void PasscodeCb(uint8_t * pDeviceAddr, uint16_t connHandle, uint8_t uiInputs, uint8_t uiOutputs, uint32_t numComparison);
-    static void PairStateCb(uint16_t connHandle, uint8_t state, uint8_t status);
-    static void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-};
-
-/**
- * Returns a reference to the public interface of the BLEManager singleton object.
- *
- * Internal components should use this to access features of the BLEManager object
- * that are common to all platforms.
- */
-inline BLEManager & BLEMgr(void)
-{
-    return BLEManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the BLEManager singleton object.
- *
- * Internal components can use this to gain access to features of the BLEManager
- * that are specific to the CC13XX_26XX platforms.
- */
-inline BLEManagerImpl & BLEMgrImpl(void)
-{
-    return BLEManagerImpl::sInstance;
-}
-
-inline BleLayer * BLEManagerImpl::_GetBleLayer()
-{
-    return this;
-}
-
-} // namespace Internal
-} // namespace DeviceLayer
-} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
deleted file mode 100644
index e0005c9fb2b9dd..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2021 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("../factory_data_config.gni")
-
-assert(chip_device_platform == "cc13x2_26x2")
-
-if (chip_enable_openthread) {
-  import("//build_overrides/openthread.gni")
-}
-
-static_library("cc13x2_26x2") {
-  sources = [
-    "../../FreeRTOS/SystemTimeSupport.cpp",
-    "../../SingletonConfigurationManager.cpp",
-    "../CC13XX_26XXConfig.cpp",
-    "../CC13XX_26XXConfig.h",
-    "../ConfigurationManagerImpl.cpp",
-    "../ConnectivityManagerImpl.cpp",
-    "../DiagnosticDataProviderImpl.cpp",
-    "../DiagnosticDataProviderImpl.h",
-    "../KeyValueStoreManagerImpl.cpp",
-    "../Logging.cpp",
-    "../PlatformManagerImpl.cpp",
-    "../Random.c",
-    "BlePlatformConfig.h",
-    "CHIPDevicePlatformConfig.h",
-    "CHIPDevicePlatformEvent.h",
-    "ConnectivityManagerImpl.h",
-    "InetPlatformConfig.h",
-    "KeyValueStoreManagerImpl.h",
-    "PlatformManagerImpl.h",
-    "SystemPlatformConfig.h",
-  ]
-
-  deps = [ "${chip_root}/src/platform/logging:headers" ]
-
-  public = [
-    "${chip_root}/src/credentials/CHIPCert.h",
-    "${chip_root}/src/credentials/CertificationDeclaration.h",
-    "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h",
-  ]
-
-  public_deps = [
-    "${chip_root}/src/crypto",
-    "${chip_root}/src/platform:platform_base",
-  ]
-
-  if (chip_enable_ble) {
-    sources += [
-      "../BLEManagerImpl.cpp",
-      "BLEManagerImpl.h",
-    ]
-  }
-
-  if (custom_factory_data) {
-    sources += [
-      "../FactoryDataProvider.cpp",
-      "../FactoryDataProvider.h",
-    ]
-  }
-  if (chip_enable_ota_requestor) {
-    sources += [
-      # this needs to be in the final link to place the data correctly
-      # see ${chip_root}/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
-      #"oad_image_header.c",
-      "OTAImageProcessorImpl.cpp",
-    ]
-  }
-
-  if (chip_enable_openthread) {
-    # needed for MTD/FTD
-    import("//build_overrides/ti_simplelink_sdk.gni")
-    import("${ti_simplelink_sdk_build_root}/ti_simplelink_board.gni")
-    public_deps += [
-      "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2",
-      "${chip_root}/third_party/ti_simplelink_sdk:mbedtls",
-      "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sdk",
-      "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sysconfig",
-    ]
-
-    if (chip_openthread_ftd) {
-      public_deps +=
-          [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-    } else {
-      public_deps +=
-          [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-    }
-
-    sources += [
-      "../../OpenThread/OpenThreadUtils.cpp",
-      "../ThreadStackManagerImpl.cpp",
-      "ThreadStackManagerImpl.h",
-    ]
-
-    if (chip_mdns == "platform") {
-      sources += [
-        "../../OpenThread/DnssdImpl.cpp",
-        "../../OpenThread/OpenThreadDnssdImpl.cpp",
-        "../../OpenThread/OpenThreadDnssdImpl.h",
-      ]
-      deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
-    }
-  }
-}
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h
deleted file mode 100644
index 8924b62d9b33c6..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the CHIP BLE
- *          Layer for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: Empty because BLE is not enabled, but build defines this file
- *       to be included by the build configuration.
- */
-
-#pragma once
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h
deleted file mode 100644
index 13a5e6900dbb1d..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the chip Device Layer
- *          for the Texas Instruments CC13XX_CC26XX platform.
- */
-
-#pragma once
-
-// ==================== Platform Adaptations ====================
-
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
-
-// ========== Platform-specific Configuration =========
-
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
-#define CHIP_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY 0
-
-// ========== CHIP Platform Configuration =========
-
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (8192)
-
-#define CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE (7168)
-
-#define BLEMANAGER_EVENT_HANDLER_STACK_SIZE (924)
-#define BLEMANAGER_EVENT_HANDLER_PRIORITY (2)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1
-
-// Per 5.2.5.2. Commencement Section of CHIP spec, BLE advertisement is
-// disabled for Locks and Barrier Access Devices.
-#define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0
-#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 0
-
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h
deleted file mode 100644
index f647b595d02990..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Defines platform-specific event types and data for the chip
- *          for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <platform/CHIPDeviceEvent.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Represents platform-specific event information
- */
-struct ChipDevicePlatformEvent final
-{
-};
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h
deleted file mode 100644
index 2a5981d4bbdea6..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for CHIP on
- *          the Texas Instruments CC1352 platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <stdint.h>
-
-// ==================== General Platform Adaptations ====================
-
-#define CHIP_CONFIG_ABORT() abort()
-
-#define CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE uint16_t
-#define CHIP_CONFIG_PERSISTED_STORAGE_ENC_MSG_CNTR_ID 1
-#define CHIP_CONFIG_PERSISTED_STORAGE_MAX_KEY_LENGTH 2
-
-#define CHIP_CONFIG_LIFETIIME_PERSISTED_COUNTER_KEY 0x01
-
-// ==================== Security Adaptations ====================
-
-#define CHIP_CONFIG_SHA256_CONTEXT_SIZE (sizeof(unsigned int) * 76)
-
-// ==================== General Configuration Overrides ====================
-
-#ifndef CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
-#define CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS 8
-#endif // CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
-
-#ifndef CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
-#define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS 8
-#endif // CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
-
-#ifndef CHIP_LOG_FILTERING
-#define CHIP_LOG_FILTERING 0
-#endif // CHIP_LOG_FILTERING
-
-#ifndef CHIP_CONFIG_MAX_INTERFACES
-#define CHIP_CONFIG_MAX_INTERFACES 4
-#endif // CHIP_CONFIG_MAX_INTERFACES
-
-#ifndef CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS
-#define CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS 4
-#endif // CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS
-
-// Limit the number of device admins to ensure enough ressources for handling them
-#ifndef CHIP_CONFIG_MAX_FABRICS
-#define CHIP_CONFIG_MAX_FABRICS 5
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h
deleted file mode 100644
index 17ec853af5e9e0..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Provides an implementation of the ConfigurationManager object
- *          for the Texas Instruments CC1352 platform.
- */
-
-#pragma once
-
-#include <platform/cc13xx_26xx/CC13XX_26XXConfig.h>
-#include <platform/internal/GenericConfigurationManagerImpl.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the ConfigurationManager singleton object for the CC13X2_26X2 platform.
- */
-class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::CC13XX_26XXConfig>
-{
-public:
-    // This returns an instance of this class.
-    static ConfigurationManagerImpl & GetDefaultInstance();
-
-    CHIP_ERROR GetRebootCount(uint32_t & rebootCount);
-    CHIP_ERROR IncreaseBootCount(void);
-    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours);
-    CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours);
-
-private:
-    // ===== Members that implement the ConfigurationManager public interface.
-
-    CHIP_ERROR Init(void) override;
-    CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
-    bool CanFactoryReset(void) override;
-    void InitiateFactoryReset(void) override;
-    CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
-    CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
-
-    // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
-
-    // ===== Members that implement the GenericConfigurationManagerImpl protected interface.
-    CHIP_ERROR ReadConfigValue(Key key, bool & val) override;
-    CHIP_ERROR ReadConfigValue(Key key, uint32_t & val) override;
-    CHIP_ERROR ReadConfigValue(Key key, uint64_t & val) override;
-    CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen) override;
-    CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen) override;
-    CHIP_ERROR WriteConfigValue(Key key, bool val) override;
-    CHIP_ERROR WriteConfigValue(Key key, uint32_t val) override;
-    CHIP_ERROR WriteConfigValue(Key key, uint64_t val) override;
-    CHIP_ERROR WriteConfigValueStr(Key key, const char * str) override;
-    CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen) override;
-    CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen) override;
-    void RunConfigUnitTest(void) override;
-
-    // ===== Private members reserved for use by this class only.
-
-    static void DoFactoryReset(intptr_t arg);
-};
-
-inline CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
-/**
- * Returns the platform-specific implementation of the ConfigurationManager object.
- *
- * Applications can use this to gain access to features of the ConfigurationManager
- * that are specific to the selected platform.
- */
-ConfigurationManager & ConfigurationMgrImpl();
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h
deleted file mode 100644
index 44c0e764b391a7..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-/**
- *    @file
- *          Platform-specific connectivity manager class for the Texas
- *          Instruments CC13XX_26XX platform.
- */
-
-#pragma once
-
-#include <platform/ConnectivityManager.h>
-#include <platform/internal/GenericConnectivityManagerImpl.h>
-#include <platform/internal/GenericConnectivityManagerImpl_UDP.h>
-#if INET_CONFIG_ENABLE_TCP_ENDPOINT
-#include <platform/internal/GenericConnectivityManagerImpl_TCP.h>
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
-#else
-#include <platform/internal/GenericConnectivityManagerImpl_NoBLE.h>
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
-#else
-#include <platform/internal/GenericConnectivityManagerImpl_NoThread.h>
-#endif
-#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the ConnectivityManager singleton object for the CC13XX_26XX platforms.
- */
-class ConnectivityManagerImpl final : public ConnectivityManager,
-                                      public Internal::GenericConnectivityManagerImpl<ConnectivityManagerImpl>,
-                                      public Internal::GenericConnectivityManagerImpl_UDP<ConnectivityManagerImpl>,
-#if INET_CONFIG_ENABLE_TCP_ENDPOINT
-                                      public Internal::GenericConnectivityManagerImpl_TCP<ConnectivityManagerImpl>,
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-                                      public Internal::GenericConnectivityManagerImpl_BLE<ConnectivityManagerImpl>,
-#else
-                                      public Internal::GenericConnectivityManagerImpl_NoBLE<ConnectivityManagerImpl>,
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-                                      public Internal::GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>,
-#else
-                                      public Internal::GenericConnectivityManagerImpl_NoThread<ConnectivityManagerImpl>,
-#endif
-                                      public Internal::GenericConnectivityManagerImpl_NoWiFi<ConnectivityManagerImpl>
-{
-    // Allow the ConnectivityManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class ConnectivityManager;
-
-private:
-    // ===== Members that implement the ConnectivityManager abstract interface.
-
-    CHIP_ERROR _Init(void);
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
-
-    // ===== Members for internal use by the following friends.
-
-    friend ConnectivityManager & ConnectivityMgr(void);
-    friend ConnectivityManagerImpl & ConnectivityMgrImpl(void);
-
-    static ConnectivityManagerImpl sInstance;
-};
-
-/**
- * Returns the public interface of the ConnectivityManager singleton object.
- *
- * chip applications should use this to access features of the ConnectivityManager object
- * that are common to all platforms.
- */
-inline ConnectivityManager & ConnectivityMgr(void)
-{
-    return ConnectivityManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the ConnectivityManager singleton object.
- *
- * chip applications can use this to gain access to features of the ConnectivityManager
- * that are specific to the platform
- */
-inline ConnectivityManagerImpl & ConnectivityMgrImpl(void)
-{
-    return ConnectivityManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h
deleted file mode 100644
index 7e5246c670f2ce..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * FreeRTOS Kernel V10.0.0
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software. If you wish to use our
- * Amazon FreeRTOS name, please do so in a fair use way that does not cause
- * confusion.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
- *
- * 1 tab == 4 spaces!
- */
-
-/******************************************************************************
-    See http://www.freertos.org/a00110.html for an explanation of the
-    definitions contained in this file.
-******************************************************************************/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- * http://www.freertos.org/a00110.html
- *----------------------------------------------------------*/
-
-/* Constants related to the behaviour or the scheduler. */
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
-#define configTICK_RATE_HZ ((TickType_t) 1000)
-#define configUSE_PREEMPTION 1
-#define configUSE_TIME_SLICING 0
-#define configMAX_PRIORITIES (10UL)
-#define configIDLE_SHOULD_YIELD 0
-#define configUSE_16_BIT_TICKS 0 /* Only for 8 and 16-bit hardware. */
-
-/* Constants that describe the hardware and memory usage. */
-#define configCPU_CLOCK_HZ ((unsigned long) 48000000)
-#define configMINIMAL_STACK_SIZE ((unsigned short) 512)
-#define configMAX_TASK_NAME_LEN (12)
-
-/* FreeRTOS heap size is 0 because currently "bget" heap is the
- only heap available, for both FreeRTOS and application */
-// #define configTOTAL_HEAP_SIZE           ( ( size_t ) ( 0 ) )
-#define configTOTAL_HEAP_SIZE ((size_t) (0))
-#define configSUPPORT_STATIC_ALLOCATION 1
-#define configAPPLICATION_ALLOCATED_HEAP 1
-
-/* Default stack size for TI-POSIX threads (in words) */
-#define configPOSIX_STACK_SIZE ((unsigned short) 1024)
-
-/* Constants that build features in or out. */
-#define configUSE_MUTEXES 1
-#define configUSE_TICKLESS_IDLE 1
-#define configUSE_APPLICATION_TASK_TAG 1 /* Need by POSIX/pthread */
-#define configUSE_CO_ROUTINES 0
-#define configUSE_COUNTING_SEMAPHORES 1
-#define configUSE_RECURSIVE_MUTEXES 1
-#define configUSE_QUEUE_SETS 0
-#define configUSE_TASK_NOTIFICATIONS 1
-
-/* Constants that define which hook (callback) functions should be used. */
-#define configUSE_IDLE_HOOK 0
-#define configUSE_TICK_HOOK 0
-#define configUSE_MALLOC_FAILED_HOOK 0
-
-/* Constants provided for debugging and optimisation assistance. */
-#define configCHECK_FOR_STACK_OVERFLOW 2
-#define configASSERT(x)                                                                                                            \
-    if ((x) == 0)                                                                                                                  \
-    {                                                                                                                              \
-        taskDISABLE_INTERRUPTS();                                                                                                  \
-        for (;;)                                                                                                                   \
-            ;                                                                                                                      \
-    }
-#define configQUEUE_REGISTRY_SIZE 0
-
-/* Minimum FreeRTOS tick periods of idle before invoking Power policy */
-/* TODO: find way to reduce this; FreeRTOS requires it to be 2 or more */
-#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 2
-
-/* Software timer definitions. */
-#define configUSE_TIMERS 1
-#define configTIMER_TASK_PRIORITY (6)
-#define configTIMER_QUEUE_LENGTH (20)
-#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE)
-#define configIDLE_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE)
-
-#define configENABLE_BACKWARD_COMPATIBILITY 1
-
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__)
-#include <ti/posix/freertos/PTLS.h>
-#define traceTASK_DELETE(pxTCB) PTLS_taskDeleteHook(pxTCB)
-#elif defined(__IAR_SYSTEMS_ICC__)
-#ifndef __IAR_SYSTEMS_ASM__
-#include <ti/posix/freertos/Mtx.h>
-#define traceTASK_DELETE(pxTCB) Mtx_taskDeleteHook(pxTCB)
-#endif
-#endif
-
-/*
- *  Enable thread local storage
- *
- *  Assign TLS array index ownership here to avoid collisions.
- *  TLS storage is needed to implement thread-safe errno with
- *  TI and IAR compilers. With GNU compiler, we enable newlib.
- */
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__) || defined(__IAR_SYSTEMS_ICC__)
-
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 2
-
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__)
-#define PTLS_TLS_INDEX 0 /* ti.posix.freertos.PTLS */
-#elif defined(__IAR_SYSTEMS_ICC__)
-#define MTX_TLS_INDEX 0 /* ti.posix.freertos.Mtx */
-#endif
-
-#define NDK_TLS_INDEX 1 /* Reserve an index for NDK TLS */
-
-#elif defined(__GNUC__)
-
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 1
-
-#define NDK_TLS_INDEX 0 /* Reserve an index for NDK TLS */
-
-/* note: system locks required by newlib are not implemented */
-#define configUSE_NEWLIB_REENTRANT 1
-#endif
-
-/*
- * Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function.  NOTE:  Setting an INCLUDE_ parameter to 0 is
- * only necessary if the linker does not automatically remove functions that
- * are not referenced anyway.
- */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 0
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_uxTaskGetStackHighWaterMark 1
-#define INCLUDE_xTaskGetIdleTaskHandle 0
-#define INCLUDE_eTaskGetState 1
-#define INCLUDE_xTaskResumeFromISR 0
-#define INCLUDE_xTaskGetCurrentTaskHandle 1
-#define INCLUDE_xTaskGetSchedulerState 1
-#define INCLUDE_xSemaphoreGetMutexHolder 0
-#define INCLUDE_xTimerPendFunctionCall 0
-
-/* Cortex-M3/4 interrupt priority configuration follows...................... */
-
-/* Use the system definition, if there is one. */
-#ifdef __NVIC_PRIO_BITS
-#define configPRIO_BITS __NVIC_PRIO_BITS
-#else
-#define configPRIO_BITS 3 /* 8 priority levels */
-#endif
-
-/*
- * The lowest interrupt priority that can be used in a call to a "set priority"
- * function.
- */
-#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x07
-
-/*
- * The highest interrupt priority that can be used by any interrupt service
- * routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT
- * CALL INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A
- * HIGHER PRIORITY THAN THIS! (higher priorities are lower numeric values.
- */
-#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 1
-
-/*
- * Interrupt priorities used by the kernel port layer itself.  These are generic
- * to all Cortex-M ports, and do not rely on any particular library functions.
- */
-#define configKERNEL_INTERRUPT_PRIORITY (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
-
-/*
- * !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
- * See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html.
- *
- * Priority 1 (shifted 5 since only the top 3 bits are implemented).
- * Priority 1 is the second highest priority.
- * Priority 0 is the highest priority.
- */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
-
-/*
- * The trace facility is turned on to make some functions available for use in
- * CLI commands.
- */
-#define configUSE_TRACE_FACILITY 1
-
-/*
- * Runtime Object View is a Texas Instrument host tool that helps visualize
- * the application. When enabled, the ISR stack will be initialized in the
- * startup_<device>_<compiler>.c file to 0xa5a5a5a5. The stack peak can then
- * be displayed in Runtime Object View.
- */
-#define configENABLE_ISR_STACK_INIT 1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h
deleted file mode 100644
index 21344caa15bc66..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-// ==================== Platform Adaptations ====================
-
-#ifndef INET_CONFIG_ENABLE_IPV4
-#error Inet IPv4 configuration should be configured at build generation time
-#endif
-
-// ========== Platform-specific Configuration Overrides =========
-
-#ifndef INET_CONFIG_NUM_TCP_ENDPOINTS
-#define INET_CONFIG_NUM_TCP_ENDPOINTS 4
-#endif // INET_CONFIG_NUM_TCP_ENDPOINTS
-
-#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
-#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
-#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h
deleted file mode 100644
index 45396e4544b7aa..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Platform-specific key value storage implementation for CC13XX_26XX.
- */
-
-#pragma once
-
-namespace chip {
-namespace DeviceLayer {
-namespace PersistedStorage {
-
-class KeyValueStoreManagerImpl final : public KeyValueStoreManager
-{
-    // Allow the KeyValueStoreManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class KeyValueStoreManager;
-
-public:
-    CHIP_ERROR _Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size = nullptr, size_t offset = 0) const;
-
-    CHIP_ERROR _Delete(const char * key);
-
-    CHIP_ERROR _Put(const char * key, const void * value, size_t value_size);
-
-private:
-    // ===== Members for internal use by the following friends.
-    friend KeyValueStoreManager & KeyValueStoreMgr();
-    friend KeyValueStoreManagerImpl & KeyValueStoreMgrImpl();
-
-    static KeyValueStoreManagerImpl sInstance;
-};
-
-/**
- * Returns the public interface of the KeyValueStoreManager singleton object.
- *
- * Chip applications should use this to access features of the KeyValueStoreManager object
- * that are common to all platforms.
- */
-inline KeyValueStoreManager & KeyValueStoreMgr(void)
-{
-    return KeyValueStoreManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the KeyValueStoreManager singleton object.
- *
- * Chip applications can use this to gain access to features of the KeyValueStoreManager
- * that are specific to the platform.
- */
-inline KeyValueStoreManagerImpl & KeyValueStoreMgrImpl(void)
-{
-    return KeyValueStoreManagerImpl::sInstance;
-}
-
-} // namespace PersistedStorage
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp b/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp
deleted file mode 100644
index 58f3fdcb73c725..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <app/clusters/ota-requestor/OTADownloader.h>
-#include <app/clusters/ota-requestor/OTARequestorInterface.h>
-#include <lib/support/DefaultStorageKeyAllocator.h>
-
-#include "OTAImageProcessorImpl.h"
-
-#include <ti/common/cc26xx/flash_interface/flash_interface.h>
-#include <ti/common/cc26xx/oad/ext_flash_layout.h>
-
-#include <ti_drivers_config.h>
-
-// clang-format off
-/* driverlib header for resetting the SoC */
-#include <ti/devices/DeviceFamily.h>
-#include DeviceFamily_constructPath(driverlib/sys_ctrl.h)
-// clang-format on
-
-using namespace chip::DeviceLayer;
-using namespace chip::DeviceLayer::PersistedStorage;
-
-namespace chip {
-
-CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
-{
-    PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Finalize()
-{
-    PlatformMgr().ScheduleWork(HandleFinalize, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Apply()
-{
-    PlatformMgr().ScheduleWork(HandleApply, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Abort()
-{
-    PlatformMgr().ScheduleWork(HandleAbort, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
-{
-    if (nullptr == mNvsHandle)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    if ((nullptr == block.data()) || block.empty())
-    {
-        return CHIP_ERROR_INVALID_ARGUMENT;
-    }
-
-    // Store block data for HandleProcessBlock to access
-    CHIP_ERROR err = SetBlock(block);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(SoftwareUpdate, "Cannot set block data: %" CHIP_ERROR_FORMAT, err.Format());
-    }
-
-    PlatformMgr().ScheduleWork(HandleProcessBlock, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-bool OTAImageProcessorImpl::IsFirstImageRun()
-{
-    OTARequestorInterface * requestor;
-    uint32_t runningSwVer;
-
-    if (CHIP_NO_ERROR != ConfigurationMgr().GetSoftwareVersion(runningSwVer))
-    {
-        return false;
-    }
-
-    requestor = GetRequestorInstance();
-
-    return (requestor->GetTargetVersion() == runningSwVer) &&
-        (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);
-}
-
-/* DESIGN NOTE: The Boot Image Manager will search external flash for an
- * `ExtImageInfo_t` structure every 4K for 1M. This structure points to where
- * the executable image is in external flash with a uint32_t. It is possible to
- * have multiple images ready to be programmed into the internal flash of the
- * device. This design is only concerned with managing 1 image in external
- * flash starting at `IMG_START` and being defined by a meta header at address
- * 0. Future designs may be able to take advantage of other images for rollback
- * functionality, however this will require a larger external flash chip.
- */
-
-#define IMG_START (4 * EFL_SIZE_META)
-
-static bool readExtFlashImgHeader(NVS_Handle handle, imgFixedHdr_t * header, size_t otaHeaderLen)
-{
-    int_fast16_t status;
-    status = NVS_read(handle, IMG_START + otaHeaderLen, header, sizeof(imgFixedHdr_t));
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-/* makes room for the new block if needed */
-static bool writeExtFlashImgPages(NVS_Handle handle, size_t bytesWritten, MutableByteSpan block)
-{
-    int_fast16_t status;
-    NVS_Attrs regionAttrs;
-    unsigned int erasedSectors;
-    unsigned int neededSectors;
-    size_t sectorSize;
-
-    NVS_getAttrs(handle, &regionAttrs);
-    sectorSize    = regionAttrs.sectorSize;
-    erasedSectors = (bytesWritten + (sectorSize - 1)) / sectorSize;
-    neededSectors = ((bytesWritten + block.size()) + (sectorSize - 1)) / sectorSize;
-    if (neededSectors != erasedSectors)
-    {
-        status = NVS_erase(handle, IMG_START + (erasedSectors * sectorSize), (neededSectors - erasedSectors) * sectorSize);
-        if (status != NVS_STATUS_SUCCESS)
-        {
-            ChipLogError(SoftwareUpdate, "NVS_erase failed status: %d", status);
-            return false;
-        }
-    }
-    status = NVS_write(handle, IMG_START + bytesWritten, block.data(), block.size(), NVS_WRITE_POST_VERIFY);
-    if (status != NVS_STATUS_SUCCESS)
-    {
-        ChipLogError(SoftwareUpdate, "NVS_write failed status: %d", status);
-        return false;
-    }
-    return true;
-}
-
-static bool readExtFlashMetaHeader(NVS_Handle handle, ExtImageInfo_t * header)
-{
-    int_fast16_t status;
-    status = NVS_read(handle, EFL_ADDR_META, header, sizeof(ExtImageInfo_t));
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-static bool eraseExtFlashMetaHeader(NVS_Handle handle)
-{
-    int_fast16_t status;
-    NVS_Attrs regionAttrs;
-    unsigned int sectors;
-
-    NVS_getAttrs(handle, &regionAttrs);
-    /* calculate the number of sectors to erase */
-    sectors = (sizeof(ExtImageInfo_t) + (regionAttrs.sectorSize - 1)) / regionAttrs.sectorSize;
-    status  = NVS_erase(handle, EFL_ADDR_META, sectors * regionAttrs.sectorSize);
-
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-static bool writeExtFlashMetaHeader(NVS_Handle handle, ExtImageInfo_t * header)
-{
-    int_fast16_t status;
-    if (!eraseExtFlashMetaHeader(handle))
-    {
-        return false;
-    }
-    status = NVS_write(handle, EFL_ADDR_META, header, sizeof(ExtImageInfo_t), NVS_WRITE_POST_VERIFY);
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-/**
- * Generated on by pycrc v0.9.2, https://pycrc.org using the configuration:
- *  - Width         = 32
- *  - Poly          = 0x04c11db7
- *  - XorIn         = 0xffffffff
- *  - ReflectIn     = True
- *  - XorOut        = 0xffffffff
- *  - ReflectOut    = True
- *  - Algorithm     = bit-by-bit-fast
- *
- * Modified to take uint32_t as the CRC type
- */
-uint32_t crc_reflect(uint32_t data, size_t data_len)
-{
-    unsigned int i;
-    uint32_t ret;
-
-    ret = data & 0x01;
-    for (i = 1; i < data_len; i++)
-    {
-        data >>= 1;
-        ret = (ret << 1) | (data & 0x01);
-    }
-    return ret;
-}
-
-uint32_t crc_update(uint32_t crc, const void * data, size_t data_len)
-{
-    const unsigned char * d = (const unsigned char *) data;
-    unsigned int i;
-    bool bit;
-    unsigned char c;
-
-    while (data_len--)
-    {
-        c = *d++;
-        for (i = 0x01; i & 0xff; i <<= 1)
-        {
-            bit = crc & 0x80000000;
-            if (c & i)
-            {
-                bit = !bit;
-            }
-            crc <<= 1;
-            if (bit)
-            {
-                crc ^= 0x04c11db7;
-            }
-        }
-        crc &= 0xffffffff;
-    }
-    return crc & 0xffffffff;
-}
-
-static bool validateExtFlashImage(NVS_Handle handle, size_t otaHeaderLen)
-{
-    uint32_t crc;
-    imgFixedHdr_t header;
-    size_t addr, endAddr;
-
-    if (!readExtFlashImgHeader(handle, &header, otaHeaderLen))
-    {
-        return false;
-    }
-
-    /* CRC is calculated after the CRC element of the image header */
-    addr    = IMG_START + otaHeaderLen + IMG_DATA_OFFSET;
-    endAddr = IMG_START + otaHeaderLen + header.len;
-
-    crc = 0xFFFFFFFF;
-
-    while (addr < endAddr)
-    {
-        uint8_t buffer[32];
-        size_t bytesLeft = endAddr - addr;
-        size_t toRead    = (sizeof(buffer) < bytesLeft) ? sizeof(buffer) : bytesLeft;
-
-        if (NVS_STATUS_SUCCESS != NVS_read(handle, addr, buffer, toRead))
-        {
-            return false;
-        }
-
-        crc = crc_update(crc, buffer, toRead);
-
-        addr += toRead;
-    }
-
-    crc = crc_reflect(crc, 32) ^ 0xffffffff;
-
-    return (crc == header.crc32);
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
-{
-    NVS_Handle handle;
-    NVS_Params nvsParams;
-    NVS_Params_init(&nvsParams);
-    handle = NVS_open(CONFIG_NVSEXTERNAL, &nvsParams);
-
-    if (NULL != handle)
-    {
-        eraseExtFlashMetaHeader(handle);
-        NVS_close(handle);
-        return CHIP_NO_ERROR;
-    }
-    return CHIP_NO_ERROR;
-}
-
-void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
-        return;
-    }
-    else if (imageProcessor->mDownloader == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "mDownloader is null");
-        return;
-    }
-
-    if (NULL == imageProcessor->mNvsHandle)
-    {
-        NVS_Params nvsParams;
-        NVS_Params_init(&nvsParams);
-        imageProcessor->mNvsHandle = NVS_open(CONFIG_NVSEXTERNAL, &nvsParams);
-
-        if (NULL == imageProcessor->mNvsHandle)
-        {
-            imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_OPEN_FAILED);
-            return;
-        }
-    }
-
-    if (!eraseExtFlashMetaHeader(imageProcessor->mNvsHandle))
-    {
-        NVS_close(imageProcessor->mNvsHandle);
-        imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_WRITE_FAILED);
-        return;
-    }
-
-    imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
-}
-
-void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
-{
-    ExtImageInfo_t header;
-    auto * imageProcessor    = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    const uint8_t extImgId[] = OAD_EFL_MAGIC;
-
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!readExtFlashImgHeader(imageProcessor->mNvsHandle, &(header.fixedHdr),
-                               imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader)))
-    {
-        return;
-    }
-    // offset in the size of the fixed and variable OTA image headers
-    memcpy(&(header.fixedHdr.imgID), extImgId, sizeof(header.fixedHdr.imgID));
-    header.extFlAddr = IMG_START + imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader);
-    header.counter   = 0x0;
-
-    if (validateExtFlashImage(imageProcessor->mNvsHandle,
-                              imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader)))
-    {
-        // only write the meta header if the crc check passes
-        writeExtFlashMetaHeader(imageProcessor->mNvsHandle, &header);
-    }
-    else
-    {
-        // ensure the external image is not mistaken for a valid image
-        eraseExtFlashMetaHeader(imageProcessor->mNvsHandle);
-    }
-
-    imageProcessor->ReleaseBlock();
-
-    ChipLogProgress(SoftwareUpdate, "OTA image downloaded");
-}
-
-void OTAImageProcessorImpl::HandleApply(intptr_t context)
-{
-    ExtImageInfo_t header;
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!readExtFlashMetaHeader(imageProcessor->mNvsHandle, &header))
-    {
-        return;
-    }
-    header.fixedHdr.imgCpStat = NEED_COPY;
-
-    writeExtFlashMetaHeader(imageProcessor->mNvsHandle, &header);
-
-    // reset SoC to kick BIM
-    SysCtrlSystemReset();
-}
-
-void OTAImageProcessorImpl::HandleAbort(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!eraseExtFlashMetaHeader(imageProcessor->mNvsHandle))
-    {
-        imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_WRITE_FAILED);
-    }
-
-    NVS_close(imageProcessor->mNvsHandle);
-    imageProcessor->ReleaseBlock();
-}
-
-void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
-        return;
-    }
-    else if (imageProcessor->mDownloader == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "mDownloader is null");
-        return;
-    }
-
-    /* Save the fixed size header */
-    if (imageProcessor->mParams.downloadedBytes < sizeof(imageProcessor->mFixedOtaHeader))
-    {
-        uint8_t * header = reinterpret_cast<uint8_t *>(&(imageProcessor->mFixedOtaHeader));
-        if (imageProcessor->mBlock.size() + imageProcessor->mParams.downloadedBytes < sizeof(imageProcessor->mFixedOtaHeader))
-        {
-            // the first block is smaller than the header, somehow
-            memcpy(header + imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock.data(), imageProcessor->mBlock.size());
-        }
-        else
-        {
-            // we have received the whole header, fill it up
-            memcpy(header + imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock.data(),
-                   sizeof(imageProcessor->mFixedOtaHeader) - imageProcessor->mParams.downloadedBytes);
-
-            // update the total size for download tracking
-            imageProcessor->mParams.totalFileBytes = imageProcessor->mFixedOtaHeader.totalSize;
-        }
-    }
-
-    /* chip::OTAImageHeaderParser can be used for processing the variable size header */
-
-    ChipLogDetail(SoftwareUpdate, "Write block %d, %d", (size_t) imageProcessor->mParams.downloadedBytes,
-                  imageProcessor->mBlock.size());
-    if (!writeExtFlashImgPages(imageProcessor->mNvsHandle, imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock))
-    {
-        imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
-        return;
-    }
-
-    imageProcessor->mParams.downloadedBytes += imageProcessor->mBlock.size();
-    imageProcessor->mDownloader->FetchNextData();
-}
-
-CHIP_ERROR OTAImageProcessorImpl::SetBlock(ByteSpan & block)
-{
-    if (block.empty())
-    {
-        ReleaseBlock();
-        return CHIP_NO_ERROR;
-    }
-    if (mBlock.size() < block.size())
-    {
-        if (!mBlock.empty())
-        {
-            ReleaseBlock();
-        }
-        uint8_t * mBlock_ptr = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(block.size()));
-        if (mBlock_ptr == nullptr)
-        {
-            return CHIP_ERROR_NO_MEMORY;
-        }
-        mBlock = MutableByteSpan(mBlock_ptr, block.size());
-    }
-    CHIP_ERROR err = CopySpanToMutableSpan(block, mBlock);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(SoftwareUpdate, "Cannot copy block data: %" CHIP_ERROR_FORMAT, err.Format());
-        return err;
-    }
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ReleaseBlock()
-{
-    if (mBlock.data() != nullptr)
-    {
-        chip::Platform::MemoryFree(mBlock.data());
-    }
-
-    mBlock = MutableByteSpan();
-    return CHIP_NO_ERROR;
-}
-
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h
deleted file mode 100644
index 0cf7ea893b6634..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Provides an implementation of the PlatformManager object.
- */
-
-#pragma once
-
-#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the PlatformManager singleton object for the
- * CC13XX_26XX platform.
- */
-class PlatformManagerImpl final : public PlatformManager, public Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>
-{
-    // Allow the PlatformManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend PlatformManager;
-
-    // Allow the generic implementation base class to call helper methods on
-    // this class.
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-    friend Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>;
-#endif
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-    System::Clock::Timestamp GetStartTime() { return mStartTime; }
-
-private:
-    // ===== Methods that implement the PlatformManager abstract interface.
-
-    CHIP_ERROR _InitChipStack(void);
-    void _Shutdown(void);
-
-    // ===== Members for internal use by the following friends.
-
-    friend PlatformManager & PlatformMgr(void);
-    friend PlatformManagerImpl & PlatformMgrImpl(void);
-    friend class Internal::BLEManagerImpl;
-
-    System::Clock::Timestamp mStartTime = System::Clock::kZero;
-
-    static PlatformManagerImpl sInstance;
-
-    using Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::PostEventFromISR;
-};
-
-/**
- * Returns the public interface of the PlatformManager singleton object.
- *
- * chip applications should use this to access features of the PlatformManager
- * object that are common to all platforms.
- */
-inline PlatformManager & PlatformMgr(void)
-{
-    return PlatformManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the PlatformManager
- * singleton object.
- *
- * chip applications can use this to gain access to features of the
- * PlatformManager that are specific to the SoC.
- */
-inline PlatformManagerImpl & PlatformMgrImpl(void)
-{
-    return PlatformManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h
deleted file mode 100644
index 7c3eb4d4d958a4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the CHIP System
- *          Layer
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-
-namespace chip {
-namespace DeviceLayer {
-struct ChipDeviceEvent;
-} // namespace DeviceLayer
-} // namespace chip
-
-// ==================== Platform Adaptations ====================
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
-#define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
-
-// ========== Platform-specific Configuration Overrides =========
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h
deleted file mode 100644
index ff5b5cc34a89e4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    @file
- *          Provides an implementation of the ThreadStackManager object
- *          for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
-
-#include <openthread/tasklet.h>
-#include <openthread/thread.h>
-
-#include <queue.h>
-
-extern "C" void platformAlarmSignal();
-extern "C" void platformAlarmMicroSignal();
-extern "C" void platformRadioSignal(uintptr_t arg);
-extern "C" void platformUartSignal(uintptr_t arg);
-
-namespace chip {
-namespace DeviceLayer {
-
-class ThreadStackManager;
-class ThreadStackManagerImpl;
-
-/**
- * Concrete implementation of the ThreadStackManager singleton object for CC13XX_26XX.
- */
-class ThreadStackManagerImpl final : public ThreadStackManager,
-                                     public Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>,
-                                     public Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>
-{
-    // Allow the ThreadStackManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class ThreadStackManager;
-
-    // Allow the generic implementation base classes to call helper methods on
-    // this class.
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-    friend Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>;
-    friend Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>;
-    friend Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>;
-#endif
-
-    // Allow glue functions called by OpenThread to call helper methods on this
-    // class.
-    friend void ::platformAlarmSignal();
-    friend void ::platformAlarmMicroSignal();
-    friend void ::platformRadioSignal(uintptr_t arg);
-    friend void ::platformUartSignal(uintptr_t arg);
-    friend void ::otTaskletsSignalPending(otInstance * otInst);
-
-    enum procQueueCmd
-    {
-        procQueueCmd_alarm,
-        procQueueCmd_radio,
-        procQueueCmd_tasklets,
-        procQueueCmd_uart,
-        procQueueCmd_alarmu,
-    };
-
-    struct procQueueMsg
-    {
-        enum procQueueCmd cmd;
-        uintptr_t arg;
-    };
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-    using ThreadStackManager::InitThreadStack;
-    CHIP_ERROR InitThreadStack(otInstance * otInst);
-    void _SendProcMessage(procQueueMsg & procMsg);
-    void _ProcMessage(otInstance * aInstance);
-    void GetExtAddress(otExtAddress & aExtAddr);
-    CHIP_ERROR GetBufferInfo(void);
-
-private:
-    // ===== Methods that implement the ThreadStackManager abstract interface.
-
-    CHIP_ERROR _InitThreadStack(void);
-
-    // ===== Members for internal use by the following friends.
-
-    friend ThreadStackManager & ::chip::DeviceLayer::ThreadStackMgr(void);
-    friend ThreadStackManagerImpl & ::chip::DeviceLayer::ThreadStackMgrImpl(void);
-
-    static ThreadStackManagerImpl sInstance;
-
-    static bool IsInitialized();
-
-    // ===== Private members for use by this class only.
-
-    ThreadStackManagerImpl() = default;
-    QueueHandle_t procQueue;
-    QueueHandle_t procQueue_radio;
-};
-
-/**
- * Returns the public interface of the ThreadStackManager singleton object.
- *
- * chip applications should use this to access features of the ThreadStackManager object
- * that are common to all platforms.
- */
-inline ThreadStackManager & ThreadStackMgr(void)
-{
-    return ThreadStackManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the ThreadStackManager singleton object.
- *
- * chip applications can use this to gain access to features of the ThreadStackManager
- * that are specific to SoC.
- */
-inline ThreadStackManagerImpl & ThreadStackMgrImpl(void)
-{
-    return ThreadStackManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni b/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni
deleted file mode 100644
index 4ff86939ff74a0..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2020 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/chip.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-# ARM architecture flags will be set based on Device Family
-arm_platform_config =
-    "${ti_simplelink_sdk_build_root}/ti_simplelink_arm_platform_config.gni"
-
-chip_device_platform = "cc13x2_26x2"
-
-mbedtls_target = "${chip_root}/third_party/ti_simplelink_sdk:mbedtls"
-openthread_external_mbedtls = mbedtls_target
-openthread_external_platform =
-    "${ti_simplelink_sdk_build_root}:ti_simplelink_sdk"
-
-lwip_platform = "cc13xx_26xx"
-
-chip_inet_config_enable_ipv4 = false
-
-chip_build_tests = false
-
-openthread_project_core_config_file = "openthread-core-cc13x2_26x2-config.h"
-openthread_core_config_platform_check_file =
-    "openthread-core-cc13x2_26x2-config-check.h"
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c b/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c
deleted file mode 100644
index d69f903ac592b5..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- *  This file contains user configurable variables for the BLE Application.
- *
- */
-
-/*******************************************************************************
- * INCLUDES
- */
-
-#include "ble_user_config.h"
-#include "hal_types.h"
-#ifndef FREERTOS
-#include <ti/sysbios/BIOS.h>
-#endif
-#ifdef SYSCFG
-#include "ti_ble_config.h"
-#else
-#include <gapbondmgr.h>
-#endif
-
-#if defined(AOA_SYSCFG)
-#include "ti_aoa_config.h"
-#endif
-
-#include "ble_overrides.h"
-#include "ti_radio_config.h"
-
-#include <dmm/dmm_rfmap.h>
-
-#include "ecc/ECCROMCC26XX.h"
-
-#include <ti/drivers/AESCCM.h>
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/aesccm/AESCCMCC26XX.h>
-#include <ti/drivers/aesecb/AESECBCC26XX.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-
-#ifdef FREERTOS
-#define Swi_restore SwiP_restore
-#define Swi_disable SwiP_disable
-#include <ti/drivers/dpl/SwiP.h>
-#else
-#include <ti/sysbios/knl/Swi.h>
-#endif
-#include <ti/drivers/TRNG.h>
-#include <ti/drivers/utils/Random.h>
-
-#if !defined(DeviceFamily_CC26X1)
-#include <driverlib/pka.h>
-#include <driverlib/rf_bt5_coex.h>
-#else
-#include <driverlib/rom_ecc.h>
-#endif
-
-/*******************************************************************************
- * MACROS
- */
-
-/*******************************************************************************
- * CONSTANTS
- */
-
-// Tx Power
-#define NUM_TX_POWER_VALUES (RF_BLE_TX_POWER_TABLE_SIZE - 1)
-
-#ifndef SYSCFG
-// Default Tx Power Index
-#if defined(CC13X2P)
-#define DEFAULT_TX_POWER HCI_EXT_TX_POWER_0_DBM
-#else // !CC13X2
-#define DEFAULT_TX_POWER HCI_EXT_TX_POWER_0_DBM
-#endif // CC13X2
-#endif // SYSCFG
-
-// Override NOP
-#define OVERRIDE_NOP 0xC0000001
-
-/*******************************************************************************
- * TYPEDEFS
- */
-
-/*******************************************************************************
- * LOCAL VARIABLES
- */
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
-
-void driverTable_fnSpinlock(void);
-
-/*******************************************************************************
- * GLOBAL VARIABLES
- */
-
-// Tx Power Table
-txPwrTbl_t appTxPwrTbl = { (txPwrVal_t *) RF_BLE_txPowerTable,
-                           NUM_TX_POWER_VALUES, // max
-                           DEFAULT_TX_POWER };  // default
-
-#if defined(CC13X2P) && defined(CC13X2P_2_LAUNCHXL)
-
-// Tx Power Backoff Values (txPwrBackoff1MPhy,txPwrBackoff2MPhy ,txPwrBackoffCoded)
-const txPwrBackoffVal_t TxPowerBackoffTable[] = {
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 0
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 1
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 2
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 3
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 4
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 5
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 6
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 7
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 8
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 9
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 10
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 11
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 12
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 13
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 14
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 15
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 16
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 17
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 18
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 19
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 20
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 21
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 22
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 23
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 24
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 25
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 26
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 27
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 28
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 29
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 30
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 31
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 32
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 33
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_17_DBM_P4_9_DBM, HCI_EXT_TX_POWER_P2_20_DBM },  // max tx power for channel 34
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_18_DBM_P4_10_DBM, HCI_EXT_TX_POWER_P2_20_DBM }, // max tx power for channel 35
-    { HCI_EXT_TX_POWER_P2_19_DBM, HCI_EXT_TX_POWER_P2_18_DBM_P4_10_DBM, HCI_EXT_TX_POWER_P2_20_DBM }, // max tx power for channel 36
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 37
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 38
-    { HCI_EXT_TX_POWER_P2_14_DBM_P4_6_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM }
-}; // max tx power for channel 39
-
-txPwrBackoffTbl_t appTxPwrBackoffTbl = { TxPowerBackoffTable };
-
-#endif // defined(CC13X2P) && defined(CC13X2P_2_LAUNCHXL)
-
-#if !defined(AOA_SYSCFG)
-// Antenna board configurations (example for a 12-antenna board)
-// Maximum number of antennas
-#define ANTENNA_TABLE_SIZE 12
-// BitMask of all the relevant GPIOs which needed for the antennas
-#define ANTENNA_IO_MASK BV(27) | BV(28) | BV(29) | BV(30)
-
-// Antenna GPIO configuration (should be adapted to the antenna board design)
-antennaIOEntry_t antennaTbl[ANTENNA_TABLE_SIZE] = {
-    0,                        // antenna 0 GPIO configuration (all GPIOs in ANTENNA_IO_MASK are LOW)
-    BV(28),                   // antenna 1
-    BV(29),                   // antenna 2
-    BV(28) | BV(29),          // antenna 3
-    BV(30),                   // antenna 4
-    BV(28) | BV(30),          // antenna 5
-    BV(27),                   // antenna 6
-    BV(27) | BV(28),          // antenna 7
-    BV(27) | BV(29),          // antenna 8
-    BV(27) | BV(28) | BV(29), // antenna 9
-    BV(27) | BV(30),          // antenna 10
-    BV(27) | BV(28) | BV(30)  // antenna 11
-};
-
-#endif //! defined(AOA_SYSCFG)
-
-// Antenna properties passes to the stack
-cteAntProp_t appCTEAntProp = { ANTENNA_IO_MASK, ANTENNA_TABLE_SIZE, antennaTbl };
-
-#if !defined(DeviceFamily_CC26X1)
-ECCParams_CurveParams eccParams_NISTP256 = { .curveType  = ECCParams_CURVE_TYPE_SHORT_WEIERSTRASS_AN3,
-                                             .length     = NISTP256_PARAM_SIZE_BYTES,
-                                             .prime      = NISTP256_prime.byte,
-                                             .order      = NISTP256_order.byte,
-                                             .a          = NISTP256_a.byte,
-                                             .b          = NISTP256_b.byte,
-                                             .generatorX = NISTP256_generator.x.byte,
-                                             .generatorY = NISTP256_generator.y.byte,
-                                             .cofactor   = 1 };
-#else
-ECCParams_CurveParams eccParams_NISTP256 = { .curveType  = ECCParams_CURVE_TYPE_SHORT_WEIERSTRASS_AN3,
-                                             .length     = ECC_NISTP256_PARAM_LENGTH_BYTES,
-                                             .prime      = ECC_NISTP256_prime.byte,
-                                             .order      = ECC_NISTP256_order.byte,
-                                             .a          = ECC_NISTP256_a.byte,
-                                             .b          = ECC_NISTP256_b.byte,
-                                             .generatorX = ECC_NISTP256_generatorX.byte,
-                                             .generatorY = ECC_NISTP256_generatorY.byte,
-                                             .cofactor   = 1 };
-#endif
-
-#if defined(USE_COEX)
-// 2 structures generated by the sysconfig RF for coexistence configuration
-extern rfCoreHal_bleCoExConfig_t coexConfig;
-extern RF_CoexOverride_BLEUseCases coexConfigBle;
-// from coexConfig struct we will get the coex enable and coex type (3 or 1 wire)
-// from coexConfigBle struct we will get the priority and rx request per use case:
-// initiator, connected, Broadcaster and Observer.
-coexUseCaseConfig_t coexSysConfig = { &coexConfig, &coexConfigBle };
-#endif
-
-#ifdef ICALL_JT
-#include <icall.h>
-
-// RF Driver API Table
-rfDrvTblPtr_t rfDriverTableBLE[] = {
-    (uint32) RF_open,
-    (uint32) driverTable_fnSpinlock, // RF_close
-#ifdef RF_SINGLEMODE
-    (uint32) RF_postCmd,
-#else                                // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_postCmd
-#endif                               // RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_pendCmd
-#ifdef RF_SINGLEMODE
-    (uint32) RF_runCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_runCmd
-#endif // RF_SINGLEMODE
-    (uint32) RF_cancelCmd,
-    (uint32) RF_flushCmd,
-    (uint32) driverTable_fnSpinlock, // RF_yield
-    (uint32) RF_Params_init,
-    (uint32) RF_runImmediateCmd,
-    (uint32) RF_runDirectCmd,
-    (uint32) RF_ratCompare,
-    (uint32) driverTable_fnSpinlock, // RF_ratCapture
-    (uint32) RF_ratDisableChannel,
-    (uint32) RF_getCurrentTime,
-    (uint32) RF_getRssi,
-    (uint32) RF_getInfo,
-    (uint32) RF_getCmdOp,
-    (uint32) RF_control,
-    (uint32) driverTable_fnSpinlock, // RF_getTxPower
-    (uint32) RF_setTxPower,          // RF_setTxPower
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findPowerLevel
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findValue
-#ifndef RF_SINGLEMODE
-    (uint32) RF_scheduleCmd,
-    (uint32) RF_runScheduleCmd,
-    (uint32) driverTable_fnSpinlock, // RF_requestAccess
-#endif                               // !RF_SINGLEMODE
-};
-
-cryptoDrvTblPtr_t cryptoDriverTableBLE[] = { (uint32) AESCCM_init,
-                                             (uint32) AESCCM_open,
-                                             (uint32) AESCCM_close,
-                                             (uint32) AESCCM_Params_init,
-                                             (uint32) AESCCM_Operation_init,
-                                             (uint32) AESCCM_oneStepEncrypt,
-                                             (uint32) AESCCM_oneStepDecrypt,
-                                             (uint32) AESECB_init,
-                                             (uint32) AESECB_open,
-                                             (uint32) AESECB_close,
-                                             (uint32) AESECB_Params_init,
-                                             (uint32) AESECB_Operation_init,
-                                             (uint32) AESECB_oneStepEncrypt,
-                                             (uint32) AESECB_oneStepDecrypt,
-                                             (uint32) CryptoKeyPlaintext_initKey,
-                                             (uint32) CryptoKeyPlaintext_initBlankKey };
-
-// Swi APIs needed by BLE controller
-rtosApiTblPtr_t rtosApiTable[] = { (uint32_t) Swi_disable, (uint32_t) Swi_restore };
-
-// BLE Stack Configuration Structure
-const stackSpecific_t bleStackConfig = { .maxNumConns                          = MAX_NUM_BLE_CONNS,
-                                         .maxNumPDUs                           = MAX_NUM_PDU,
-                                         .maxPduSize                           = 0,
-                                         .maxNumPSM                            = L2CAP_NUM_PSM,
-                                         .maxNumCoChannels                     = L2CAP_NUM_CO_CHANNELS,
-                                         .maxWhiteListElems                    = MAX_NUM_WL_ENTRIES,
-                                         .maxResolvListElems                   = CFG_MAX_NUM_RL_ENTRIES,
-                                         .pfnBMAlloc                           = &pfnBMAlloc,
-                                         .pfnBMFree                            = &pfnBMFree,
-                                         .rfDriverParams.powerUpDurationMargin = RF_POWER_UP_DURATION_MARGIN,
-                                         .rfDriverParams.inactivityTimeout     = RF_INACTIVITY_TIMEOUT,
-                                         .rfDriverParams.powerUpDuration       = RF_POWER_UP_DURATION,
-                                         .rfDriverParams.pErrCb                = &(RF_ERR_CB),
-                                         .eccParams                            = &eccParams_NISTP256,
-                                         .fastStateUpdateCb                    = NULL,
-                                         .bleStackType                         = 0,
-#ifdef CC2652RB_LAUNCHXL
-                                         .extStackSettings = EXTENDED_STACK_SETTINGS | CC2652RB_OVERRIDE_USED,
-#else
-                                         .extStackSettings = EXTENDED_STACK_SETTINGS,
-#endif
-                                         .maxNumCteBuffers = MAX_NUM_CTE_BUFS };
-
-uint16_t bleUserCfg_maxPduSize = MAX_PDU_SIZE;
-
-#ifdef OSAL_SNV_EXTFLASH
-const extflashDrvTblPtr_t extflashDriverTable[] = { (uint32) ExtFlash_open, (uint32) ExtFlash_close, (uint32) ExtFlash_read,
-                                                    (uint32) ExtFlash_write, (uint32) ExtFlash_erase };
-#endif // OSAL_SNV_EXTFLASH
-
-// Table for Driver can be found in icall_user_config.c
-// if a driver is not to be used, then the pointer shoul dbe set to NULL,
-// for this example, this is done in ble_user_config.h
-const drvTblPtr_t driverTable = {
-    .rfDrvTbl        = rfDriverTableBLE,
-    .eccDrvTbl       = eccDriverTable,
-    .cryptoDrvTbl    = cryptoDriverTableBLE,
-    .trngDrvTbl      = trngDriverTable,
-    .rtosApiTbl      = rtosApiTable,
-    .nvintfStructPtr = &nvintfFncStruct,
-#ifdef OSAL_SNV_EXTFLASH
-    .extflashDrvTbl = extflashDriverTable,
-#endif // OSAL_SNV_EXTFLASH
-};
-
-const boardConfig_t boardConfig = {
-    .rfFeModeBias = RF_FE_MODE_AND_BIAS,
-    .rfRegTbl     = (regOverride_t *) pOverrides_bleCommon,
-    .rfRegTbl1M   = (regOverride_t *) pOverrides_ble1Mbps,
-#if defined(BLE_V50_FEATURES) && (BLE_V50_FEATURES & (PHY_2MBPS_CFG | PHY_LR_CFG))
-    // Currently, no overrides for 2M and Coded, so exclude from build.
-    .rfRegTbl2M    = (regOverride_t *) pOverrides_ble2Mbps,
-    .rfRegTblCoded = (regOverride_t *) pOverrides_bleCoded,
-#endif // PHY_2MBPS_CFG | PHY_LR_CFG
-    .txPwrTbl = &appTxPwrTbl,
-#if defined(CC13X2P)
-#if defined(CC13X2P_2_LAUNCHXL)
-    .txPwrBackoffTbl = &appTxPwrBackoffTbl,
-#else
-    .txPwrBackoffTbl = NULL,
-#endif                                                                 // defined(CC13X2P_2_LAUNCHXL)
-    .rfRegOverrideTxStdTblptr = (regOverride_t *) pOverrides_bleTxStd, // Default PA
-    .rfRegOverrideTx20TblPtr  = (regOverride_t *) pOverrides_bleTx20,  // High power PA
-#endif                                                                 // CC13X2P
-#if defined(RTLS_CTE)
-    .rfRegOverrideCtePtr = (regOverride_t *) (pOverrides_bleCommon + BLE_STACK_OVERRIDES_OFFSET + CTE_OVERRIDES_OFFSET),
-    .cteAntennaPropPtr   = &appCTEAntProp,
-#else
-    .rfRegOverrideCtePtr                                   = NULL,
-    .cteAntennaPropPtr                                     = NULL,
-#endif
-    .privOverrideOffset = BLE_STACK_OVERRIDES_OFFSET + PRIVACY_OVERRIDE_OFFSET,
-#if defined(USE_COEX)
-    .coexUseCaseConfigPtr = &coexSysConfig,
-#else
-    .coexUseCaseConfigPtr                                  = NULL,
-#endif
-};
-
-#else /* !(ICALL_JT) */
-
-// RF Driver API Table
-rfDrvTblPtr_t rfDriverTable[] = {
-    (uint32) RF_open,
-    (uint32) driverTable_fnSpinlock, // RF_close
-#ifdef RF_SINGLEMODE
-    (uint32) RF_postCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_postCmd
-#endif // RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_pendCmd
-#ifdef RF_SINGLEMODE
-    (uint32) RF_runCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_runCmd
-#endif // RF_SINGLEMODE
-    (uint32) RF_cancelCmd,
-    (uint32) RF_flushCmd,
-    (uint32) driverTable_fnSpinlock, // RF_yield
-    (uint32) RF_Params_init,
-    (uint32) RF_runImmediateCmd,
-    (uint32) RF_runDirectCmd,
-    (uint32) RF_ratCompare(uint32) driverTable_fnSpinlock, // RF_ratCapture
-    (uint32) driverTable_fnSpinlock,                       // RF_ratDisableChannel
-    (uint32) RF_getCurrentTime,
-    (uint32) RF_getRssi,
-    (uint32) RF_getInfo,
-    (uint32) RF_getCmdOp,
-    (uint32) RF_control,
-    (uint32) driverTable_fnSpinlock, // RF_getTxPower
-    (uint32) RF_setTxPower,          // RF_setTxPower
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findPowerLevel
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findValue
-#ifndef RF_SINGLEMODE
-    (uint32) RF_scheduleCmd,
-    (uint32) RF_runScheduleCmd,
-    (uint32) driverTable_fnSpinlock // RF_requestAccess
-#endif // !RF_SINGLEMODE
-};
-
-// ECC Driver API Table
-eccDrvTblPtr_t eccDriverTable[] = { (uint32) ECDH_init,
-                                    (uint32) ECDH_Params_init,
-                                    (uint32) ECDH_open,
-                                    (uint32) ECDH_close,
-                                    (uint32) ECDH_OperationGeneratePublicKey_init,
-                                    (uint32) ECDH_OperationComputeSharedSecret_init,
-                                    (uint32) ECDH_generatePublicKey,
-                                    (uint32) ECDH_computeSharedSecret };
-
-// Crypto Driver API Table
-cryptoDrvTblPtr_t cryptoDriverTable[] = { (uint32) AESCCM_init,
-                                          (uint32) AESCCM_open,
-                                          (uint32) AESCCM_close,
-                                          (uint32) AESCCM_Params_init,
-                                          (uint32) AESCCM_Operation_init,
-                                          (uint32) AESCCM_oneStepEncrypt,
-                                          (uint32) AESCCM_oneStepDecrypt,
-                                          (uint32) AESECB_init,
-                                          (uint32) AESECB_open,
-                                          (uint32) AESECB_close,
-                                          (uint32) AESECB_Params_init,
-                                          (uint32) AESECB_Operation_init,
-                                          (uint32) AESECB_oneStepEncrypt,
-                                          (uint32) AESECB_oneStepDecrypt,
-                                          (uint32) CryptoKeyPlaintext_initKey,
-                                          (uint32) CryptoKeyPlaintext_initBlankKey };
-
-trngDrvTblPtr_t trngDriverTable[] = { (uint32) TRNG_init, (uint32) TRNG_open, (uint32) TRNG_generateEntropy, (uint32) TRNG_close };
-
-#endif /* ICALL_JT */
-
-/*******************************************************************************
- * @fn          RegisterAssertCback
- *
- * @brief       This routine registers the Application's assert handler.
- *
- * input parameters
- *
- * @param       appAssertHandler - Application's assert handler.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void RegisterAssertCback(assertCback_t appAssertHandler)
-{
-    appAssertCback = appAssertHandler;
-
-#ifdef EXT_HAL_ASSERT
-    // also set the Assert callback pointer used by halAssertHandlerExt
-    // Note: Normally, this pointer will be intialized by the stack, but in the
-    //       event HAL_ASSERT is used by the Application, we initialize it
-    //       directly here.
-    halAssertCback = appAssertHandler;
-#endif // EXT_HAL_ASSERT
-
-    return;
-}
-
-/*******************************************************************************
- * @fn          driverTable_fnSpinLock
- *
- * @brief       This routine is used to trap calls to unpopulated indexes of
- *              driver function pointer tables.
- *
- * input parameters
- *
- * @param       None.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void driverTable_fnSpinlock(void)
-{
-    volatile uint8 i = 1;
-
-    while (i)
-        ;
-}
-
-/*******************************************************************************
- * @fn          DefaultAssertCback
- *
- * @brief       This is the Application default assert callback, in the event
- *              none is registered.
- *
- * input parameters
- *
- * @param       assertCause    - Assert cause as defined in hal_assert.h.
- * @param       assertSubcause - Optional assert subcause (see hal_assert.h).
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void DefaultAssertCback(uint8 assertCause, uint8 assertSubcause1)
-{
-#ifdef HAL_ASSERT_SPIN
-    driverTable_fnSpinlock();
-#endif // HAL_ASSERT_SPIN
-
-    return;
-}
-
-// Application Assert Callback Function Pointer
-assertCback_t appAssertCback = DefaultAssertCback;
-
-/*******************************************************************************
- */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds
deleted file mode 100644
index e17410132e949f..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last page removed for BIM, CCFG is supplied by that project */
-     FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 
-    FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058
-    /*FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ae000 */
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* interrupt vectors shifted to accomodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x00);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xAA000) (NOLOAD) : AT (0xAA000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds
deleted file mode 100644
index 7424c4c92c7f4c..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last page removed for BIM, CCFG is supplied by that project */
-    /* FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 */
-    /* FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058 */
-    FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ae000
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* BIM header placed at the base of flash by default */
-    PROVIDE (_img_header_base_address =
-        DEFINED(_img_header_base_address) ? _img_header_base_address : 0x0);
- 
-    .oad_image_header (_img_header_base_address) : AT (_img_header_base_address) {
-        KEEP (*(.oad_image_header))
-    } > REGION_TEXT
-
-    /* interrupt vectors shifted to accomodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x100);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xAA000) (NOLOAD) : AT (0xAA000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    /* CCFG is supplied by the BIM project */
-    /*
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-    */
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds
deleted file mode 100644
index 3f0905e0a3135a..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last two pages removed for BIM, Flash Bootloader, and Factory Data. CCFG is supplied by the BIM project */
-    /* FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 */
-    /* FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058 */
-    FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ac000
-    FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_FACTORY_DATA", FLASH_FACTORY_DATA); 
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* BIM header placed at the base of flash by default */
-    PROVIDE (_img_header_base_address =
-        DEFINED(_img_header_base_address) ? _img_header_base_address : 0x0);
- 
-    .oad_image_header (_img_header_base_address) : AT (_img_header_base_address) {
-        KEEP (*(.oad_image_header))
-    } > REGION_TEXT
-
-    /* interrupt vectors shifted to accommodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x100);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /* Define base address for the DAC arrays and struct */
-    PROVIDE (_factory_data_base_address =
-        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xAC000);
-
-    .factory_data(_factory_data_base_address) : AT (_factory_data_base_address) {
-        KEEP (*(.factory_data_struct))
-    } > REGION_FACTORY_DATA 
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xA8000) (NOLOAD) : AT (0xA0000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    /* CCFG is supplied by the BIM project */
-    /*
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-    */
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c
deleted file mode 100644
index 605c8ec8c2db6f..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include "aes_alt.h"
-#include "mbedtls/aes.h"
-
-#if defined(MBEDTLS_AES_ALT)
-
-#include <string.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-
-/*
- * number of active contexts, used for power on/off of the crypto core
- */
-static unsigned int ref_num = 0;
-
-static AESECB_Handle AESECB_handle = NULL;
-
-void mbedtls_aes_init(mbedtls_aes_context * ctx)
-{
-    AESECB_Params AESECBParams;
-
-    if (ref_num == 0)
-    {
-        AESECB_Params_init(&AESECBParams);
-        AESECBParams.returnBehavior = AESECB_RETURN_BEHAVIOR_POLLING;
-        AESECB_handle               = AESECB_open(CONFIG_AESECB_1, &AESECBParams);
-
-        // handle will be NULL if open failed, subsequent calls will fail with a generic HW error
-    }
-    ref_num++;
-}
-
-void mbedtls_aes_free(mbedtls_aes_context * ctx)
-{
-    if (ref_num > 0)
-    {
-        ref_num--;
-        if (ref_num == 0)
-        {
-            AESECB_close(AESECB_handle);
-
-            AESECB_handle = NULL;
-        }
-    }
-
-    memset((void *) ctx, 0x00, sizeof(ctx));
-}
-
-int mbedtls_aes_setkey_enc(mbedtls_aes_context * ctx, const unsigned char * key, unsigned int keybits)
-{
-    int_fast16_t statusCrypto;
-    size_t keylen = keybits / 8U; // 8 bits in a byte
-
-    if (keylen > sizeof(ctx->keyMaterial))
-    {
-        return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH;
-    }
-
-    /* Initialize AES key */
-    memcpy(ctx->keyMaterial, key, keylen);
-    statusCrypto = CryptoKeyPlaintext_initKey(&ctx->cryptoKey, (uint8_t *) ctx->keyMaterial, keylen);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-
-int mbedtls_aes_setkey_dec(mbedtls_aes_context * ctx, const unsigned char * key, unsigned int keybits)
-{
-    int_fast16_t statusCrypto;
-    size_t keylen = keybits / 8U; // 8 bits in a byte
-
-    if (keylen > sizeof(ctx->keyMaterial))
-    {
-        return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH;
-    }
-
-    /* Initialize AES key */
-    statusCrypto = CryptoKeyPlaintext_initKey(&ctx->cryptoKey, (uint8_t *) key, keylen);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-
-int mbedtls_aes_crypt_ecb(mbedtls_aes_context * ctx, int mode, const unsigned char input[16], unsigned char output[16])
-{
-    int statusCrypto;
-    AESECB_Operation operationOneStepEncrypt;
-
-    /* run it through the authentication + encryption, pass the ccmLVal = 2 */
-    AESECB_Operation_init(&operationOneStepEncrypt);
-
-    operationOneStepEncrypt.key         = &ctx->cryptoKey;
-    operationOneStepEncrypt.inputLength = 16;
-    operationOneStepEncrypt.input       = (uint8_t *) input;
-    operationOneStepEncrypt.output      = (uint8_t *) output;
-
-    statusCrypto = AESECB_oneStepEncrypt(AESECB_handle, &operationOneStepEncrypt);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h
deleted file mode 100644
index dd980f4ed50cbf..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_AES_ALT)
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKey.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-    CryptoKey cryptoKey;      /*!<  structure for the AES driver */
-    uint32_t keyMaterial[16]; /*!<  memory for the key bytes used by cryptoKey */
-} mbedtls_aes_context;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_AES_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h
deleted file mode 100644
index 48ec00ec7b3c02..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/*
- *
- * @file cc13x2_26x2-mbedtls-config.h.h
- *
- * @brief MbedTLS configuration header for CHIP
- *
- */
-
-#ifndef CC13X2_26X2_MBEDTLS_CONFIG_H
-#define CC13X2_26X2_MBEDTLS_CONFIG_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/**
- * Enable FreeRTOS threading support
- */
-// #define MBEDTLS_FREERTOS
-// #define MBEDTLS_THREADING_C
-// #define MBEDTLS_THREADING_ALT
-
-/* Enable Hardware Acceleration */
-
-// #define MBEDTLS_AES_ALT
-// #define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
-// #define MBEDTLS_ECDH_GEN_PUBLIC_ALT
-#define MBEDTLS_ECDSA_SIGN_ALT
-#define MBEDTLS_ECDSA_VERIFY_ALT
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_SHA256_ALT
-
-// Thread Joining disabled
-// #define MBEDTLS_ECJPAKE_ALT
-// #define MBEDTLS_ECJPAKE_C
-// #define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-// #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
-
-/**
- * Enable Crypto and Entropy modules
- */
-
-#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
-
-#define MBEDTLS_AES_C
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CMAC_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HMAC_DRBG_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PK_WRITE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_EXPORT_KEYS
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_ERROR_STRERROR_DUMMY
-#define MBEDTLS_HKDF_C
-#define MBEDTLS_X509_CREATE_C
-#define MBEDTLS_X509_CSR_WRITE_C
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_PEM_WRITE_C
-
-#define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_SRV_C
-
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_ECDH_C
-#define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECDSA_DETERMINISTIC
-#define MBEDTLS_OID_C
-#define MBEDTLS_PEM_PARSE_C
-#define MBEDTLS_X509_USE_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_PKCS5_C
-
-#define MBEDTLS_MPI_WINDOW_SIZE 1       /**< Maximum windows size used. */
-#define MBEDTLS_MPI_MAX_SIZE 32         /**< Maximum number of bytes for usable MPIs. */
-#define MBEDTLS_ECP_MAX_BITS 256        /**< Maximum bit size of groups */
-#define MBEDTLS_ECP_WINDOW_SIZE 2       /**< Maximum window size used */
-#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */
-#define MBEDTLS_ENTROPY_MAX_SOURCES 1   /**< Maximum number of sources supported */
-
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-
-#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */
-
-#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
-
-#include "mbedtls/check_config.h"
-
-#endif // CC13X2_26X2_MBEDTLS_CONFIG_H
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c
deleted file mode 100644
index a3074a9c8a2435..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2021 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined MBEDTLS_ECDH_COMPUTE_SHARED_ALT || defined MBEDTLS_ECDH_GEN_PUBLIC_ALT
-
-#include <stdint.h>
-
-#include <mbedtls/bignum.h>
-#include <mbedtls/ecdsa.h>
-#include <mbedtls/platform.h>
-#include <mbedtls/platform_util.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/ecdh/ECDHCC26X2.h>
-
-/* Parameter validation macros based on platform_util.h */
-#define ECDH_VALIDATE_RET(cond) MBEDTLS_INTERNAL_VALIDATE_RET(cond, MBEDTLS_ERR_ECP_BAD_INPUT_DATA)
-#define ECDH_VALIDATE(cond) MBEDTLS_INTERNAL_VALIDATE(cond)
-
-#if defined MBEDTLS_ECDH_GEN_PUBLIC_ALT
-/*
- * Generate public key (restartable version)
- */
-static int ecdh_gen_public_restartable(mbedtls_ecp_group * grp, mbedtls_mpi * d, mbedtls_ecp_point * Q,
-                                       int (*f_rng)(void *, unsigned char *, size_t), void * p_rng,
-                                       mbedtls_ecp_restart_ctx * rs_ctx)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    CryptoKey myPublicKey;
-    ECDH_Config config = { 0 };
-    ECDH_Handle handle = NULL;
-    ECDH_OperationGeneratePublicKey operationGeneratePublicKey;
-    ECDHCC26X2_HWAttrs hwAttrs = { 0 };
-    ECDHCC26X2_Object object   = { 0 };
-
-    if (NULL == q_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDH_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-    CryptoKeyPlaintext_initKey(&myPublicKey, q_buf, (plen * 2U) + 1);
-
-    if (0 != f_rng(p_rng, d_buf, plen))
-    {
-        ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
-        goto cleanup;
-    }
-
-    ECDH_OperationGeneratePublicKey_init(&operationGeneratePublicKey);
-    operationGeneratePublicKey.myPrivateKey = &myPrivateKey;
-    operationGeneratePublicKey.myPublicKey  = &myPublicKey;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationGeneratePublicKey.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDH_STATUS_SUCCESS == ECDH_generatePublicKey(handle, &operationGeneratePublicKey))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
-    }
-
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(d, d_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&(Q->Y), q_buf + 1 + plen, plen));
-
-cleanup:
-    mbedtls_free(q_buf);
-    mbedtls_free(d_buf);
-
-    if (NULL != handle)
-    {
-        ECDH_close(handle);
-    }
-
-    return (ret);
-}
-
-/*
- * Generate public key
- */
-int mbedtls_ecdh_gen_public(mbedtls_ecp_group * grp, mbedtls_mpi * d, mbedtls_ecp_point * Q,
-                            int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    ECDH_VALIDATE_RET(grp != NULL);
-    ECDH_VALIDATE_RET(d != NULL);
-    ECDH_VALIDATE_RET(Q != NULL);
-    ECDH_VALIDATE_RET(f_rng != NULL);
-    return (ecdh_gen_public_restartable(grp, d, Q, f_rng, p_rng, NULL));
-}
-#endif /* MBEDTLS_ECDH_GEN_PUBLIC_ALT */
-
-#if defined MBEDTLS_ECDH_COMPUTE_SHARED_ALT
-/*
- * Compute shared secret (SEC1 3.3.1)
- */
-static int ecdh_compute_shared_restartable(mbedtls_ecp_group * grp, mbedtls_mpi * z, const mbedtls_ecp_point * Q,
-                                           const mbedtls_mpi * d, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng,
-                                           mbedtls_ecp_restart_ctx * rs_ctx)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    CryptoKey theirPublicKey;
-    CryptoKey sharedSecret;
-    ECDH_Config config = { 0 };
-    ECDH_Handle handle = NULL;
-    ECDH_OperationComputeSharedSecret operationComputeSharedSecret;
-    ECDHCC26X2_HWAttrs hwAttrs = { 0 };
-    ECDHCC26X2_Object object   = { 0 };
-
-    if (NULL == q_buf || NULL == s_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDH_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    CryptoKeyPlaintext_initKey(&sharedSecret, s_buf, (2U * plen) + 1);
-
-    /* The driver consumes network byte order. Copy this number and reverse them again. */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(d, d_buf, plen));
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-
-    /* The driver consumes an octet string in network byte order. Copy this
-     * point and reverse them again. */
-    q_buf[0] = 0x04;
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->Y), q_buf + 1 + plen, plen));
-    CryptoKeyPlaintext_initKey(&theirPublicKey, q_buf, (2U * plen) + 1);
-
-    ECDH_OperationComputeSharedSecret_init(&operationComputeSharedSecret);
-    operationComputeSharedSecret.myPrivateKey   = &myPrivateKey;
-    operationComputeSharedSecret.theirPublicKey = &theirPublicKey;
-    operationComputeSharedSecret.sharedSecret   = &sharedSecret;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationComputeSharedSecret.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDH_STATUS_SUCCESS == ECDH_computeSharedSecret(handle, &operationComputeSharedSecret))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
-    }
-
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(z, s_buf + 1, plen));
-
-cleanup:
-    mbedtls_free(q_buf);
-    mbedtls_free(d_buf);
-    mbedtls_free(s_buf);
-
-    if (NULL != handle)
-    {
-        ECDH_close(handle);
-    }
-
-    return (ret);
-}
-
-/*
- * Compute shared secret (SEC1 3.3.1)
- */
-int mbedtls_ecdh_compute_shared(mbedtls_ecp_group * grp, mbedtls_mpi * z, const mbedtls_ecp_point * Q, const mbedtls_mpi * d,
-                                int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    ECDH_VALIDATE_RET(grp != NULL);
-    ECDH_VALIDATE_RET(Q != NULL);
-    ECDH_VALIDATE_RET(d != NULL);
-    ECDH_VALIDATE_RET(z != NULL);
-    return (ecdh_compute_shared_restartable(grp, z, Q, d, f_rng, p_rng, NULL));
-}
-#endif /* MBEDTLS_ECDH_COMPUTE_SHARED_ALT */
-
-#endif /* MBEDTLS_ECDH_COMPUTE_SHARED_ALT || MBEDTLS_ECDH_GEN_PUBLIC_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c
deleted file mode 100644
index 18bb44fd1364e3..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2021 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined MBEDTLS_ECDSA_VERIFY_ALT || defined MBEDTLS_ECDSA_SIGN_ALT
-
-/* NOTE: The TI drivers consume these points and big numbers in network byte
- *       order. This is in contrast to the mbedtls_mpi structures which story
- *       these numbers and points in little endian byte order. This file uses
- *       the mpi functions to re-write the buffers into network byte order.
- */
-
-#include <stdint.h>
-
-#include <mbedtls/bignum.h>
-#include <mbedtls/ecdsa.h>
-#include <mbedtls/platform.h>
-#include <mbedtls/platform_util.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/ecdsa/ECDSACC26X2.h>
-
-#ifdef MBEDTLS_ECDSA_VERIFY_ALT
-
-/*
- * Verify ECDSA signature of hashed message
- */
-int mbedtls_ecdsa_verify(mbedtls_ecp_group * grp, const unsigned char * buf, size_t blen, const mbedtls_ecp_point * Q,
-                         const mbedtls_mpi * r, const mbedtls_mpi * s)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * r_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    CryptoKey theirPublicKey;
-    ECDSA_Config config = { 0 };
-    ECDSA_Handle handle = NULL;
-    ECDSA_OperationVerify operationVerify;
-    ECDSACC26X2_HWAttrs hwAttrs = { 0 };
-    ECDSACC26X2_Object object   = { 0 };
-
-    if (NULL == r_buf || NULL == s_buf || NULL == q_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority     = (1 << 5);
-    hwAttrs.trngIntPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDSA_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    /* The driver consumes an octet string in network byte order. Copy this
-     * point and reverse them again. */
-    q_buf[0] = 0x04;
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->Y), q_buf + 1 + plen, plen));
-    CryptoKeyPlaintext_initKey(&theirPublicKey, q_buf, (2U * plen) + 1);
-
-    /* The driver also consumes the r and s in network byte order. Copy these
-     * buffers and them reverse them again */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(r, r_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(s, s_buf, plen));
-
-    /* prepare the operation */
-    ECDSA_OperationVerify_init(&operationVerify);
-    operationVerify.theirPublicKey = &theirPublicKey;
-    operationVerify.hash           = buf;
-    operationVerify.r              = r_buf;
-    operationVerify.s              = s_buf;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationVerify.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationVerify.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationVerify.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationVerify.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationVerify.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationVerify.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationVerify.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationVerify.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDSA_STATUS_SUCCESS == ECDSA_verify(handle, &operationVerify))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
-    }
-
-cleanup:
-    mbedtls_free(r_buf);
-    mbedtls_free(s_buf);
-    mbedtls_free(q_buf);
-
-    if (NULL != handle)
-    {
-        ECDSA_close(handle);
-    }
-
-    return ret;
-}
-
-#endif /* MBEDTLS_ECDSA_VERIFY_ALT */
-
-#ifdef MBEDTLS_ECDSA_SIGN_ALT
-
-/*
- * Compute ECDSA signature of a hashed message
- */
-int mbedtls_ecdsa_sign(mbedtls_ecp_group * grp, mbedtls_mpi * r, mbedtls_mpi * s, const mbedtls_mpi * d, const unsigned char * buf,
-                       size_t blen, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * r_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    ECDSA_Config config = { 0 };
-    ECDSA_Handle handle = NULL;
-    ECDSA_OperationSign operationSign;
-    ECDSACC26X2_HWAttrs hwAttrs = { 0 };
-    ECDSACC26X2_Object object   = { 0 };
-
-    if (NULL == r_buf || NULL == s_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority     = (1 << 5);
-    hwAttrs.trngIntPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDSA_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    /* The driver consumes numbers in network byte order */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(d, d_buf, plen));
-
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-    ECDSA_OperationSign_init(&operationSign);
-    operationSign.myPrivateKey = &myPrivateKey;
-    operationSign.hash         = buf;
-    operationSign.r            = r_buf;
-    operationSign.s            = s_buf;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationSign.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationSign.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationSign.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationSign.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationSign.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationSign.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationSign.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationSign.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDSA_STATUS_SUCCESS == ECDSA_sign(handle, &operationSign))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
-    }
-
-    /* The driver produces r and s in network byte order. copy into mbedtls mpi
-     * format. This incurs an extra byte reversal when written to ASN1. */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(r, r_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(s, s_buf, plen));
-
-cleanup:
-    mbedtls_free(r_buf);
-    mbedtls_free(s_buf);
-    mbedtls_free(d_buf);
-
-    if (NULL != handle)
-    {
-        ECDSA_close(handle);
-    }
-
-    return ret;
-}
-#endif /* MBEDTLS_ECDSA_SIGN_ALT */
-
-#endif /* defined MBEDTLS_ECDSA_VERIFY_ALT || defined MBEDTLS_ECDSA_SIGN_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c
deleted file mode 100644
index c5668d4e87f830..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c
+++ /dev/null
@@ -1,900 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "mbedtls/ecjpake.h"
-
-#if defined(MBEDTLS_ECJPAKE_ALT)
-#include "ecjpake_alt.h"
-
-#include <string.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/cryptoutils/ecc/ECCParams.h>
-
-/*
- * NOTE: On calling convention in this file.
- *
- * Many of the helper functions in this file take a pointer to a `uint8_t*`,
- * usually called `p`. This is the current working pointer for the input or
- * output buffer. They will also take a pointer to a `uint8_t`, usually called
- * `end`. This is the pointer to the end of the current working buffer. The
- * difference between these two pointers is calculated and used as the current
- * available length of the working buffer. This is checked before anything is
- * written to or read from the buffer. While values are read or written to the
- * data at the pointer pointed at by `p`, the pointer pointed at by `p` is
- * updated to point to the next available value. The callee updates the value
- * of `p` for the caller, almost in the same fashion as strtok.
- *
- * Here is an example:
- * ```
- * static int read_be_uint16(const uint8_t **p,
- *                           const uint8_t *end,
- *                           uint16_t      *value)
- * {
- *     if ((end < *p) || (end - *p < sizeof(uint16_t)))
- *     {
- *         return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
- *     }
- *     *value = ((uint16_t)(*p)[0] << 8) | (*p)[1]);
- *     return (0);
- * }
- *
- * void sample_func(void)
- * {
- *     uint8_t  buffer[4] = {0x01, 0x02, 0x03, 0x04};
- *     uint8_t* p = buffer + sizeof(buffer);
- *     uint8_t* end = buffer + sizeof(buffer);
- *     uint16_t value;
- *
- *     read_be_uint16(&p, end, &value);
- *     // value is now 0x0102
- *     // p points to buffer[2]
- *     read_be_uint16(&p, end, &value);
- *     // value is now 0x0304
- *     // p points to buffer[4] (invalid)
- * }
- */
-
-/*
- * Convert a mbedtls_ecjpake_role to identifier string.
- *
- * depends on the value of the enumeration of mbedtls_ecjpake_role.
- */
-static const char * const ecjpake_id[] = { "client", "server" };
-
-#define ID_MINE (ecjpake_id[ctx->role])
-#define ID_PEER (ecjpake_id[1 - ctx->role])
-
-/*
- * Size of the temporary buffer for ecjpake_hash:
- * 3 EC points plus their length, plus ID and its length (4 + 6 bytes)
- */
-#define ECJPAKE_HASH_BUF_LEN (3 * (4 + MBEDTLS_ECP_MAX_PT_LEN) + 4 + 6)
-
-/**
- * \breif           execute the contents of this macro, save the return in
- *                  `ret` and goto `cleanup` if it is not `0`
- *
- * The internal functions of this file driver are designed to return `0` on
- * success. The caller is expected to have an `int ret` in the translation unit
- * of the call-site, and a target `cleanup`. It is common practice to return
- * `ret` in the caller.
- *
- * ```
- * int example_func(void)
- * {
- *     int ret;
- *     ECJPAKE_ALT_CHK(some_func());
- *
- *     some_other_func();
- *
- * cleanup:
- *     return ret;
- * }
- * ```
- *
- * \param f         code to execute
- */
-#define ECJPAKE_ALT_CHK(f)                                                                                                         \
-    do                                                                                                                             \
-    {                                                                                                                              \
-        if ((ret = f) != 0)                                                                                                        \
-            goto cleanup;                                                                                                          \
-    } while (0)
-
-/**
- * \brief           writes a buffer prepended with a length byte
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param key       the CryptoKey to write
- * \param bin       the source to copy
- * \param len       the length to copy and write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- */
-static int tls_write_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len)
-{
-    if ((end < *p) || ((size_t) (end - *p) < 1 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    /* write the length to the buffer */
-    (*p)[0] = len;
-    *p += 1;
-
-    /* write the binary data as is */
-    memcpy(*p, bin, len);
-    *p += len;
-
-    return (0);
-}
-
-/**
- * \brief           read a binary value prepended by a length bit
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param bin       the array to fill
- * \param len       the size of \p bin
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- */
-static int tls_read_binary(const uint8_t ** p, const uint8_t * end, uint8_t * bin, size_t len)
-{
-    uint8_t data_len;
-
-    /* length byte plus the length of the crypto key */
-    if ((end < *p) || ((size_t) (end - *p) < 1 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    /* read the length byte */
-    data_len = (*p)[0];
-    *p += 1;
-    /* check the length matches */
-    if (data_len != len)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    memcpy(bin, *p, len);
-
-    *p += len;
-
-    return (0);
-}
-
-/**
- * \brief           writes a tls point into a CryptoKey
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param key       the CryptoKey to write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int tls_write_crypto_key(uint8_t ** p, const uint8_t * end, CryptoKey * key)
-{
-    return tls_write_binary(p, end, key->u.plaintext.keyMaterial, key->u.plaintext.keyLength);
-}
-
-/**
- * \brief           read a tls point into a CryptoKey
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param key       the CryptoKey to fill
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
- *                  the point is not in uncompressed form
- */
-static int tls_read_crypto_key(const uint8_t ** p, const uint8_t * end, CryptoKey * key)
-{
-    /* check that the point is uncompressed */
-    if ((end < *p) || (end - *p < 2))
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-    if ((*p)[1] != 0x04)
-    {
-        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
-    }
-
-    return tls_read_binary(p, end, key->u.plaintext.keyMaterial, key->u.plaintext.keyLength);
-}
-
-/**
- * \brief           write the curve info into the buffer
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param group_id  the mbedtls group id write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_BAD_INPUT_DATA
- *                  the group id did not name a valid curve
- */
-static int tls_write_curve_info(uint8_t ** p, const uint8_t * end, mbedtls_ecp_group_id group_id)
-{
-    const mbedtls_ecp_curve_info * curve_info;
-
-    if ((end < *p) || (end - *p < 3))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id);
-
-    if (NULL == curve_info)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    /* write that we use named curves */
-    (*p)[0] = MBEDTLS_ECP_TLS_NAMED_CURVE;
-    (*p)[1] = curve_info->tls_id >> 8;
-    (*p)[2] = curve_info->tls_id & 0xFF;
-    *p += 3;
-
-    return (0);
-}
-
-/**
- * \brief           read and verify the curve info from the buffer
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param group_id  the mbedtls group id to load to check a match
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
- *                  the tls curve identifiers do not match
- * \retval MBEDTLS_ERR_ECP_BAD_INPUT_DATA
- *                  the curve info was not for a named curve or we do not have
- *                  that named curve
- */
-static int tls_verify_curve_info(const uint8_t ** p, const uint8_t * end, mbedtls_ecp_group_id group_id)
-{
-    uint16_t curve_name_id;
-    const mbedtls_ecp_curve_info * curve_info;
-
-    if ((end < *p) || (end - *p < 3))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    if ((*p)[0] != MBEDTLS_ECP_TLS_NAMED_CURVE)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-    curve_name_id = (((uint16_t) (*p)[1] << 8)) | (((uint16_t) (*p)[2]));
-    *p += 3;
-
-    curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id);
-
-    if (NULL == curve_info)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    if (curve_name_id != curve_info->tls_id)
-    {
-        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
-    }
-
-    return (0);
-}
-
-/**
- * \brief           Fill the a point with a random function
- *
- * \param private_key
- *                  key to fill with random data
- * \param f_rng     random number function
- * \param p_rng     context for the random function
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int gen_private_key(unsigned char * private_key, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    unsigned int i;
-    unsigned int j   = 0;
-    unsigned int sum = 0U;
-
-    do
-    {
-        unsigned int * pkey = (unsigned int *) private_key;
-        f_rng(p_rng, private_key, NISTP256_CURVE_LENGTH_BYTES);
-
-        /* check if private_key is equal to zero */
-        for (i = 0; i < (NISTP256_CURVE_LENGTH_BYTES / sizeof(unsigned int)); i++)
-        {
-            sum |= pkey[i];
-        }
-        j++;
-    } while (0U == sum && (j < 3));
-
-    return (0U != sum ? 0 : -1);
-}
-
-/**
- * \brief           Generate the second round of keys for this node and peer
- *
- * \param ctx       Context to use
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_alt_generate_round2_keys(mbedtls_ecjpake_context * ctx)
-{
-    ECJPAKE_OperationRoundTwoGenerateKeys roundTwoGenerateKeys;
-    int ret;
-
-    if (ctx->roundTwoGenerated)
-    {
-        return (0);
-    }
-
-    ECJPAKE_OperationRoundTwoGenerateKeys_init(&roundTwoGenerateKeys);
-    roundTwoGenerateKeys.curve                = &ECCParams_NISTP256;
-    roundTwoGenerateKeys.myPrivateKey2        = &ctx->myPrivateCryptoKey2;
-    roundTwoGenerateKeys.myPublicKey1         = &ctx->myPublicCryptoKey1;
-    roundTwoGenerateKeys.myPublicKey2         = &ctx->myPublicCryptoKey2;
-    roundTwoGenerateKeys.theirPublicKey1      = &ctx->theirPublicCryptoKey1;
-    roundTwoGenerateKeys.theirPublicKey2      = &ctx->theirPublicCryptoKey2;
-    roundTwoGenerateKeys.preSharedSecret      = &ctx->preSharedSecretCryptoKey;
-    roundTwoGenerateKeys.theirNewGenerator    = &ctx->theirGeneratorKey;
-    roundTwoGenerateKeys.myNewGenerator       = &ctx->myGeneratorKey;
-    roundTwoGenerateKeys.myCombinedPrivateKey = &ctx->myCombinedPrivateKey;
-    roundTwoGenerateKeys.myCombinedPublicKey  = &ctx->myCombinedPublicKey;
-    roundTwoGenerateKeys.myPrivateV           = &ctx->myPrivateCryptoV3;
-    roundTwoGenerateKeys.myPublicV            = &ctx->myPublicCryptoV3;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_roundTwoGenerateKeys(ctx->handle, &roundTwoGenerateKeys));
-
-    ctx->roundTwoGenerated = true;
-
-cleanup:
-    return (ret);
-}
-
-void mbedtls_ecjpake_init(mbedtls_ecjpake_context * ctx)
-{
-    ECJPAKE_Params params;
-
-    if (ctx == NULL)
-    {
-        return;
-    }
-
-    ctx->md_info      = NULL;
-    ctx->point_format = MBEDTLS_ECP_PF_UNCOMPRESSED;
-
-    ECJPAKE_Params_init(&params);
-
-    ctx->handle = ECJPAKE_open(0, &params);
-}
-
-void mbedtls_ecjpake_free(mbedtls_ecjpake_context * ctx)
-{
-    if (ctx == NULL)
-    {
-        return;
-    }
-
-    ctx->md_info = NULL;
-
-    ECJPAKE_close(ctx->handle);
-    ctx->handle = NULL;
-}
-
-static void big_num_reverse(uint8_t * arr, size_t len)
-{
-    unsigned int left  = 0;
-    unsigned int right = len - 1;
-    uint8_t temp;
-
-    while (left < right)
-    {
-        temp       = arr[left];
-        arr[left]  = arr[right];
-        arr[right] = temp;
-
-        ++left;
-        --right;
-    }
-}
-
-/**
- * \brief           write a 4 byte length and binary output
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param bin       value to write
- * \param len       length to write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_write_len_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len)
-{
-    if ((end < *p) || ((size_t) (end - *p) < 4 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    memcpy(*p + 4, bin, len);
-
-    (*p)[0] = (unsigned char) ((len >> 24) & 0xFF);
-    (*p)[1] = (unsigned char) ((len >> 16) & 0xFF);
-    (*p)[2] = (unsigned char) ((len >> 8) & 0xFF);
-    (*p)[3] = (unsigned char) ((len) &0xFF);
-
-    *p += 4 + len;
-
-    return (0);
-}
-
-/**
- * \brief           Create the EC-JPAKE hash for each round
- *
- * \param md_info   message digest info to use
- * \param G         1st point to digest
- * \param V         2nd point to digest
- * \param X         3rd point to digest
- * \param id        string id to digest
- * \param hash      output buffer for digest
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_hash(const mbedtls_md_info_t * md_info, CryptoKey * G, CryptoKey * V, CryptoKey * X, const char * id,
-                        uint8_t * hash)
-{
-    int ret;
-    uint8_t buf[ECJPAKE_HASH_BUF_LEN];
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + sizeof(buf);
-    const size_t id_len = strlen(id);
-
-    /*
-     * Write 'lenG || G || lenV || V || lenX || X || lenID || ID' to the
-     * temporary buffer
-     */
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, G->u.plaintext.keyMaterial, G->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, V->u.plaintext.keyMaterial, V->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, X->u.plaintext.keyMaterial, X->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, (uint8_t *) id, id_len));
-
-    /*
-     * Compute hash
-     *
-     * XXX: possible speedup by digesting the buffers directly instead of
-     * creating a temp buffer
-     */
-    ECJPAKE_ALT_CHK(mbedtls_md(md_info, buf, p - buf, hash));
-
-cleanup:
-    return (ret);
-}
-
-/**
- * \brief           Read and validate the ZKP based on this public key.
- *
- * \param ctx       Context to use
- * \param generator_key
- *                  Generator point to use
- * \param public_key
- *                  Public key use
- * \param p         Pointer to current place in buffer, will point to the next
- *                  character after a successful call
- * \param end       Pointer to the end of the buffer
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_zkp_read(mbedtls_ecjpake_context * ctx, CryptoKey * generator_key, CryptoKey * public_key, const uint8_t ** p,
-                            const uint8_t * end)
-{
-    int ret;
-    CryptoKey v;
-    uint8_t v_material[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-
-    ECJPAKE_OperationVerifyZKP operation_verify_zkp;
-
-    CryptoKeyPlaintext_initKey(&v, v_material, sizeof(v_material));
-
-    /* read the Ephemeral public key V */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(p, end, &v));
-
-    /* read the Schnorr signature r */
-    ECJPAKE_ALT_CHK(tls_read_binary(p, end, r, sizeof(r)));
-
-    /* calculate the hash */
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, generator_key, &v, public_key, ID_PEER, hash));
-
-    /* verify the r and hash based on V */
-    ECJPAKE_OperationVerifyZKP_init(&operation_verify_zkp);
-    operation_verify_zkp.curve          = &ECCParams_NISTP256;
-    operation_verify_zkp.theirGenerator = generator_key;
-    operation_verify_zkp.theirPublicKey = public_key;
-    operation_verify_zkp.theirPublicV   = &v;
-    operation_verify_zkp.hash           = hash;
-    operation_verify_zkp.r              = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_verifyZKP(ctx->handle, &operation_verify_zkp));
-
-cleanup:
-    return (ret);
-}
-
-/**
- * \brief           Check if a CryptoKey is zero
- *
- * \param G         CryptoKey to use
- *
- * \return          0 CryptoKey is not zero
- *                  MBEDTLS_ERR_ECP_INVALID_KEY if CryptoKey is zero
- */
-static int check_CryptoKey_is_zero(CryptoKey * G)
-{
-    unsigned int i;
-    /* skip beginning 0x04 byte */
-    for (i = 1; i < G->u.plaintext.keyLength; i++)
-    {
-        if (G->u.plaintext.keyMaterial[i] != 0U)
-        {
-            /* the point is not all zero */
-            return (0);
-        }
-    }
-    /* the for loop completed, they were all zero */
-    return (MBEDTLS_ERR_ECP_INVALID_KEY);
-}
-
-int mbedtls_ecjpake_setup(mbedtls_ecjpake_context * ctx, mbedtls_ecjpake_role role, mbedtls_md_type_t hash,
-                          mbedtls_ecp_group_id curve, const uint8_t * secret, size_t len)
-{
-    int ret = 0;
-
-    ctx->roundTwoGenerated = false;
-    ctx->role              = role;
-
-    if ((ctx->md_info = mbedtls_md_info_from_type(hash)) == NULL)
-    {
-        return (MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE);
-    }
-
-    ctx->curve = curve;
-
-    /* copy NISTP256 generator for hash functions */
-    ctx->nistP256Generator[0] = 0x04;
-    memcpy(&(ctx->nistP256Generator[1]), ECCParams_NISTP256.generatorX, (NISTP256_CURVE_LENGTH_BYTES * 2));
-    big_num_reverse(&(ctx->nistP256Generator[1]), NISTP256_CURVE_LENGTH_BYTES);
-    big_num_reverse(&(ctx->nistP256Generator[NISTP256_CURVE_LENGTH_BYTES + 1]), NISTP256_CURVE_LENGTH_BYTES);
-    CryptoKeyPlaintext_initKey(&ctx->nistP256GeneratorCryptoKey, ctx->nistP256Generator, sizeof(ctx->nistP256Generator));
-
-    /* Pre-shared secret */
-    memcpy(ctx->preSharedSecretKeyingMaterial, secret, len);
-
-    CryptoKeyPlaintext_initKey(&ctx->preSharedSecretCryptoKey, ctx->preSharedSecretKeyingMaterial, len);
-
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoKey1, ctx->myPrivateKeyMaterial1, sizeof(ctx->myPrivateKeyMaterial1));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoKey2, ctx->myPrivateKeyMaterial2, sizeof(ctx->myPrivateKeyMaterial2));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV1, ctx->myPrivateVMaterial1, sizeof(ctx->myPrivateVMaterial1));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV2, ctx->myPrivateVMaterial2, sizeof(ctx->myPrivateVMaterial2));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV3, ctx->myPrivateVMaterial3, sizeof(ctx->myPrivateVMaterial3));
-
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoKey1, ctx->myPublicKeyMaterial1, sizeof(ctx->myPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoKey2, ctx->myPublicKeyMaterial2, sizeof(ctx->myPublicKeyMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV1, ctx->myPublicVMaterial1, sizeof(ctx->myPublicVMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV2, ctx->myPublicVMaterial2, sizeof(ctx->myPublicVMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV3, ctx->myPublicVMaterial3, sizeof(ctx->myPublicVMaterial3));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myCombinedPrivateKey, ctx->myCombinedPrivateKeyMaterial1,
-                                    sizeof(ctx->myCombinedPrivateKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myCombinedPublicKey, ctx->myCombinedPublicKeyMaterial1,
-                                    sizeof(ctx->myCombinedPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myGeneratorKey, ctx->myGenerator, sizeof(ctx->myGenerator));
-
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirPublicCryptoKey1, ctx->theirPublicKeyMaterial1,
-                                    sizeof(ctx->theirPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirPublicCryptoKey2, ctx->theirPublicKeyMaterial2,
-                                    sizeof(ctx->theirPublicKeyMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirCombinedPublicKey, ctx->theirCombinedPublicKeyMaterial1,
-                                    sizeof(ctx->theirCombinedPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirGeneratorKey, ctx->theirGenerator, sizeof(ctx->theirGenerator));
-
-    return (ret);
-}
-
-int mbedtls_ecjpake_check(const mbedtls_ecjpake_context * ctx)
-{
-    if (ctx->md_info == NULL || ctx->curve == MBEDTLS_ECP_DP_NONE || ctx->handle == NULL)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    return (0);
-}
-
-int mbedtls_ecjpake_read_round_one(mbedtls_ecjpake_context * ctx, const unsigned char * buf, size_t len)
-{
-    int ret;
-    const unsigned char * p   = buf;
-    const unsigned char * end = buf + len;
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirPublicCryptoKey1));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirPublicCryptoKey1));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->nistP256GeneratorCryptoKey, &ctx->theirPublicCryptoKey1, &p, end));
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirPublicCryptoKey2));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirPublicCryptoKey2));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->nistP256GeneratorCryptoKey, &ctx->theirPublicCryptoKey2, &p, end));
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_write_round_one(mbedtls_ecjpake_context * ctx, uint8_t * buf, size_t len, size_t * olen,
-                                    int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + len;
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-
-    /* Generate round one keys */
-    ECJPAKE_OperationRoundOneGenerateKeys roundOneGenerateKeys;
-    ECJPAKE_OperationGenerateZKP operationGenerateZKP;
-
-    /* Generate private keys */
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateKeyMaterial1, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateKeyMaterial2, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial1, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial2, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial3, f_rng, p_rng));
-
-    ECJPAKE_OperationRoundOneGenerateKeys_init(&roundOneGenerateKeys);
-    roundOneGenerateKeys.curve         = &ECCParams_NISTP256;
-    roundOneGenerateKeys.myPrivateKey1 = &ctx->myPrivateCryptoKey1;
-    roundOneGenerateKeys.myPrivateKey2 = &ctx->myPrivateCryptoKey2;
-    roundOneGenerateKeys.myPublicKey1  = &ctx->myPublicCryptoKey1;
-    roundOneGenerateKeys.myPublicKey2  = &ctx->myPublicCryptoKey2;
-    roundOneGenerateKeys.myPrivateV1   = &ctx->myPrivateCryptoV1;
-    roundOneGenerateKeys.myPrivateV2   = &ctx->myPrivateCryptoV2;
-    roundOneGenerateKeys.myPublicV1    = &ctx->myPublicCryptoV1;
-    roundOneGenerateKeys.myPublicV2    = &ctx->myPublicCryptoV2;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_roundOneGenerateKeys(ctx->handle, &roundOneGenerateKeys));
-
-    /* write X1 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoKey1));
-
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, &ctx->nistP256GeneratorCryptoKey, &ctx->myPublicCryptoV1, &ctx->myPublicCryptoKey1,
-                                 ID_MINE, hash));
-
-    /* generate round one ZKPs */
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myPrivateCryptoKey1;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV1;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    /* write ZKP for X1 (V1 and r1) */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV1));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, &ctx->nistP256GeneratorCryptoKey, &ctx->myPublicCryptoV2, &ctx->myPublicCryptoKey2,
-                                 ID_MINE, hash));
-
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myPrivateCryptoKey2;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV2;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    /* write X2 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoKey2));
-
-    /* write ZKP for X2 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV2));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    *olen = p - buf;
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_read_round_two(mbedtls_ecjpake_context * ctx, const unsigned char * buf, size_t len)
-{
-    int ret;
-    const uint8_t * p   = buf;
-    const uint8_t * end = buf + len;
-
-    ECJPAKE_ALT_CHK(ecjpake_alt_generate_round2_keys(ctx));
-
-    if (ctx->role == MBEDTLS_ECJPAKE_CLIENT)
-    {
-        ECJPAKE_ALT_CHK(tls_verify_curve_info(&p, end, ctx->curve));
-    }
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirCombinedPublicKey));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirCombinedPublicKey));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->theirGeneratorKey, &ctx->theirCombinedPublicKey, &p, end));
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_write_round_two(mbedtls_ecjpake_context * ctx, unsigned char * buf, size_t len, size_t * olen,
-                                    int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + len;
-
-    ECJPAKE_OperationGenerateZKP operationGenerateZKP;
-
-    ECJPAKE_ALT_CHK(ecjpake_alt_generate_round2_keys(ctx));
-
-    ECJPAKE_ALT_CHK(
-        ecjpake_hash(ctx->md_info, &ctx->myGeneratorKey, &ctx->myPublicCryptoV3, &ctx->myCombinedPublicKey, ID_MINE, hash));
-
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myCombinedPrivateKey;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV3;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    if (ctx->role == MBEDTLS_ECJPAKE_SERVER)
-    {
-        /* write curve info */
-        ECJPAKE_ALT_CHK(tls_write_curve_info(&p, end, ctx->curve));
-    }
-
-    /* write public key X */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myCombinedPublicKey));
-
-    /* write ZKP for X (V and r) */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV3));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    *olen = p - buf;
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_derive_secret(mbedtls_ecjpake_context * ctx, unsigned char * buf, size_t len, size_t * olen,
-                                  int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    unsigned char md_len;
-    CryptoKey sharedSecretCryptoKey;
-    uint8_t sharedSecretKeyingMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-
-    ECJPAKE_OperationComputeSharedSecret computeSharedSecret;
-
-    md_len = mbedtls_md_get_size(ctx->md_info);
-    if (len < md_len)
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    CryptoKeyPlaintext_initKey(&sharedSecretCryptoKey, sharedSecretKeyingMaterial1, sizeof(sharedSecretKeyingMaterial1));
-
-    /* Generate shared secret */
-    ECJPAKE_OperationComputeSharedSecret_init(&computeSharedSecret);
-    computeSharedSecret.curve                  = &ECCParams_NISTP256;
-    computeSharedSecret.myCombinedPrivateKey   = &ctx->myCombinedPrivateKey;
-    computeSharedSecret.theirCombinedPublicKey = &ctx->theirCombinedPublicKey;
-    computeSharedSecret.theirPublicKey2        = &ctx->theirPublicCryptoKey2;
-    computeSharedSecret.myPrivateKey2          = &ctx->myPrivateCryptoKey2;
-    computeSharedSecret.sharedSecret           = &sharedSecretCryptoKey;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_computeSharedSecret(ctx->handle, &computeSharedSecret));
-
-    ECJPAKE_ALT_CHK(mbedtls_md(ctx->md_info, sharedSecretKeyingMaterial1 + 1, NISTP256_CURVE_LENGTH_BYTES, buf));
-
-    *olen = md_len;
-
-cleanup:
-    return (ret);
-}
-
-#undef ID_MINE
-#undef ID_PEER
-
-#endif /* MBEDTLS_ECJPAKE_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h
deleted file mode 100644
index 1ce4d008c487f4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_ECJPAKE_ALT)
-
-#include "mbedtls/ecp.h"
-#include "mbedtls/md.h"
-
-#include <ti/drivers/ECJPAKE.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKey.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Length of parameters for the NIST p256r1.
- *
- * ECJ-PAKE is only defined for p256r1
- */
-#define NISTP256_CURVE_LENGTH_BYTES (32)
-
-/**
- * Size in bytes of the identifier at the beginning of the point format
- */
-#define OCTET_STRING_OFFSET 1
-
-/**
- * Size in bytes of a point expressed in the TLS point format
- *
- * id_byte || X coord || Y coord
- */
-#define NISTP256_PUBLIC_KEY_LENGTH_BYTES (OCTET_STRING_OFFSET + (NISTP256_CURVE_LENGTH_BYTES * 2))
-
-/**
- * EC J-PAKE context structure.
- */
-typedef struct
-{
-    const mbedtls_md_info_t * md_info;
-    mbedtls_ecp_group_id curve;
-    mbedtls_ecjpake_role role;
-    int point_format;
-
-    bool roundTwoGenerated;
-    /*
-     * XXX: possible size reduction by moving ephemeral material to round
-     * calculations.
-     */
-    unsigned char myPrivateKeyMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateKeyMaterial2[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial2[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial3[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicKeyMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial3[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myCombinedPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myCombinedPrivateKeyMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char nistP256Generator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myGenerator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirPublicKeyMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirCombinedPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirGenerator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char preSharedSecretKeyingMaterial[NISTP256_CURVE_LENGTH_BYTES];
-
-    CryptoKey nistP256GeneratorCryptoKey;
-    CryptoKey preSharedSecretCryptoKey;
-    CryptoKey myPrivateCryptoKey1;
-    CryptoKey myPrivateCryptoKey2;
-    CryptoKey myPrivateCryptoV1;
-    CryptoKey myPrivateCryptoV2;
-    CryptoKey myPrivateCryptoV3;
-    CryptoKey myCombinedPrivateKey;
-    CryptoKey myPublicCryptoKey1;
-    CryptoKey myPublicCryptoKey2;
-    CryptoKey myPublicCryptoV1;
-    CryptoKey myPublicCryptoV2;
-    CryptoKey myPublicCryptoV3;
-    CryptoKey myCombinedPublicKey;
-    CryptoKey myGeneratorKey;
-    CryptoKey theirPublicCryptoKey1;
-    CryptoKey theirPublicCryptoKey2;
-    CryptoKey theirCombinedPublicKey;
-    CryptoKey theirGeneratorKey;
-
-    ECJPAKE_Handle handle;
-} mbedtls_ecjpake_context;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_ECJPAKE_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c
deleted file mode 100644
index 0ef01f48fe34ba..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include <mbedtls/sha256.h>
-
-#if defined(MBEDTLS_SHA256_ALT)
-
-#include <string.h>
-
-#include <ti/drivers/SHA2.h>
-#include <ti/drivers/sha2/SHA2CC26X2.h>
-
-/*!
- *  Hardware-specific configuration attributes, may be replaced with SysConfig
- *  ti_drivers.h structure.
- */
-const SHA2CC26X2_HWAttrs sha2CC26X2HWAttrs_sha = {
-    .intPriority = ~0,
-};
-
-void mbedtls_sha256_init(mbedtls_sha256_context * ctx)
-{
-    SHA2_Params sha2Params;
-
-    memset(ctx, 0, sizeof(mbedtls_sha256_context));
-    SHA2_Params_init(&sha2Params);
-
-    sha2Params.returnBehavior = SHA2_RETURN_BEHAVIOR_POLLING;
-
-    ctx->config.object  = &ctx->object;
-    ctx->config.hwAttrs = &sha2CC26X2HWAttrs_sha;
-
-    ctx->hndl = SHA2_construct(&ctx->config, &sha2Params);
-}
-
-void mbedtls_sha256_free(mbedtls_sha256_context * ctx)
-{
-    if (NULL == ctx)
-    {
-        return;
-    }
-
-    if (ctx->hndl != NULL)
-    {
-        SHA2_close(ctx->hndl);
-
-        memset(ctx, 0, sizeof(mbedtls_sha256_context));
-    }
-}
-
-/*
- * Deviation from documentation in sha256.h.
- *
- * It has been noticed that some code using mbedtls does not call `init` before
- * starting a SHA operation. Rather these implementations assume the `ctx`
- * structure may be zero'ed out as initialization. To support this usage the
- * driver instance is assumed to be uninitialized if the context's `hndl` is a
- * NULL pointer. Start will initialize the driver and assign the handle to the
- * context in this case.
- */
-int mbedtls_sha256_starts_ret(mbedtls_sha256_context * ctx, int is224)
-{
-    SHA2_HashType type;
-
-    // open the driver here because no-one called init
-    if (ctx->hndl == NULL)
-    {
-        SHA2_Params sha2Params;
-
-        SHA2_Params_init(&sha2Params);
-
-        sha2Params.returnBehavior = SHA2_RETURN_BEHAVIOR_POLLING;
-
-        ctx->config.object  = &ctx->object;
-        ctx->config.hwAttrs = &sha2CC26X2HWAttrs_sha;
-
-        ctx->hndl = SHA2_construct(&ctx->config, &sha2Params);
-
-        if (NULL == ctx->hndl)
-        {
-            return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-        }
-    }
-    else
-    {
-        SHA2_reset(ctx->hndl);
-    }
-
-    if (is224)
-    {
-        type = SHA2_HASH_TYPE_224;
-    }
-    else
-    {
-        type = SHA2_HASH_TYPE_256;
-    }
-
-    SHA2_setHashType(ctx->hndl, type);
-
-    return 0;
-}
-
-/**
- * Deviation from documentation in sha256.h.
- *
- * It has been noticed that some code using mbedtls does not call `init` on the
- * contexts being passed into this function. This seems to be done to avoid
- * allocating hardware to cloned context instances. To support this use-case,
- * only internal buffers to the SHA2 structure are copied without checking the
- * driver handles.
- */
-void mbedtls_sha256_clone(mbedtls_sha256_context * dst, const mbedtls_sha256_context * src)
-{
-    dst->object.hashType       = src->object.hashType;
-    dst->object.bytesInBuffer  = src->object.bytesInBuffer;
-    dst->object.bytesProcessed = src->object.bytesProcessed;
-    memcpy(dst->object.buffer, src->object.buffer, sizeof(dst->object.buffer));
-    // copy the digest to support cloning after finalization has happened
-    memcpy(dst->object.digest, src->object.digest, sizeof(dst->object.digest));
-}
-
-int mbedtls_sha256_finish_ret(mbedtls_sha256_context * ctx, unsigned char output[32])
-{
-    int_fast16_t result;
-
-    result = SHA2_finalize(ctx->hndl, output);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int mbedtls_sha256_update_ret(mbedtls_sha256_context * ctx, const unsigned char * input, size_t ilen)
-{
-    int_fast16_t result;
-
-    // Process data in chunks. The driver buffers incomplete blocks internally.
-    result = SHA2_addData(ctx->hndl, input, ilen);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int mbedtls_internal_sha256_process(mbedtls_sha256_context * ctx, const unsigned char data[64])
-{
-    int_fast16_t result;
-
-    // Process data in chunks. The driver buffers incomplete blocks internally.
-    result = SHA2_addData(ctx->hndl, data, SHA2_BLOCK_SIZE_BYTES_256);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-#endif /* MBEDTLS_SHA256_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h
deleted file mode 100644
index 96505775cd1119..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#pragma once
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_SHA256_ALT)
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ti/drivers/SHA2.h>
-#include <ti/drivers/sha2/SHA2CC26X2.h>
-
-typedef struct
-{
-    SHA2_Handle hndl;         /*!< A handle that is returned by the SHA driver  */
-    SHA2_Config config;       /*!< structure containing SHA2 driver specific implementation  */
-    SHA2CC26X2_Object object; /*!< Pointer to a driver specific data object */
-} mbedtls_sha256_context;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* MBEDTLS_SHA256_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h
deleted file mode 100644
index a5fcac9459b6c4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2019, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if OPENTHREAD_CONFIG_RADIO_915MHZ_OQPSK_SUPPORT
-#error "Platform cc1352 doesn't support configuration option: OPENTHREAD_CONFIG_RADIO_915MHZ_OQPSK_SUPPORT"
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h
deleted file mode 100644
index dfdb7bcdd73057..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2018, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#ifdef DeviceFamily_CC13X2_CC26X2
-
-/* Number of message buffers reduced to fit into CC26x2x3 RAM */
-#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22
-
-#endif // DeviceFamily_CC13X2_CC26X2
-
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
-// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_SERVICE_DISCOVERY_ENABLE 1
-
-#define OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE 0
-#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 0
-#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
-
-#define OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS 0
-// TCP disabled until OpenThread has a GN/Ninja build for the tcplp library
-#define OPENTHREAD_CONFIG_TCP_ENABLE 0
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h b/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
index b16a6269818563..7f01603f255d8f 100644
--- a/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
+++ b/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
@@ -30,7 +30,7 @@ namespace chip {
 namespace DeviceLayer {
 
 /**
- * Concrete implementation of the ConfigurationManager singleton object for the CC13X2_26X2 platform.
+ * Concrete implementation of the ConfigurationManager singleton object for the CC13X4_26X4 platform.
  */
 class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::CC13XX_26XXConfig>
 {
diff --git a/src/platform/cc32xx/ConnectivityManagerImpl.cpp b/src/platform/cc32xx/ConnectivityManagerImpl.cpp
index c42bfb426a55e0..fe629c4f880ae8 100644
--- a/src/platform/cc32xx/ConnectivityManagerImpl.cpp
+++ b/src/platform/cc32xx/ConnectivityManagerImpl.cpp
@@ -62,7 +62,6 @@ extern void SlNetConnEventHandler(uint32_t ifID, SlNetConnStatus_e netStatus, vo
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 
 extern "C" void cc32xxLog(const char * aFormat, ...);
 static struct netif * m_pNetIf = NULL;
diff --git a/src/platform/device.gni b/src/platform/device.gni
index 01358d4880f876..dbbc38abf4ca88 100644
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/ble/ble.gni")
 
 declare_args() {
-  # Device platform layer: cc13x2_26x2, cc13x4_26x4, cc32xx, darwin, efr32, esp32, external, freertos, linux, nrfconnect, nxp, qpg, tizen, cyw30739, bl602, mw320, zephyr, beken, openiotsdk, none.
+  # Device platform layer: cc13x4_26x4, cc32xx, darwin, efr32, esp32, external, freertos, linux, nrfconnect, nxp, qpg, tizen, cyw30739, bl602, mw320, zephyr, beken, openiotsdk, none.
 
   chip_device_platform = "auto"
   chip_platform_target = ""
@@ -49,7 +49,6 @@ declare_args() {
   # Enable openthread support.
   chip_enable_openthread =
       chip_device_platform == "linux" || chip_device_platform == "qpg" ||
-      chip_device_platform == "cc13x2_26x2" ||
       chip_device_platform == "cc13x4_26x4" ||
       chip_device_platform == "tizen" || chip_device_platform == "stm32" ||
       chip_device_platform == "webos"
@@ -96,7 +95,6 @@ declare_args() {
       chip_device_platform == "asr" || chip_device_platform == "openiotsdk") {
     chip_mdns = "minimal"
   } else if (chip_device_platform == "darwin" ||
-             chip_device_platform == "cc13x2_26x2" ||
              chip_device_platform == "cc13x4_26x4" || current_os == "android" ||
              chip_device_platform == "fake" ||
              chip_device_platform == "tizen") {
@@ -133,9 +131,7 @@ declare_args() {
 }
 
 _chip_device_layer = "none"
-if (chip_device_platform == "cc13x2_26x2") {
-  _chip_device_layer = "cc13xx_26xx/cc13x2_26x2"
-} else if (chip_device_platform == "cc13x4_26x4") {
+if (chip_device_platform == "cc13x4_26x4") {
   _chip_device_layer = "cc13xx_26xx/cc13x4_26x4"
 } else if (chip_device_platform == "cc32xx") {
   _chip_device_layer = "cc32xx"
@@ -249,7 +245,6 @@ declare_args() {
 assert(
     (current_os != "freertos" && chip_device_platform == "none") ||
         chip_device_platform == "fake" ||
-        chip_device_platform == "cc13x2_26x2" ||
         chip_device_platform == "cc13x4_26x4" ||
         chip_device_platform == "cc32xx" || chip_device_platform == "darwin" ||
         chip_device_platform == "efr32" || chip_device_platform == "esp32" ||
diff --git a/src/platform/mbed/BLEManagerImpl.h b/src/platform/mbed/BLEManagerImpl.h
index e642b1276493f0..6dfb1d56e2097b 100644
--- a/src/platform/mbed/BLEManagerImpl.h
+++ b/src/platform/mbed/BLEManagerImpl.h
@@ -23,8 +23,12 @@
 
 #pragma once
 
+#include <platform/CHIPDeviceConfig.h>
+
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
+#include <ble/BleLayer.h>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/platform/mt793x/ConnectivityManagerImpl.cpp b/src/platform/mt793x/ConnectivityManagerImpl.cpp
index e656a98e0e60bd..c3353c858f585f 100644
--- a/src/platform/mt793x/ConnectivityManagerImpl.cpp
+++ b/src/platform/mt793x/ConnectivityManagerImpl.cpp
@@ -49,7 +49,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp b/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp
index 5e2aa54ac8b809..991223b58ea966 100644
--- a/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp
+++ b/src/platform/mt793x/ConnectivityManagerImpl_WIFI.cpp
@@ -41,7 +41,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/mt793x/DnssdContexts.cpp b/src/platform/mt793x/DnssdContexts.cpp
index f8af3b450e9d87..c554c01916fef4 100644
--- a/src/platform/mt793x/DnssdContexts.cpp
+++ b/src/platform/mt793x/DnssdContexts.cpp
@@ -26,6 +26,8 @@
 #include <lwip/ip6_addr.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <string>
+
 using namespace chip::Dnssd;
 
 namespace {
diff --git a/src/platform/mt793x/DnssdImpl.cpp b/src/platform/mt793x/DnssdImpl.cpp
index f85007689f7652..1baf0262304002 100644
--- a/src/platform/mt793x/DnssdImpl.cpp
+++ b/src/platform/mt793x/DnssdImpl.cpp
@@ -33,6 +33,7 @@
 #include <cstdio>
 #include <sstream>
 #include <string.h>
+#include <string>
 
 #include "mDNSDebug.h"
 #include "task.h"
diff --git a/src/platform/nrfconnect/wifi/ConnectivityManagerImplWiFi.cpp b/src/platform/nrfconnect/wifi/ConnectivityManagerImplWiFi.cpp
index b3bdede0f2f852..92b3532dae56f3 100644
--- a/src/platform/nrfconnect/wifi/ConnectivityManagerImplWiFi.cpp
+++ b/src/platform/nrfconnect/wifi/ConnectivityManagerImplWiFi.cpp
@@ -29,7 +29,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/nxp/common/ConnectivityManagerImpl.cpp b/src/platform/nxp/common/ConnectivityManagerImpl.cpp
index 91311b3f53a8ca..2753451c5308ff 100644
--- a/src/platform/nxp/common/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/common/ConnectivityManagerImpl.cpp
@@ -67,7 +67,6 @@ extern "C" {
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace ::chip::DeviceLayer::DeviceEventType;
 
@@ -133,7 +132,8 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
         }
         else
         {
-            is_wlan_added = false;
+            /* In case network was added before, signal that it is added and that connection can start */
+            is_wlan_added = true;
         }
 
         /* At this point, the network details should be registered in the wlan driver */
diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn
index 9d1ef45db9fdb5..c8aea6ee945f22 100644
--- a/src/platform/nxp/k32w/k32w0/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w0/BUILD.gn
@@ -108,7 +108,10 @@ static_library("nxp_platform") {
 
   deps = [ "${chip_root}/src/platform/logging:headers" ]
 
-  public_deps = [ "${chip_root}/src/platform:platform_base" ]
+  public_deps = [
+    "${chip_root}/src/app:test-event-trigger",
+    "${chip_root}/src/platform:platform_base",
+  ]
 
   if (chip_crypto == "platform") {
     if (chip_crypto_flavor == "tinycrypt") {
diff --git a/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp b/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
index 3182a874fbf41c..31489178875259 100644
--- a/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/ConnectivityManagerImpl.cpp
@@ -48,7 +48,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/nxp/k32w/k32w1/BUILD.gn b/src/platform/nxp/k32w/k32w1/BUILD.gn
index 30352203eebaaa..34dc5ca1b4e38a 100644
--- a/src/platform/nxp/k32w/k32w1/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w1/BUILD.gn
@@ -77,7 +77,10 @@ static_library("nxp_platform") {
     "${chip_root}/src/platform/nxp/k32w/k32w1/SMU2Manager.h",
   ]
 
-  public_deps = [ "${chip_root}/src/platform:platform_base" ]
+  public_deps = [
+    "${chip_root}/src/app:test-event-trigger",
+    "${chip_root}/src/platform:platform_base",
+  ]
 
   if (chip_with_low_power != 0) {
     sources += [ "LowPowerHooks.cpp" ]
diff --git a/src/platform/nxp/k32w/k32w1/ConnectivityManagerImpl.cpp b/src/platform/nxp/k32w/k32w1/ConnectivityManagerImpl.cpp
index 3182a874fbf41c..31489178875259 100644
--- a/src/platform/nxp/k32w/k32w1/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/k32w/k32w1/ConnectivityManagerImpl.cpp
@@ -48,7 +48,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/nxp/k32w/k32w1/SMU2Manager.cpp b/src/platform/nxp/k32w/k32w1/SMU2Manager.cpp
index f4e0216bb8955a..f7c54ea7c796b7 100644
--- a/src/platform/nxp/k32w/k32w1/SMU2Manager.cpp
+++ b/src/platform/nxp/k32w/k32w1/SMU2Manager.cpp
@@ -25,10 +25,13 @@
  */
 
 #include "SMU2Manager.h"
+
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/KeyValueStoreManager.h>
 
 using namespace chip::DeviceLayer;
 using namespace chip::DeviceLayer::Internal;
+using namespace chip::DeviceLayer::PersistedStorage;
 
 namespace chip::SMU2 {
 namespace {
@@ -39,8 +42,6 @@ static const uint32_t AREA_SIZE  = (AREA_END - AREA_START);
 
 uint8_t mAreaId = 0;
 
-PersistentStorageDelegate * mStorage = nullptr;
-
 memAreaCfg_t mAreaDescriptor;
 bool mDeviceCommissioned = false;
 bool mUseAllocator       = false;
@@ -92,7 +93,7 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t)
         if (mDeviceCommissioned)
         {
             mUseAllocator = true;
-            mStorage->SyncSetKeyValue(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, (uint16_t) sizeof(mUseAllocator));
+            KeyValueStoreMgr().Put(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, (uint16_t) sizeof(mUseAllocator));
             ResetBLEController();
             RegisterArea();
         }
@@ -103,22 +104,20 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t)
 
 } // anonymous namespace
 
-CHIP_ERROR Init(PersistentStorageDelegate * storage)
+CHIP_ERROR Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     uint16_t size  = (uint16_t) sizeof(mUseAllocator);
-    mStorage       = storage;
-
-    VerifyOrReturnError(storage != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     PlatformMgr().AddEventHandler(EventHandler, reinterpret_cast<intptr_t>(nullptr));
 
-    err = mStorage->SyncGetKeyValue(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, size);
+    size_t bytesRead = 0;
+    err              = KeyValueStoreMgr().Get(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, size, &bytesRead);
 
     if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
         mUseAllocator = false;
-        err           = mStorage->SyncSetKeyValue(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, size);
+        err           = KeyValueStoreMgr().Put(GetSMU2AllocatorKey().KeyName(), (void *) &mUseAllocator, size);
     }
     ReturnErrorOnFailure(err);
 
@@ -137,7 +136,7 @@ CHIP_ERROR Deactivate(void)
     if (mUseAllocator)
     {
         mUseAllocator = false;
-        err           = mStorage->SyncDeleteKeyValue(GetSMU2AllocatorKey().KeyName());
+        err           = KeyValueStoreMgr().Delete(GetSMU2AllocatorKey().KeyName());
         ReturnErrorOnFailure(err);
 
         UnregisterArea();
diff --git a/src/platform/nxp/k32w/k32w1/SMU2Manager.h b/src/platform/nxp/k32w/k32w1/SMU2Manager.h
index 7044d452727476..141229b8e6a932 100644
--- a/src/platform/nxp/k32w/k32w1/SMU2Manager.h
+++ b/src/platform/nxp/k32w/k32w1/SMU2Manager.h
@@ -27,12 +27,11 @@
 #pragma once
 
 #include "fsl_component_mem_manager.h"
-#include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <lib/support/DefaultStorageKeyAllocator.h>
 
 namespace chip::SMU2 {
 
-CHIP_ERROR Init(PersistentStorageDelegate * storage);
+CHIP_ERROR Init();
 CHIP_ERROR Deactivate(void);
 void * Allocate(size_t size);
 
diff --git a/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp b/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
index 802fe2708e3e26..5520eaa5c03a81 100644
--- a/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/mw320/ConnectivityManagerImpl.cpp
@@ -20,6 +20,7 @@
 #include <iomanip>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <sstream>
+#include <string>
 
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -56,7 +57,6 @@ static struct wlan_network sta_network;
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace ::chip::app::Clusters::GeneralDiagnostics;
 using namespace ::chip::app::Clusters::WiFiNetworkDiagnostics;
diff --git a/src/platform/nxp/mw320/ConnectivityManagerImpl.h b/src/platform/nxp/mw320/ConnectivityManagerImpl.h
index 364590fc1936ff..e5e9ef2865fa48 100644
--- a/src/platform/nxp/mw320/ConnectivityManagerImpl.h
+++ b/src/platform/nxp/mw320/ConnectivityManagerImpl.h
@@ -42,6 +42,8 @@
 #include <platform/NetworkCommissioning.h>
 #include <platform/nxp/mw320/NetworkCommissioningDriver.h>
 
+#include <string>
+
 namespace chip {
 namespace DeviceLayer {
 
diff --git a/src/platform/nxp/zephyr/ConnectivityManagerImpl.cpp b/src/platform/nxp/zephyr/ConnectivityManagerImpl.cpp
index 888e5748ad6b10..f927df2ac17480 100644
--- a/src/platform/nxp/zephyr/ConnectivityManagerImpl.cpp
+++ b/src/platform/nxp/zephyr/ConnectivityManagerImpl.cpp
@@ -38,7 +38,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/qpg/ConnectivityManagerImpl.cpp b/src/platform/qpg/ConnectivityManagerImpl.cpp
index 0a3f507a999532..50601c29721809 100644
--- a/src/platform/qpg/ConnectivityManagerImpl.cpp
+++ b/src/platform/qpg/ConnectivityManagerImpl.cpp
@@ -37,7 +37,6 @@
 #include <platform/internal/BLEManager.h>
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/silabs/ConfigurationManagerImpl.cpp b/src/platform/silabs/ConfigurationManagerImpl.cpp
index 8412075de3a914..5ebf349c15484b 100644
--- a/src/platform/silabs/ConfigurationManagerImpl.cpp
+++ b/src/platform/silabs/ConfigurationManagerImpl.cpp
@@ -255,7 +255,9 @@ CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t
 
 void ConfigurationManagerImpl::RunConfigUnitTest(void)
 {
+#if CONFIG_BUILD_FOR_HOST_UNIT_TEST
     SilabsConfig::RunConfigUnitTest();
+#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
 }
 
 void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
diff --git a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp
index 214b0974668fbb..1eb7b01bfc83c9 100644
--- a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp
+++ b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp
@@ -45,7 +45,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index 03afa5efe29487..02668206e26662 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -194,20 +194,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetUpTime(uint64_t & upTime)
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
 {
-    uint64_t upTime = 0;
-
-    if (GetUpTime(upTime) == CHIP_NO_ERROR)
-    {
-        uint32_t totalHours = 0;
-        if (ConfigurationMgr().GetTotalOperationalHours(totalHours) == CHIP_NO_ERROR)
-        {
-            VerifyOrReturnError(upTime / 3600 <= UINT32_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
-            totalOperationalHours = totalHours + static_cast<uint32_t>(upTime / 3600);
-            return CHIP_NO_ERROR;
-        }
-    }
-
-    return CHIP_ERROR_INVALID_TIME;
+    return ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours);
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
diff --git a/src/platform/silabs/MigrationManager.cpp b/src/platform/silabs/MigrationManager.cpp
index e07b730e67f048..f78facc938471b 100644
--- a/src/platform/silabs/MigrationManager.cpp
+++ b/src/platform/silabs/MigrationManager.cpp
@@ -37,7 +37,9 @@ typedef struct
 
 #define COUNT_OF(A) (sizeof(A) / sizeof((A)[0]))
 static migrationData_t migrationTable[] = {
-    { .migrationGroup = 1, .migrationFunc = MigrateKvsMap }, { .migrationGroup = 2, .migrationFunc = MigrateDacProvider },
+    { .migrationGroup = 1, .migrationFunc = MigrateKvsMap },
+    { .migrationGroup = 2, .migrationFunc = MigrateDacProvider },
+    { .migrationGroup = 3, .migrationFunc = MigrateCounterConfigs },
     // add any additional migration neccesary. migrationGroup should stay equal if done in the same commit or increment by 1 for
     // each new entry.
 };
@@ -60,6 +62,27 @@ void MigrationManager::applyMigrations()
     }
     SilabsConfig::WriteConfigValue(SilabsConfig::kConfigKey_MigrationCounter, completedMigrationGroup);
 }
+void MigrationManager::MigrateUint32(uint32_t old_key, uint32_t new_key)
+{
+    uint32_t value = 0;
+    if (SilabsConfig::ConfigValueExists(old_key) && (CHIP_NO_ERROR == SilabsConfig::ReadConfigValue(old_key, value)))
+    {
+        if (CHIP_NO_ERROR == SilabsConfig::WriteConfigValue(new_key, value))
+        {
+            // Free memory of old key location
+            SilabsConfig::ClearConfigValue(old_key);
+        }
+    }
+}
+
+void MigrateCounterConfigs(void)
+{
+    constexpr uint32_t kOldConfigKey_BootCount             = SilabsConfigKey(SilabsConfig::kMatterCounter_KeyBase, 0x00);
+    constexpr uint32_t kOldConfigKey_TotalOperationalHours = SilabsConfigKey(SilabsConfig::kMatterCounter_KeyBase, 0x01);
+
+    MigrationManager::MigrateUint32(kOldConfigKey_BootCount, SilabsConfig::kConfigKey_BootCount);
+    MigrationManager::MigrateUint32(kOldConfigKey_TotalOperationalHours, SilabsConfig::kConfigKey_TotalOperationalHours);
+}
 
 MigrationManager & MigrationManager::GetMigrationInstance()
 {
diff --git a/src/platform/silabs/MigrationManager.h b/src/platform/silabs/MigrationManager.h
index 708fdb3368feef..69afbf47ac7562 100644
--- a/src/platform/silabs/MigrationManager.h
+++ b/src/platform/silabs/MigrationManager.h
@@ -31,6 +31,7 @@ class MigrationManager
      */
     static MigrationManager & GetMigrationInstance();
     static void applyMigrations();
+    static void MigrateUint32(uint32_t old_key, uint32_t new_key);
 
 private:
     MigrationManager(){};
@@ -43,6 +44,7 @@ class MigrationManager
  */
 void MigrateKvsMap(void);
 void MigrateDacProvider(void);
+void MigrateCounterConfigs(void);
 
 } // namespace Silabs
 } // namespace DeviceLayer
diff --git a/src/platform/silabs/PlatformManagerImpl.h b/src/platform/silabs/PlatformManagerImpl.h
index 7d6eef7cd90ed3..4a0bfdb52c1e81 100644
--- a/src/platform/silabs/PlatformManagerImpl.h
+++ b/src/platform/silabs/PlatformManagerImpl.h
@@ -68,6 +68,10 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     System::Clock::Timestamp GetStartTime() { return mStartTime; }
 
 private:
+    // ===== Members for internal use
+
+    static void UpdateOperationalHours(System::Layer * systemLayer, void * appState);
+
     // ===== Methods that implement the PlatformManager abstract interface.
 
     CHIP_ERROR _InitChipStack(void);
diff --git a/src/platform/silabs/SiWx917/PlatformManagerImpl.cpp b/src/platform/silabs/SiWx917/PlatformManagerImpl.cpp
index d14947d65af3f3..c3db4afb2510f5 100644
--- a/src/platform/silabs/SiWx917/PlatformManagerImpl.cpp
+++ b/src/platform/silabs/SiWx917/PlatformManagerImpl.cpp
@@ -41,6 +41,8 @@
 #include "AppConfig.h"
 #include "FreeRTOS.h"
 
+using namespace chip::DeviceLayer::Internal;
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -111,32 +113,30 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
 
+    // Start timer to increment TotalOperationalHours every hour
+    SystemLayer().StartTimer(System::Clock::Seconds32(kSecondsPerHour), UpdateOperationalHours, NULL);
+
 exit:
     return err;
 }
 
-void PlatformManagerImpl::_Shutdown()
+void PlatformManagerImpl::UpdateOperationalHours(System::Layer * systemLayer, void * appState)
 {
-    uint64_t upTime = 0;
+    uint32_t totalOperationalHours = 0;
 
-    if (GetDiagnosticDataProvider().GetUpTime(upTime) == CHIP_NO_ERROR)
+    if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
     {
-        uint32_t totalOperationalHours = 0;
-
-        if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
-        {
-            ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours + static_cast<uint32_t>(upTime / 3600));
-        }
-        else
-        {
-            ChipLogError(DeviceLayer, "Failed to get total operational hours of the Node");
-        }
+        ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours + 1);
     }
     else
     {
-        ChipLogError(DeviceLayer, "Failed to get current uptime since the Node’s last reboot");
+        ChipLogError(DeviceLayer, "Failed to get total operational hours of the Node");
     }
 
+    SystemLayer().StartTimer(System::Clock::Seconds32(kSecondsPerHour), UpdateOperationalHours, NULL);
+}
+void PlatformManagerImpl::_Shutdown()
+{
     Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_Shutdown();
 }
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
diff --git a/src/platform/silabs/SilabsConfig.cpp b/src/platform/silabs/SilabsConfig.cpp
index 6c362d41c2c330..356aa4c39b1703 100644
--- a/src/platform/silabs/SilabsConfig.cpp
+++ b/src/platform/silabs/SilabsConfig.cpp
@@ -552,11 +552,13 @@ bool SilabsConfig::ValidConfigKey(Key key)
     return false;
 }
 
+#if CONFIG_BUILD_FOR_HOST_UNIT_TEST
 void SilabsConfig::RunConfigUnitTest()
 {
     // Run common unit test.
     ::chip::DeviceLayer::Internal::RunConfigUnitTest<SilabsConfig>();
 }
+#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
 
 void SilabsConfig::RepackNvm3Flash(void)
 {
diff --git a/src/platform/silabs/SilabsConfig.h b/src/platform/silabs/SilabsConfig.h
index 0f820f6fb8268e..92a879177530c7 100644
--- a/src/platform/silabs/SilabsConfig.h
+++ b/src/platform/silabs/SilabsConfig.h
@@ -93,66 +93,67 @@ class SilabsConfig
 
     // Key definitions for well-known configuration values.
     // Factory config keys
-    static constexpr Key kConfigKey_SerialNum             = SilabsConfigKey(kMatterFactory_KeyBase, 0x00);
-    static constexpr Key kConfigKey_MfrDeviceId           = SilabsConfigKey(kMatterFactory_KeyBase, 0x01);
-    static constexpr Key kConfigKey_MfrDeviceCert         = SilabsConfigKey(kMatterFactory_KeyBase, 0x02);
-    static constexpr Key kConfigKey_MfrDevicePrivateKey   = SilabsConfigKey(kMatterFactory_KeyBase, 0x03);
-    static constexpr Key kConfigKey_ManufacturingDate     = SilabsConfigKey(kMatterFactory_KeyBase, 0x04);
-    static constexpr Key kConfigKey_SetupPayloadBitSet    = SilabsConfigKey(kMatterFactory_KeyBase, 0x05);
-    static constexpr Key kConfigKey_MfrDeviceICACerts     = SilabsConfigKey(kMatterFactory_KeyBase, 0x06);
-    static constexpr Key kConfigKey_SetupDiscriminator    = SilabsConfigKey(kMatterFactory_KeyBase, 0x07);
-    static constexpr Key kConfigKey_Spake2pIterationCount = SilabsConfigKey(kMatterFactory_KeyBase, 0x08);
-    static constexpr Key kConfigKey_Spake2pSalt           = SilabsConfigKey(kMatterFactory_KeyBase, 0x09);
-    static constexpr Key kConfigKey_Spake2pVerifier       = SilabsConfigKey(kMatterFactory_KeyBase, 0x0A);
-    static constexpr Key kConfigKey_ProductId             = SilabsConfigKey(kMatterFactory_KeyBase, 0x0B);
-    static constexpr Key kConfigKey_VendorId              = SilabsConfigKey(kMatterFactory_KeyBase, 0x0C);
-    static constexpr Key kConfigKey_VendorName            = SilabsConfigKey(kMatterFactory_KeyBase, 0x0D);
-    static constexpr Key kConfigKey_ProductName           = SilabsConfigKey(kMatterFactory_KeyBase, 0x0E);
-    static constexpr Key kConfigKey_HardwareVersionString = SilabsConfigKey(kMatterFactory_KeyBase, 0x0F);
-    static constexpr Key KConfigKey_ProductLabel          = SilabsConfigKey(kMatterFactory_KeyBase, 0x10);
-    static constexpr Key kConfigKey_ProductURL            = SilabsConfigKey(kMatterFactory_KeyBase, 0x11);
-    static constexpr Key kConfigKey_PartNumber            = SilabsConfigKey(kMatterFactory_KeyBase, 0x12);
-    static constexpr Key kConfigKey_UniqueId              = SilabsConfigKey(kMatterFactory_KeyBase, 0x1F);
-    static constexpr Key kConfigKey_Creds_KeyId           = SilabsConfigKey(kMatterFactory_KeyBase, 0x20);
-    static constexpr Key kConfigKey_Creds_Base_Addr       = SilabsConfigKey(kMatterFactory_KeyBase, 0x21);
-    static constexpr Key kConfigKey_Creds_DAC_Offset      = SilabsConfigKey(kMatterFactory_KeyBase, 0x22);
-    static constexpr Key kConfigKey_Creds_DAC_Size        = SilabsConfigKey(kMatterFactory_KeyBase, 0x23);
-    static constexpr Key kConfigKey_Creds_PAI_Offset      = SilabsConfigKey(kMatterFactory_KeyBase, 0x24);
-    static constexpr Key kConfigKey_Creds_PAI_Size        = SilabsConfigKey(kMatterFactory_KeyBase, 0x25);
-    static constexpr Key kConfigKey_Creds_CD_Offset       = SilabsConfigKey(kMatterFactory_KeyBase, 0x26);
-    static constexpr Key kConfigKey_Creds_CD_Size         = SilabsConfigKey(kMatterFactory_KeyBase, 0x27);
+    static constexpr Key kConfigKey_SerialNum              = SilabsConfigKey(kMatterFactory_KeyBase, 0x00);
+    static constexpr Key kConfigKey_MfrDeviceId            = SilabsConfigKey(kMatterFactory_KeyBase, 0x01);
+    static constexpr Key kConfigKey_MfrDeviceCert          = SilabsConfigKey(kMatterFactory_KeyBase, 0x02);
+    static constexpr Key kConfigKey_MfrDevicePrivateKey    = SilabsConfigKey(kMatterFactory_KeyBase, 0x03);
+    static constexpr Key kConfigKey_ManufacturingDate      = SilabsConfigKey(kMatterFactory_KeyBase, 0x04);
+    static constexpr Key kConfigKey_SetupPayloadBitSet     = SilabsConfigKey(kMatterFactory_KeyBase, 0x05);
+    static constexpr Key kConfigKey_MfrDeviceICACerts      = SilabsConfigKey(kMatterFactory_KeyBase, 0x06);
+    static constexpr Key kConfigKey_SetupDiscriminator     = SilabsConfigKey(kMatterFactory_KeyBase, 0x07);
+    static constexpr Key kConfigKey_Spake2pIterationCount  = SilabsConfigKey(kMatterFactory_KeyBase, 0x08);
+    static constexpr Key kConfigKey_Spake2pSalt            = SilabsConfigKey(kMatterFactory_KeyBase, 0x09);
+    static constexpr Key kConfigKey_Spake2pVerifier        = SilabsConfigKey(kMatterFactory_KeyBase, 0x0A);
+    static constexpr Key kConfigKey_ProductId              = SilabsConfigKey(kMatterFactory_KeyBase, 0x0B);
+    static constexpr Key kConfigKey_VendorId               = SilabsConfigKey(kMatterFactory_KeyBase, 0x0C);
+    static constexpr Key kConfigKey_VendorName             = SilabsConfigKey(kMatterFactory_KeyBase, 0x0D);
+    static constexpr Key kConfigKey_ProductName            = SilabsConfigKey(kMatterFactory_KeyBase, 0x0E);
+    static constexpr Key kConfigKey_HardwareVersionString  = SilabsConfigKey(kMatterFactory_KeyBase, 0x0F);
+    static constexpr Key KConfigKey_ProductLabel           = SilabsConfigKey(kMatterFactory_KeyBase, 0x10);
+    static constexpr Key kConfigKey_ProductURL             = SilabsConfigKey(kMatterFactory_KeyBase, 0x11);
+    static constexpr Key kConfigKey_PartNumber             = SilabsConfigKey(kMatterFactory_KeyBase, 0x12);
+    static constexpr Key kConfigKey_UniqueId               = SilabsConfigKey(kMatterFactory_KeyBase, 0x1F);
+    static constexpr Key kConfigKey_Creds_KeyId            = SilabsConfigKey(kMatterFactory_KeyBase, 0x20);
+    static constexpr Key kConfigKey_Creds_Base_Addr        = SilabsConfigKey(kMatterFactory_KeyBase, 0x21);
+    static constexpr Key kConfigKey_Creds_DAC_Offset       = SilabsConfigKey(kMatterFactory_KeyBase, 0x22);
+    static constexpr Key kConfigKey_Creds_DAC_Size         = SilabsConfigKey(kMatterFactory_KeyBase, 0x23);
+    static constexpr Key kConfigKey_Creds_PAI_Offset       = SilabsConfigKey(kMatterFactory_KeyBase, 0x24);
+    static constexpr Key kConfigKey_Creds_PAI_Size         = SilabsConfigKey(kMatterFactory_KeyBase, 0x25);
+    static constexpr Key kConfigKey_Creds_CD_Offset        = SilabsConfigKey(kMatterFactory_KeyBase, 0x26);
+    static constexpr Key kConfigKey_Creds_CD_Size          = SilabsConfigKey(kMatterFactory_KeyBase, 0x27);
+    static constexpr Key kConfigKey_Test_Event_Trigger_Key = SilabsConfigKey(kMatterFactory_KeyBase, 0x28);
     // Matter Config Keys
-    static constexpr Key kConfigKey_ServiceConfig      = SilabsConfigKey(kMatterConfig_KeyBase, 0x01);
-    static constexpr Key kConfigKey_PairedAccountId    = SilabsConfigKey(kMatterConfig_KeyBase, 0x02);
-    static constexpr Key kConfigKey_ServiceId          = SilabsConfigKey(kMatterConfig_KeyBase, 0x03);
-    static constexpr Key kConfigKey_LastUsedEpochKeyId = SilabsConfigKey(kMatterConfig_KeyBase, 0x05);
-    static constexpr Key kConfigKey_FailSafeArmed      = SilabsConfigKey(kMatterConfig_KeyBase, 0x06);
-    static constexpr Key kConfigKey_GroupKey           = SilabsConfigKey(kMatterConfig_KeyBase, 0x07);
-    static constexpr Key kConfigKey_HardwareVersion    = SilabsConfigKey(kMatterConfig_KeyBase, 0x08);
-    static constexpr Key kConfigKey_RegulatoryLocation = SilabsConfigKey(kMatterConfig_KeyBase, 0x09);
-    static constexpr Key kConfigKey_CountryCode        = SilabsConfigKey(kMatterConfig_KeyBase, 0x0A);
-    static constexpr Key kConfigKey_WiFiSSID           = SilabsConfigKey(kMatterConfig_KeyBase, 0x0C);
-    static constexpr Key kConfigKey_WiFiPSK            = SilabsConfigKey(kMatterConfig_KeyBase, 0x0D);
-    static constexpr Key kConfigKey_WiFiSEC            = SilabsConfigKey(kMatterConfig_KeyBase, 0x0E);
-    static constexpr Key kConfigKey_GroupKeyBase       = SilabsConfigKey(kMatterConfig_KeyBase, 0x0F);
-    static constexpr Key kConfigKey_LockUser           = SilabsConfigKey(kMatterConfig_KeyBase, 0x10);
-    static constexpr Key kConfigKey_Credential         = SilabsConfigKey(kMatterConfig_KeyBase, 0x11);
-    static constexpr Key kConfigKey_LockUserName       = SilabsConfigKey(kMatterConfig_KeyBase, 0x12);
-    static constexpr Key kConfigKey_CredentialData     = SilabsConfigKey(kMatterConfig_KeyBase, 0x13);
-    static constexpr Key kConfigKey_UserCredentials    = SilabsConfigKey(kMatterConfig_KeyBase, 0x14);
-    static constexpr Key kConfigKey_WeekDaySchedules   = SilabsConfigKey(kMatterConfig_KeyBase, 0x15);
-    static constexpr Key kConfigKey_YearDaySchedules   = SilabsConfigKey(kMatterConfig_KeyBase, 0x16);
-    static constexpr Key kConfigKey_HolidaySchedules   = SilabsConfigKey(kMatterConfig_KeyBase, 0x17);
-    static constexpr Key kConfigKey_OpKeyMap           = SilabsConfigKey(kMatterConfig_KeyBase, 0x20);
+    static constexpr Key kConfigKey_ServiceConfig         = SilabsConfigKey(kMatterConfig_KeyBase, 0x01);
+    static constexpr Key kConfigKey_PairedAccountId       = SilabsConfigKey(kMatterConfig_KeyBase, 0x02);
+    static constexpr Key kConfigKey_ServiceId             = SilabsConfigKey(kMatterConfig_KeyBase, 0x03);
+    static constexpr Key kConfigKey_LastUsedEpochKeyId    = SilabsConfigKey(kMatterConfig_KeyBase, 0x05);
+    static constexpr Key kConfigKey_FailSafeArmed         = SilabsConfigKey(kMatterConfig_KeyBase, 0x06);
+    static constexpr Key kConfigKey_GroupKey              = SilabsConfigKey(kMatterConfig_KeyBase, 0x07);
+    static constexpr Key kConfigKey_HardwareVersion       = SilabsConfigKey(kMatterConfig_KeyBase, 0x08);
+    static constexpr Key kConfigKey_RegulatoryLocation    = SilabsConfigKey(kMatterConfig_KeyBase, 0x09);
+    static constexpr Key kConfigKey_CountryCode           = SilabsConfigKey(kMatterConfig_KeyBase, 0x0A);
+    static constexpr Key kConfigKey_WiFiSSID              = SilabsConfigKey(kMatterConfig_KeyBase, 0x0C);
+    static constexpr Key kConfigKey_WiFiPSK               = SilabsConfigKey(kMatterConfig_KeyBase, 0x0D);
+    static constexpr Key kConfigKey_WiFiSEC               = SilabsConfigKey(kMatterConfig_KeyBase, 0x0E);
+    static constexpr Key kConfigKey_GroupKeyBase          = SilabsConfigKey(kMatterConfig_KeyBase, 0x0F);
+    static constexpr Key kConfigKey_LockUser              = SilabsConfigKey(kMatterConfig_KeyBase, 0x10);
+    static constexpr Key kConfigKey_Credential            = SilabsConfigKey(kMatterConfig_KeyBase, 0x11);
+    static constexpr Key kConfigKey_LockUserName          = SilabsConfigKey(kMatterConfig_KeyBase, 0x12);
+    static constexpr Key kConfigKey_CredentialData        = SilabsConfigKey(kMatterConfig_KeyBase, 0x13);
+    static constexpr Key kConfigKey_UserCredentials       = SilabsConfigKey(kMatterConfig_KeyBase, 0x14);
+    static constexpr Key kConfigKey_WeekDaySchedules      = SilabsConfigKey(kMatterConfig_KeyBase, 0x15);
+    static constexpr Key kConfigKey_YearDaySchedules      = SilabsConfigKey(kMatterConfig_KeyBase, 0x16);
+    static constexpr Key kConfigKey_HolidaySchedules      = SilabsConfigKey(kMatterConfig_KeyBase, 0x17);
+    static constexpr Key kConfigKey_OpKeyMap              = SilabsConfigKey(kMatterConfig_KeyBase, 0x20);
+    static constexpr Key kConfigKey_BootCount             = SilabsConfigKey(kMatterConfig_KeyBase, 0x21);
+    static constexpr Key kConfigKey_TotalOperationalHours = SilabsConfigKey(kMatterConfig_KeyBase, 0x22);
 
     static constexpr Key kConfigKey_GroupKeyMax =
         SilabsConfigKey(kMatterConfig_KeyBase, 0x1E); // Allows 16 Group Keys to be created.
 
     // Matter Counter Keys
-    static constexpr Key kConfigKey_BootCount             = SilabsConfigKey(kMatterCounter_KeyBase, 0x00);
-    static constexpr Key kConfigKey_TotalOperationalHours = SilabsConfigKey(kMatterCounter_KeyBase, 0x01);
-    static constexpr Key kConfigKey_LifeTimeCounter       = SilabsConfigKey(kMatterCounter_KeyBase, 0x02);
-    static constexpr Key kConfigKey_MigrationCounter      = SilabsConfigKey(kMatterCounter_KeyBase, 0x03);
+    static constexpr Key kConfigKey_LifeTimeCounter  = SilabsConfigKey(kMatterCounter_KeyBase, 0x02);
+    static constexpr Key kConfigKey_MigrationCounter = SilabsConfigKey(kMatterCounter_KeyBase, 0x03);
 
     // Matter KVS storage Keys
     static constexpr Key kConfigKey_KvsStringKeyMap = SilabsConfigKey(kMatterKvs_KeyBase, 0x00);
@@ -163,7 +164,7 @@ class SilabsConfig
     static constexpr Key kMinConfigKey_MatterFactory = SilabsConfigKey(kMatterFactory_KeyBase, 0x00);
     static constexpr Key kMaxConfigKey_MatterFactory = SilabsConfigKey(kMatterFactory_KeyBase, 0x2F);
     static constexpr Key kMinConfigKey_MatterConfig  = SilabsConfigKey(kMatterConfig_KeyBase, 0x00);
-    static constexpr Key kMaxConfigKey_MatterConfig  = SilabsConfigKey(kMatterConfig_KeyBase, 0x20);
+    static constexpr Key kMaxConfigKey_MatterConfig  = SilabsConfigKey(kMatterConfig_KeyBase, 0x22);
 
     // Allows 32 Counters to be created.
     static constexpr Key kMinConfigKey_MatterCounter = SilabsConfigKey(kMatterCounter_KeyBase, 0x00);
diff --git a/src/platform/silabs/efr32/ConnectivityManagerImpl.cpp b/src/platform/silabs/efr32/ConnectivityManagerImpl.cpp
index c38a5e5bb1e268..e5d3b319389a4e 100644
--- a/src/platform/silabs/efr32/ConnectivityManagerImpl.cpp
+++ b/src/platform/silabs/efr32/ConnectivityManagerImpl.cpp
@@ -40,7 +40,6 @@
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/silabs/efr32/PlatformManagerImpl.cpp b/src/platform/silabs/efr32/PlatformManagerImpl.cpp
index 25de6d51d164b2..2ebc64d77babc5 100644
--- a/src/platform/silabs/efr32/PlatformManagerImpl.cpp
+++ b/src/platform/silabs/efr32/PlatformManagerImpl.cpp
@@ -37,6 +37,8 @@
 #include "AppConfig.h"
 #include "FreeRTOS.h"
 
+using namespace chip::DeviceLayer::Internal;
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -62,32 +64,30 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
     SuccessOrExit(err);
 
+    // Start timer to increment TotalOperationalHours every hour
+    SystemLayer().StartTimer(System::Clock::Seconds32(kSecondsPerHour), UpdateOperationalHours, NULL);
+
 exit:
     return err;
 }
 
-void PlatformManagerImpl::_Shutdown()
+void PlatformManagerImpl::UpdateOperationalHours(System::Layer * systemLayer, void * appState)
 {
-    uint64_t upTime = 0;
+    uint32_t totalOperationalHours = 0;
 
-    if (GetDiagnosticDataProvider().GetUpTime(upTime) == CHIP_NO_ERROR)
+    if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
     {
-        uint32_t totalOperationalHours = 0;
-
-        if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
-        {
-            ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours + static_cast<uint32_t>(upTime / 3600));
-        }
-        else
-        {
-            ChipLogError(DeviceLayer, "Failed to get total operational hours of the Node");
-        }
+        ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours + 1);
     }
     else
     {
-        ChipLogError(DeviceLayer, "Failed to get current uptime since the Node’s last reboot");
+        ChipLogError(DeviceLayer, "Failed to get total operational hours of the Node");
     }
 
+    SystemLayer().StartTimer(System::Clock::Seconds32(kSecondsPerHour), UpdateOperationalHours, NULL);
+}
+void PlatformManagerImpl::_Shutdown()
+{
     Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_Shutdown();
 }
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
diff --git a/src/platform/stm32/ConnectivityManagerImpl.cpp b/src/platform/stm32/ConnectivityManagerImpl.cpp
index 0a3f507a999532..50601c29721809 100644
--- a/src/platform/stm32/ConnectivityManagerImpl.cpp
+++ b/src/platform/stm32/ConnectivityManagerImpl.cpp
@@ -37,7 +37,6 @@
 #include <platform/internal/BLEManager.h>
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/stm32/args.gni b/src/platform/stm32/args.gni
index 7af2988e199e70..56fd4e52bab0d6 100644
--- a/src/platform/stm32/args.gni
+++ b/src/platform/stm32/args.gni
@@ -25,6 +25,7 @@ chip_device_platform = "stm32"
 chip_with_lwip = false
 mbedtls_target = "${stm32_sdk_build_root}:mbedtls"
 openthread_external_mbedtls = mbedtls_target
+openthread_root = "${chip_root}/third_party/openthread/ot-stm32"
 
 # GLOBAL CONFIG
 chip_monolithic_tests = false
diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h
index 245b802f9a88cd..f53be5b303f383 100644
--- a/src/platform/telink/CHIPDevicePlatformConfig.h
+++ b/src/platform/telink/CHIPDevicePlatformConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022-2023 Project CHIP Authors
+ *    Copyright (c) 2022-2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -87,7 +87,11 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #endif
 
+#ifdef CONFIG_NET_L2_OPENTHREAD
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
+#endif
 
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI 0
diff --git a/src/platform/telink/ConnectivityManagerImpl.cpp b/src/platform/telink/ConnectivityManagerImpl.cpp
index 130a5634f5d2d1..601bac3f22fe71 100644
--- a/src/platform/telink/ConnectivityManagerImpl.cpp
+++ b/src/platform/telink/ConnectivityManagerImpl.cpp
@@ -38,7 +38,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
diff --git a/src/platform/telink/tlsr9258a.overlay b/src/platform/telink/tlsr9258a.overlay
index b300411d6da621..21918dc0fe06c5 100644
--- a/src/platform/telink/tlsr9258a.overlay
+++ b/src/platform/telink/tlsr9258a.overlay
@@ -1,79 +1,61 @@
 / {
-	aliases {
-		system-state-led = &led_red;
-		pwm-led0 = &pwm_led0;
-		pwm-led1 = &pwm_led1;
-		pwm-led2 = &pwm_led2;
-		pwm-led3 = &pwm_led3;
-	};
+	/* Short TL_Key3 (J6 pin 31) to ground (J4 pin 3, 5, 9) */
+	key_pool {
+		compatible = "gpio-keys";
 
-	pwm_leds {
-		/delete-node/ pwm_led_0;
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Blue";
-		};
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Green";
+		inp {
+			gpios = <&gpiod 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpiod 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
-		pwm_led2: pwm_led_2 {
-			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Red";
-		};
-		pwm_led3: pwm_led_3 {
-			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM IDENTIFY LED Green";
-	    };
-    };
+	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_3;
+	key_matrix {
 		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
 
-		key_matrix_col1: key_matrix_col1 {
-			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
+		col {
+			gpios = <&gpiod 5 GPIO_ACTIVE_HIGH>,
+					<&gpiod 7 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_col2: key_matrix_col2 {
-			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
+
+		row {
+			gpios = <&gpiod 4 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+					<&gpiod 6 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
 		};
-		key_matrix_row1: key_matrix_row1 {
-			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+	};
+
+	led_pool {
+		compatible = "gpio-leds";
+
+		out {
+			gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_row2: key_matrix_row2 {
-			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+	};
+
+	pwm_pool {
+		compatible = "pwm-leds";
+		out {
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
 };
 
+&pwm0 {
+	/* On board RGB LEDs */
+	pinctrl-ch0 = <&pwm_ch0_pc1_default>;
+	pinctrl-ch2 = <&pwm_ch1_pc0_default>;
+	pinctrl-ch1 = <&pwm_ch2_pc2_default>;
+};
+
 &pinctrl {
-	pwm_ch0_pd0_default: pwm_ch0_pd0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_0, B95_FUNC_PWM0)>;
-	};
-	pwm_ch1_pd1_default: pwm_ch1_pd1_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_1, B95_FUNC_PWM1)>;
+	pwm_ch0_pc1_default: pwm_ch0_pc1_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_C, B9x_PIN_1, B95_FUNC_PWM0)>;
 	};
-	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B95_FUNC_PWM2)>;
+	pwm_ch1_pc0_default: pwm_ch1_pc0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_C, B9x_PIN_0, B95_FUNC_PWM1)>;
 	};
-	pwm_ch3_pe0_default: pwm_ch3_pe0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_0, B95_FUNC_PWM3)>;
+	pwm_ch2_pc2_default: pwm_ch2_pc2_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_C, B9x_PIN_2, B95_FUNC_PWM2)>;
 	};
 };
-
-&pwm0 {
-	pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>;
-};
diff --git a/src/platform/telink/tlsr9258a_2m_flash.overlay b/src/platform/telink/tlsr9258a_2m_flash.overlay
new file mode 120000
index 00000000000000..3b425c1198b983
--- /dev/null
+++ b/src/platform/telink/tlsr9258a_2m_flash.overlay
@@ -0,0 +1 @@
+tlsr9518adk80d_2m_flash.overlay
\ No newline at end of file
diff --git a/src/platform/telink/tlsr9258a_retention.overlay b/src/platform/telink/tlsr9258a_retention.overlay
index 98a0e5af508f32..0890951e787f96 100644
--- a/src/platform/telink/tlsr9258a_retention.overlay
+++ b/src/platform/telink/tlsr9258a_retention.overlay
@@ -17,37 +17,6 @@
 
 	/delete-node/ leds;
 	/delete-node/ pwm_leds;
-
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_3;
-		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-
-		key_matrix_col1: key_matrix_col1 {
-			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
-		};
-		key_matrix_col2: key_matrix_col2 {
-			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
-		};
-		key_matrix_row1: key_matrix_row1 {
-			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
-		};
-		key_matrix_row2: key_matrix_row2 {
-			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
-		};
-	};
 };
 
 &pwm0 {
diff --git a/src/platform/telink/tlsr9518adk80d.overlay b/src/platform/telink/tlsr9518adk80d.overlay
index 7ad86efd5edc0a..30ba76f5c42c9b 100644
--- a/src/platform/telink/tlsr9518adk80d.overlay
+++ b/src/platform/telink/tlsr9518adk80d.overlay
@@ -1,80 +1,63 @@
 / {
-	aliases {
-		system-state-led = &led_red;
-		pwm-led0 = &pwm_led0;
-		pwm-led1 = &pwm_led1;
-		pwm-led2 = &pwm_led2;
-		pwm-led3 = &pwm_led3;
-	};
+	/* Short TL_Key1 (J20 pin 15) to ground (J50 pin 15-23) */
+	key_pool {
+		compatible = "gpio-keys";
 
-	pwm_leds {
-		/delete-node/ pwm_led_0;
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Blue";
-		};
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Green";
-		};
-		pwm_led2: pwm_led_2 {
-			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Red";
+		inp {
+			gpios = <&gpioc 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpioc 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
-		pwm_led3: pwm_led_3 {
-			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM IDENTIFY LED Green";
-	    };
-    };
+	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_3;
+	key_matrix {
 		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpioc 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpioc 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpioc 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpioc 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
 
-		key_matrix_col1: key_matrix_col1 {
-			gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>;
+		col {
+			gpios = <&gpioc 2 GPIO_ACTIVE_HIGH>,
+					<&gpioc 0 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_col2: key_matrix_col2 {
-			gpios = <&gpioc 1 GPIO_ACTIVE_HIGH>;
+
+		row {
+			gpios = <&gpioc 3 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+					<&gpioc 1 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
 		};
-		key_matrix_row1: key_matrix_row1 {
-			gpios = <&gpioc 2 GPIO_PULL_DOWN>;
+	};
+
+	led_pool{
+		compatible = "gpio-leds";
+
+		out {
+			gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_row2: key_matrix_row2 {
-			gpios = <&gpioc 0 GPIO_PULL_DOWN>;
+	};
+
+	pwm_pool {
+		compatible = "pwm-leds";
+		out {
+			/* Use blue led as indication, red & green - RGB-fixture */
+			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
 };
 
+&pwm0 {
+	/* On board RGB LEDs */
+	pinctrl-ch2 = <&pwm_ch2_pb7_default>;
+	pinctrl-ch1 = <&pwm_ch1_pb5_default>;
+	pinctrl-ch0 = <&pwm_ch0_pb4_default>;
+};
+
 &pinctrl {
-	pwm_ch0_pb4_default: pwm_ch0_pb4_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_4, B91_FUNC_B)>;
+	pwm_ch2_pb7_default: pwm_ch2_pb7_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_7, B91_FUNC_A)>;
 	};
 	pwm_ch1_pb5_default: pwm_ch1_pb5_default {
 		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_5, B91_FUNC_C)>;
 	};
-	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B91_FUNC_C)>;
-	};
-	pwm_ch3_pe0_default: pwm_ch3_pe0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_0, B91_FUNC_C)>;
+	pwm_ch0_pb4_default: pwm_ch0_pb4_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_4, B91_FUNC_B)>;
 	};
 };
 
-&pwm0 {
-	pinctrl-0 = <&pwm_ch0_pb4_default &pwm_ch1_pb5_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>;
-};
-
diff --git a/src/platform/telink/1m_flash.overlay b/src/platform/telink/tlsr9518adk80d_1m_flash.overlay
similarity index 69%
rename from src/platform/telink/1m_flash.overlay
rename to src/platform/telink/tlsr9518adk80d_1m_flash.overlay
index 3a05c3cd43b8d0..3bbd690e8e9f97 100644
--- a/src/platform/telink/1m_flash.overlay
+++ b/src/platform/telink/tlsr9518adk80d_1m_flash.overlay
@@ -1,10 +1,3 @@
-/*
- * In case of change partitions size - check if factory data size is correct
- * in matter/connectedhomeip/config/telink/chip-module/CMakeLists.txt, variable "FD_SEEK"
- * Also check matter/connectedhomeip/config/telink/chip-module/generate_factory_data.cmake,
- * variable "FD_OFFSET" and argument "size"
- */
-
 &flash {
 	reg = <0x20000000 0x100000>;
 
diff --git a/src/platform/telink/2m_flash.overlay b/src/platform/telink/tlsr9518adk80d_2m_flash.overlay
similarity index 72%
rename from src/platform/telink/2m_flash.overlay
rename to src/platform/telink/tlsr9518adk80d_2m_flash.overlay
index 09e60eca748805..1d54c867bbcb79 100644
--- a/src/platform/telink/2m_flash.overlay
+++ b/src/platform/telink/tlsr9518adk80d_2m_flash.overlay
@@ -1,10 +1,3 @@
-/*
- * In case of change partitions size - check if factory data size is correct
- * in matter/connectedhomeip/config/telink/chip-module/CMakeLists.txt, variable "FD_SEEK"
- * Also check matter/connectedhomeip/config/telink/chip-module/generate_factory_data.cmake,
- * variable "FD_OFFSET" and argument "size"
- */
-
 &flash {
 	reg = <0x20000000 0x200000>;
 
diff --git a/src/platform/telink/4m_flash.overlay b/src/platform/telink/tlsr9518adk80d_4m_flash.overlay
similarity index 72%
rename from src/platform/telink/4m_flash.overlay
rename to src/platform/telink/tlsr9518adk80d_4m_flash.overlay
index 657684d8fc5672..77d5bac433966a 100644
--- a/src/platform/telink/4m_flash.overlay
+++ b/src/platform/telink/tlsr9518adk80d_4m_flash.overlay
@@ -1,10 +1,3 @@
-/*
- * In case of change partitions size - check if factory data size is correct
- * in matter/connectedhomeip/config/telink/chip-module/CMakeLists.txt, variable "FD_SEEK"
- * Also check matter/connectedhomeip/config/telink/chip-module/generate_factory_data.cmake,
- * variable "FD_OFFSET" and argument "size"
- */
-
 &flash {
 	reg = <0x20000000 0x400000>;
 
diff --git a/src/platform/telink/tlsr9518adk80d_mars.overlay b/src/platform/telink/tlsr9518adk80d_mars.overlay
index 303474ca04774d..a8a130aa2cac85 100644
--- a/src/platform/telink/tlsr9518adk80d_mars.overlay
+++ b/src/platform/telink/tlsr9518adk80d_mars.overlay
@@ -2,54 +2,24 @@
 #include <zephyr/dt-bindings/led/led.h>
 
 / {
-	aliases {
-		led-strip = &led_strip;
-	};
-
-	leds {
-		/delete-node/ led_3;
+	key_pool {
+		compatible = "gpio-keys";
 
-		led_red: led_3 {
-			label = "LED Red";
-			gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;
+		inp {
+			gpios = <&gpiod 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpiod 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
 	};
 
-	pwm_leds {
-		/delete-node/ pwm_led_0;
-		/delete-node/ pwm_led_1;
-		/delete-node/ pwm_led_2;
-		/delete-node/ pwm_led_3;
+	led_pool {
+		compatible = "gpio-leds";
 
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Blue";
-		};
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Green";
-		};
-		pwm_led2: pwm_led_2 {
-			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Red";
-		};
-		pwm_led3: pwm_led_3 {
-			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM IDENTIFY LED Green";
+		out {
+			gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_4;
-		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpiod 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiod 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-	};
+	/delete-node/ pwm_pool;
 
 	led_strip: ws2812 {
 		compatible = "worldsemi,ws2812-gpio";
@@ -79,20 +49,6 @@
 	i2c_sda_pc2_default: i2c_sda_pc2_default {
 		pinmux = <B9x_PINMUX_SET(B9x_PORT_C, B9x_PIN_2, B91_FUNC_A)>;
 	};
-
-	/* PWMs */
-	pwm_ch0_pe3_default: pwm_ch0_pe3_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_3, B91_FUNC_C)>;
-	};
-	pwm_ch1_pb5_default: pwm_ch1_pb5_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_5, B91_FUNC_C)>;
-	};
-	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B91_FUNC_C)>;
-	};
-	pwm_ch4_pe4_default: pwm_ch4_pe4_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_4, B91_FUNC_C)>;
-	};
 };
 
 &i2c {
@@ -103,7 +59,3 @@
 		reg = <0x44>;
 	};
 };
-
-&pwm0 {
-	pinctrl-0 = <&pwm_ch0_pe3_default &pwm_ch1_pb5_default &pwm_ch2_pe2_default &pwm_ch4_pe4_default>;
-};
diff --git a/src/platform/telink/tlsr9518adk80d_retention.overlay b/src/platform/telink/tlsr9518adk80d_retention.overlay
new file mode 100644
index 00000000000000..7921c6193d1519
--- /dev/null
+++ b/src/platform/telink/tlsr9518adk80d_retention.overlay
@@ -0,0 +1,31 @@
+/ {
+	/*
+	 * There is no way to keep GPIOs
+	 * during deep-sleep mode so output GPIOs
+	 * and PWM's are useless.
+	 */
+
+	/* Short TL_Key1 (J20 pin 15) to ground (J50 pin 15-23) */
+	key_pool {
+		compatible = "gpio-keys";
+
+		inp {
+			gpios = <&gpioc 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpioc 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+		};
+	};
+
+	key_matrix {
+		compatible = "gpio-keys";
+
+		col {
+			gpios = <&gpioc 2 GPIO_ACTIVE_HIGH>,
+					<&gpioc 0 GPIO_ACTIVE_HIGH>;
+		};
+
+		row {
+			gpios = <&gpioc 3 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+					<&gpioc 1 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		};
+	};
+};
diff --git a/src/platform/telink/tlsr9518adk80d_usb.overlay b/src/platform/telink/tlsr9518adk80d_usb.overlay
index f2523794a0d110..452205e00f0c08 100644
--- a/src/platform/telink/tlsr9518adk80d_usb.overlay
+++ b/src/platform/telink/tlsr9518adk80d_usb.overlay
@@ -4,82 +4,58 @@
 		zephyr,shell-uart = &cdc_acm_uart0;
 	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_2;
-		/delete-node/ button_3;
-		/delete-node/ button_4;
+	key_pool {
+		compatible = "gpio-keys";
 
-		key_1: button_1 {
-			gpios = <&gpiob 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpioc 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpioc 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiob 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+		inp {
+			gpios = <&gpiob 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpiob 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
 	};
 
-	pwm_leds {
-		/delete-node/ pwm_led_0;
-		/delete-node/ pwm_led_1;
-		/delete-node/ pwm_led_2;
-		/delete-node/ pwm_led_3;
+	led_pool {
+		compatible = "gpio-leds";
 
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Blue";
-		};
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm0 5 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Green";
+		out {
+			gpios = <&gpiob 1 GPIO_ACTIVE_HIGH>,
+					<&gpioe 3 GPIO_ACTIVE_HIGH>;
 		};
-		pwm_led2: pwm_led_2 {
-			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Red";
-		};
-		pwm_led3: pwm_led_3 {
-			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM IDENTIFY LED White";
-	    };
-    };
-
-    aliases {
-		system-state-led = &led_yellow;
 	};
 
-	leds {
-		led_yellow: led_yellow {
-			gpios = <&gpiob 5 GPIO_ACTIVE_HIGH>;
-			label = "LED Yellow";
+	pwm_pool {
+		compatible = "pwm-leds";
+		out {
+			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 5 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
 };
 
+&pwm0 {
+	pinctrl-ch1 = <&pwm_ch1_pb5_default>;
+	/* On board RGB LEDs */
+	pinctrl-ch0 = <&pwm_ch0_pb4_default>;
+	pinctrl-ch5 = <&pwm_ch5_pb0_default>;
+	pinctrl-ch2 = <&pwm_ch2_pb7_default>;
+};
+
 &pinctrl {
-	pwm_ch2_pb7_default: pwm_ch2_pb7_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_7, B91_FUNC_A)>;
-	};
-	pwm_ch5_pb0_default: pwm_ch5_pb0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_0, B91_FUNC_C)>;
+	pwm_ch1_pb5_default: pwm_ch1_pb5_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_5, B91_FUNC_C)>;
 	};
 	pwm_ch0_pb4_default: pwm_ch0_pb4_default {
 		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_4, B91_FUNC_B)>;
 	};
-	pwm_ch3_pb1_default: pwm_ch3_pb1_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_1, B91_FUNC_C)>;
+	pwm_ch5_pb0_default: pwm_ch5_pb0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_0, B91_FUNC_C)>;
+	};
+	pwm_ch2_pb7_default: pwm_ch2_pb7_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_B, B9x_PIN_7, B91_FUNC_A)>;
 	};
 };
 
-&pwm0 {
-	pinctrl-0 = <&pwm_ch2_pb7_default &pwm_ch5_pb0_default &pwm_ch0_pb4_default &pwm_ch3_pb1_default>;
-};
-
-
 &zephyr_udc0 {
 	cdc_acm_uart0: cdc_acm_uart0 {
 		compatible = "zephyr,cdc-acm-uart";
@@ -97,3 +73,7 @@
 &gpioc {
 	interrupts = <38 1>;
 };
+
+&gpioe {
+	status = "okay";
+};
diff --git a/src/platform/telink/tlsr9528a.overlay b/src/platform/telink/tlsr9528a.overlay
index 9ba662d284ef37..fcd51928576ecf 100644
--- a/src/platform/telink/tlsr9528a.overlay
+++ b/src/platform/telink/tlsr9528a.overlay
@@ -1,80 +1,62 @@
 / {
-	aliases {
-		system-state-led = &led_red;
-		pwm-led0 = &pwm_led0;
-		pwm-led1 = &pwm_led1;
-		pwm-led2 = &pwm_led2;
-		pwm-led3 = &pwm_led3;
-	};
+	/* Short TL_Key3 (J5 pin 13) to ground (J3 pin 24, 26, 28, 30) */
+	key_pool {
+		compatible = "gpio-keys";
 
-	pwm_leds {
-		/delete-node/ pwm_led_0;
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Blue";
-		};
-		pwm_led1: pwm_led_1 {
-			pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Green";
+		inp {
+			gpios = <&gpiod 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpiod 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 		};
-		pwm_led2: pwm_led_2 {
-			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM LED Red";
-		};
-		pwm_led3: pwm_led_3 {
-			pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
-			label = "PWM IDENTIFY LED Green";
-	    };
-    };
+	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_3;
+	key_matrix {
 		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
 
-		key_matrix_col1: key_matrix_col1 {
-			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
+		col {
+			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>,
+					<&gpiof 6 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_col2: key_matrix_col2 {
-			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
+
+		row {
+			gpios = <&gpiod 2 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+					<&gpiod 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
 		};
-		key_matrix_row1: key_matrix_row1 {
-			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+	};
+
+	led_pool {
+		compatible = "gpio-leds";
+
+		out {
+			gpios = <&gpioe 6 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_row2: key_matrix_row2 {
-			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+	};
+
+	pwm_pool {
+		compatible = "pwm-leds";
+		out {
+			pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>,
+					<&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
 };
 
+&pwm0 {
+	/* On board RGB LEDs */
+	pinctrl-ch0 = <&pwm_ch0_pe7_default>;
+	pinctrl-ch2 = <&pwm_ch1_pd1_default>;
+	pinctrl-ch1 = <&pwm_ch2_pd0_default>;
+};
+
 &pinctrl {
-	pwm_ch0_pd0_default: pwm_ch0_pd0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_0, B92_FUNC_PWM0)>;
+	pwm_ch0_pe7_default: pwm_ch0_pe7_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_7, B92_FUNC_PWM0)>;
 	};
 	pwm_ch1_pd1_default: pwm_ch1_pd1_default {
 		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_1, B92_FUNC_PWM1)>;
 	};
-	pwm_ch2_pe2_default: pwm_ch2_pe2_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_2, B92_FUNC_PWM2)>;
-	};
-	pwm_ch3_pe0_default: pwm_ch3_pe0_default {
-		pinmux = <B9x_PINMUX_SET(B9x_PORT_E, B9x_PIN_0, B92_FUNC_PWM3)>;
+	pwm_ch2_pd0_default: pwm_ch2_pd0_default {
+		pinmux = <B9x_PINMUX_SET(B9x_PORT_D, B9x_PIN_0, B92_FUNC_PWM2)>;
 	};
 };
 
-&pwm0 {
-	pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>;
-};
-
diff --git a/src/platform/telink/tlsr9528a_2m_flash.overlay b/src/platform/telink/tlsr9528a_2m_flash.overlay
new file mode 120000
index 00000000000000..3b425c1198b983
--- /dev/null
+++ b/src/platform/telink/tlsr9528a_2m_flash.overlay
@@ -0,0 +1 @@
+tlsr9518adk80d_2m_flash.overlay
\ No newline at end of file
diff --git a/src/platform/telink/tlsr9528a_retention.overlay b/src/platform/telink/tlsr9528a_retention.overlay
index 98a0e5af508f32..b7204b7efca4b3 100644
--- a/src/platform/telink/tlsr9528a_retention.overlay
+++ b/src/platform/telink/tlsr9528a_retention.overlay
@@ -5,51 +5,27 @@
 	 * and PWM's are useless.
 	 */
 
-	aliases {
-		/delete-property/ led0;
-		/delete-property/ led1;
-		/delete-property/ led2;
-		/delete-property/ led3;
-		/delete-property/ mcuboot-led0;
-		/delete-property/ pwm-led0;
-		/delete-property/ pwm-0;
-	};
+	/* Short TL_Key3 (J5 pin 13) to ground (J3 pin 24, 26, 28, 30) */
+	key_pool {
+		compatible = "gpio-keys";
 
-	/delete-node/ leds;
-	/delete-node/ pwm_leds;
+		inp {
+			gpios = <&gpiod 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>,
+					<&gpiod 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+		};
+	};
 
-	keys {
-		/delete-node/ button_1;
-		/delete-node/ button_3;
+	key_matrix {
 		compatible = "gpio-keys";
-		key_1: button_1 {
-			gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_2: button_2 {
-			gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_3: button_3 {
-			gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
-		key_4: button_4 {
-			gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-		};
 
-		key_matrix_col1: key_matrix_col1 {
-			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>;
-		};
-		key_matrix_col2: key_matrix_col2 {
-			gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>;
-		};
-		key_matrix_row1: key_matrix_row1 {
-			gpios = <&gpiod 2 GPIO_PULL_DOWN>;
+		col {
+			gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>,
+					<&gpiof 6 GPIO_ACTIVE_HIGH>;
 		};
-		key_matrix_row2: key_matrix_row2 {
-			gpios = <&gpiod 7 GPIO_PULL_DOWN>;
+
+		row {
+			gpios = <&gpiod 2 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+					<&gpiod 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
 		};
 	};
 };
-
-&pwm0 {
-	status = "disabled";
-};
diff --git a/src/platform/tests/TestPlatformMgr.cpp b/src/platform/tests/TestPlatformMgr.cpp
index 89bad3b4c535f0..87c7913ebb7c3b 100644
--- a/src/platform/tests/TestPlatformMgr.cpp
+++ b/src/platform/tests/TestPlatformMgr.cpp
@@ -32,6 +32,7 @@
 
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/UnitTestExtendedAssertions.h>
 #include <lib/support/UnitTestRegistration.h>
 #include <lib/support/UnitTestUtils.h>
 #include <nlunit-test.h>
@@ -60,14 +61,12 @@ static void TestPlatformMgr_BasicEventLoopTask(nlTestSuite * inSuite, void * inC
 {
     std::atomic<int> counterRun{ 0 };
 
-    CHIP_ERROR err = PlatformMgr().InitChipStack();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().InitChipStack());
 
     // Start/stop the event loop task a few times.
     for (size_t i = 0; i < 3; i++)
     {
-        err = PlatformMgr().StartEventLoopTask();
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+        NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().StartEventLoopTask());
 
         std::atomic<int> counterSync{ 2 };
 
@@ -99,8 +98,7 @@ static void TestPlatformMgr_BasicEventLoopTask(nlTestSuite * inSuite, void * inC
         for (size_t t = 0; counterSync != 0 && t < 1000; t++)
             chip::test_utils::SleepMillis(1);
 
-        err = PlatformMgr().StopEventLoopTask();
-        NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+        NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().StopEventLoopTask());
 
         // Sleep for a short time to allow the event loop to stop.
         // Note, in some platform implementations the event loop thread
@@ -115,26 +113,28 @@ static void TestPlatformMgr_BasicEventLoopTask(nlTestSuite * inSuite, void * inC
 }
 
 static bool stopRan;
+static CHIP_ERROR stopResult = CHIP_NO_ERROR;
 
 static void StopTheLoop(intptr_t)
 {
     // Testing the return value here would involve multi-threaded access to the
     // nlTestSuite, and it's not clear whether that's OK.
-    stopRan = true;
-    PlatformMgr().StopEventLoopTask();
+    stopRan    = true;
+    stopResult = PlatformMgr().StopEventLoopTask();
 }
 
 static void TestPlatformMgr_BasicRunEventLoop(nlTestSuite * inSuite, void * inContext)
 {
     stopRan = false;
 
-    CHIP_ERROR err = PlatformMgr().InitChipStack();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().InitChipStack());
 
     PlatformMgr().ScheduleWork(StopTheLoop);
 
+    NL_TEST_ASSERT(inSuite, !stopRan);
     PlatformMgr().RunEventLoop();
     NL_TEST_ASSERT(inSuite, stopRan);
+    NL_TEST_ASSERT_SUCCESS(inSuite, stopResult);
 
     PlatformMgr().Shutdown();
 }
@@ -152,12 +152,13 @@ static void TestPlatformMgr_RunEventLoopTwoTasks(nlTestSuite * inSuite, void * i
     stopRan  = false;
     sleepRan = false;
 
-    CHIP_ERROR err = PlatformMgr().InitChipStack();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().InitChipStack());
 
     PlatformMgr().ScheduleWork(SleepSome);
     PlatformMgr().ScheduleWork(StopTheLoop);
 
+    NL_TEST_ASSERT(inSuite, !stopRan);
+    NL_TEST_ASSERT(inSuite, !sleepRan);
     PlatformMgr().RunEventLoop();
     NL_TEST_ASSERT(inSuite, stopRan);
     NL_TEST_ASSERT(inSuite, sleepRan);
@@ -177,11 +178,12 @@ static void TestPlatformMgr_RunEventLoopStopBeforeSleep(nlTestSuite * inSuite, v
     stopRan  = false;
     sleepRan = false;
 
-    CHIP_ERROR err = PlatformMgr().InitChipStack();
-    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().InitChipStack());
 
     PlatformMgr().ScheduleWork(StopAndSleep);
 
+    NL_TEST_ASSERT(inSuite, !stopRan);
+    NL_TEST_ASSERT(inSuite, !sleepRan);
     PlatformMgr().RunEventLoop();
     NL_TEST_ASSERT(inSuite, stopRan);
     NL_TEST_ASSERT(inSuite, sleepRan);
@@ -206,10 +208,8 @@ void DeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
 
 static void TestPlatformMgr_AddEventHandler(nlTestSuite * inSuite, void * inContext)
 {
-    CHIP_ERROR error;
     sEventRecieved = 0;
-    error          = PlatformMgr().AddEventHandler(DeviceEventHandler, 12345);
-    NL_TEST_ASSERT(inSuite, error == CHIP_NO_ERROR);
+    NL_TEST_ASSERT_SUCCESS(inSuite, PlatformMgr().AddEventHandler(DeviceEventHandler, 12345));
 
 #if 0
     while (sEventRecieved == 0)
diff --git a/src/platform/webos/BLEManagerImpl.cpp b/src/platform/webos/BLEManagerImpl.cpp
index 0e81ff3eb8233a..670c86e8233237 100644
--- a/src/platform/webos/BLEManagerImpl.cpp
+++ b/src/platform/webos/BLEManagerImpl.cpp
@@ -32,6 +32,7 @@
 
 #include <cassert>
 #include <iomanip>
+#include <string>
 #include <type_traits>
 #include <utility>
 
diff --git a/src/platform/webos/BLEManagerImpl.h b/src/platform/webos/BLEManagerImpl.h
index 4780bbe661227a..cc3f7c3d84ae2a 100644
--- a/src/platform/webos/BLEManagerImpl.h
+++ b/src/platform/webos/BLEManagerImpl.h
@@ -31,6 +31,8 @@
 #include "ChipDeviceScanner.h"
 #include <luna-service2/lunaservice.h>
 
+#include <string>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/platform/webos/CHIPWebOSStorage.h b/src/platform/webos/CHIPWebOSStorage.h
index 5afd70d033302a..6b896738ba98b3 100644
--- a/src/platform/webos/CHIPWebOSStorage.h
+++ b/src/platform/webos/CHIPWebOSStorage.h
@@ -35,6 +35,7 @@
 
 #include <mutex>
 #include <platform/webos/CHIPWebOSStorageIni.h>
+#include <string>
 
 #ifndef FATCONFDIR
 #define FATCONFDIR "/tmp"
diff --git a/src/platform/webos/CHIPWebOSStorageIni.h b/src/platform/webos/CHIPWebOSStorageIni.h
index a0ef5846058e1d..eeb7ada47eebe5 100644
--- a/src/platform/webos/CHIPWebOSStorageIni.h
+++ b/src/platform/webos/CHIPWebOSStorageIni.h
@@ -29,6 +29,8 @@
 #include <lib/support/ScopedBuffer.h>
 #include <platform/PersistedStorage.h>
 
+#include <string>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/platform/webos/ChipDeviceScanner.cpp b/src/platform/webos/ChipDeviceScanner.cpp
index c79112b820bec3..5a312281d6d8b9 100644
--- a/src/platform/webos/ChipDeviceScanner.cpp
+++ b/src/platform/webos/ChipDeviceScanner.cpp
@@ -27,6 +27,8 @@
 
 #include <pbnjson.h>
 
+#include <string>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/platform/webos/ChipDeviceScanner.h b/src/platform/webos/ChipDeviceScanner.h
index aab6e5db8d8ecc..ac23c7bd4b68aa 100644
--- a/src/platform/webos/ChipDeviceScanner.h
+++ b/src/platform/webos/ChipDeviceScanner.h
@@ -23,6 +23,7 @@
 
 #include <glib.h>
 #include <memory>
+#include <string>
 
 #include <ble/CHIPBleServiceData.h>
 #include <lib/core/CHIPError.h>
diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp
index e78e5aba192e68..e8640e11b1c747 100644
--- a/src/platform/webos/ConnectivityManagerImpl.cpp
+++ b/src/platform/webos/ConnectivityManagerImpl.cpp
@@ -65,7 +65,6 @@
 #endif
 
 using namespace ::chip;
-using namespace ::chip::TLV;
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace ::chip::app::Clusters::GeneralDiagnostics;
diff --git a/src/platform/webos/DnssdImpl.cpp b/src/platform/webos/DnssdImpl.cpp
index bf1af98c67a2a1..618e522dbb52e4 100644
--- a/src/platform/webos/DnssdImpl.cpp
+++ b/src/platform/webos/DnssdImpl.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <sstream>
 #include <string.h>
+#include <string>
 #include <time.h>
 #include <vector>
 
diff --git a/src/platform/webos/ThreadStackManagerImpl.cpp b/src/platform/webos/ThreadStackManagerImpl.cpp
index fdb49ce2d5558d..cb538fa34ec618 100644
--- a/src/platform/webos/ThreadStackManagerImpl.cpp
+++ b/src/platform/webos/ThreadStackManagerImpl.cpp
@@ -18,7 +18,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
-#include <app/AttributeAccessInterface.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/PlatformManager.h>
diff --git a/src/platform/webos/ThreadStackManagerImpl.h b/src/platform/webos/ThreadStackManagerImpl.h
index 59b1a8e9646249..b102e16ab568f7 100644
--- a/src/platform/webos/ThreadStackManagerImpl.h
+++ b/src/platform/webos/ThreadStackManagerImpl.h
@@ -20,7 +20,6 @@
 #include <memory>
 #include <vector>
 
-#include <app/AttributeAccessInterface.h>
 #include <lib/support/ThreadOperationalDataset.h>
 #include <platform/GLibTypeDeleter.h>
 #include <platform/NetworkCommissioning.h>
diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
index 9e787124507536..f63a10c94965f5 100644
--- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
+++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
@@ -405,17 +405,16 @@ void UserDirectedCommissioningServer::OnCommissionableNodeFound(const Dnssd::Dis
     if (nodeData.resolutionData.numIPs == 0)
     {
         ChipLogError(AppServer, "OnCommissionableNodeFound no IP addresses returned for instance name=%s",
-                     nodeData.commissionData.instanceName);
+                     nodeData.nodeData.instanceName);
         return;
     }
     if (nodeData.resolutionData.port == 0)
     {
-        ChipLogError(AppServer, "OnCommissionableNodeFound no port returned for instance name=%s",
-                     nodeData.commissionData.instanceName);
+        ChipLogError(AppServer, "OnCommissionableNodeFound no port returned for instance name=%s", nodeData.nodeData.instanceName);
         return;
     }
 
-    UDCClientState * client = mUdcClients.FindUDCClientState(nodeData.commissionData.instanceName);
+    UDCClientState * client = mUdcClients.FindUDCClientState(nodeData.nodeData.instanceName);
     if (client != nullptr && client->GetUDCClientProcessingState() == UDCClientProcessingState::kDiscoveringNode)
     {
         ChipLogDetail(AppServer, "OnCommissionableNodeFound instance: name=%s old_state=%d new_state=%d", client->GetInstanceName(),
@@ -458,17 +457,17 @@ void UserDirectedCommissioningServer::OnCommissionableNodeFound(const Dnssd::Dis
         if (!foundV6)
         {
             ChipLogError(AppServer, "OnCommissionableNodeFound no v6 returned for instance name=%s",
-                         nodeData.commissionData.instanceName);
+                         nodeData.nodeData.instanceName);
             client->SetPeerAddress(
                 chip::Transport::PeerAddress::UDP(nodeData.resolutionData.ipAddress[0], nodeData.resolutionData.port));
         }
 #endif // INET_CONFIG_ENABLE_IPV4
 
-        client->SetDeviceName(nodeData.commissionData.deviceName);
-        client->SetLongDiscriminator(nodeData.commissionData.longDiscriminator);
-        client->SetVendorId(nodeData.commissionData.vendorId);
-        client->SetProductId(nodeData.commissionData.productId);
-        client->SetRotatingId(nodeData.commissionData.rotatingId, nodeData.commissionData.rotatingIdLen);
+        client->SetDeviceName(nodeData.nodeData.deviceName);
+        client->SetLongDiscriminator(nodeData.nodeData.longDiscriminator);
+        client->SetVendorId(nodeData.nodeData.vendorId);
+        client->SetProductId(nodeData.nodeData.productId);
+        client->SetRotatingId(nodeData.nodeData.rotatingId, nodeData.nodeData.rotatingIdLen);
 
         // Call the registered mUserConfirmationProvider, if any.
         if (mUserConfirmationProvider != nullptr)
diff --git a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
index f7e7c2ab4a65d9..9c171b5efad5b8 100644
--- a/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
+++ b/src/protocols/user_directed_commissioning/tests/TestUdcMessages.cpp
@@ -86,15 +86,15 @@ void TestUDCServerUserConfirmationProvider(nlTestSuite * inSuite, void * inConte
     nodeData1.resolutionData.port         = 5540;
     nodeData1.resolutionData.ipAddress[0] = address;
     nodeData1.resolutionData.numIPs       = 1;
-    Platform::CopyString(nodeData1.commissionData.instanceName, instanceName1);
+    Platform::CopyString(nodeData1.nodeData.instanceName, instanceName1);
 
     Dnssd::DiscoveredNodeData nodeData2;
-    nodeData2.resolutionData.port              = 5540;
-    nodeData2.resolutionData.ipAddress[0]      = address;
-    nodeData2.resolutionData.numIPs            = 1;
-    nodeData2.commissionData.longDiscriminator = disc2;
-    Platform::CopyString(nodeData2.commissionData.instanceName, instanceName2);
-    Platform::CopyString(nodeData2.commissionData.deviceName, deviceName2);
+    nodeData2.resolutionData.port         = 5540;
+    nodeData2.resolutionData.ipAddress[0] = address;
+    nodeData2.resolutionData.numIPs       = 1;
+    nodeData2.nodeData.longDiscriminator  = disc2;
+    Platform::CopyString(nodeData2.nodeData.instanceName, instanceName2);
+    Platform::CopyString(nodeData2.nodeData.deviceName, deviceName2);
 
     // test empty UserConfirmationProvider
     udcServer.OnCommissionableNodeFound(nodeData2);
diff --git a/src/python_testing/TC_ICDManagementCluster.py b/src/python_testing/TC_ICDManagementCluster.py
new file mode 100644
index 00000000000000..a5b769ba30272c
--- /dev/null
+++ b/src/python_testing/TC_ICDManagementCluster.py
@@ -0,0 +1,63 @@
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+import chip.clusters as Clusters
+from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
+from mobly import asserts
+
+# Assumes `--enable-key 000102030405060708090a0b0c0d0e0f` on Linux app command line, or a DUT
+# that has that Enable Key
+kTestEventTriggerKey = bytes([b for b in range(16)])
+
+kAddActiveModeReq = 0x0046000000000001
+kRemoveActiveModeReq = 0x0046000000000002
+
+
+class TestICDManagementCluster(MatterBaseTest):
+    @async_test_body
+    async def test_active_mode_test_event_trigger(self):
+        dev_ctrl = self.default_controller
+        is_test_event_triggers_enabled = await self.read_single_attribute(
+            dev_ctrl,
+            self.dut_node_id,
+            endpoint=0,
+            attribute=Clusters.GeneralDiagnostics.Attributes.TestEventTriggersEnabled
+        )
+        asserts.assert_true(is_test_event_triggers_enabled,
+                            "This test expects Test Event Triggers are Enabled")
+
+        # No response to command --> Success yields "None".
+        asserts.assert_is_none(
+            await dev_ctrl.SendCommand(
+                self.dut_node_id,
+                endpoint=0,
+                payload=Clusters.GeneralDiagnostics.Commands.TestEventTrigger(enableKey=kTestEventTriggerKey,
+                                                                              eventTrigger=kAddActiveModeReq)
+            )
+        )
+
+        asserts.assert_is_none(
+            await dev_ctrl.SendCommand(
+                self.dut_node_id,
+                endpoint=0,
+                payload=Clusters.GeneralDiagnostics.Commands.TestEventTrigger(enableKey=kTestEventTriggerKey,
+                                                                              eventTrigger=kRemoveActiveModeReq)
+            )
+        )
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TC_RR_1_1.py b/src/python_testing/TC_RR_1_1.py
index 98db3c3aae5fbd..004022b108e6e0 100644
--- a/src/python_testing/TC_RR_1_1.py
+++ b/src/python_testing/TC_RR_1_1.py
@@ -871,4 +871,4 @@ async def read_heap_statistics(self, dev_ctrl):
 
 
 if __name__ == "__main__":
-    default_matter_test_main(maximize_cert_chains=True, controller_cat_tags=[0x0001_0001])
+    default_matter_test_main()
diff --git a/src/python_testing/TC_TMP_2_1.py b/src/python_testing/TC_TMP_2_1.py
new file mode 100644
index 00000000000000..f48b96991ef80d
--- /dev/null
+++ b/src/python_testing/TC_TMP_2_1.py
@@ -0,0 +1,97 @@
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+import chip.clusters as Clusters
+from chip.clusters.Types import NullValue
+from matter_testing_support import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from mobly import asserts
+
+
+class TC_TMP_2_1(MatterBaseTest):
+    def desc_TC_TMP_2_1(self) -> str:
+        return "[TC-TMP-2.1] Attributes with Server as DUT"
+
+    def pics_TC_TMP_2_1(self):
+        return ["TMP.S"]
+
+    def steps_TC_TMP_2_1(self) -> list[TestStep]:
+        return [
+            TestStep(1, "Commissioning, already done", is_commissioning=True),
+            TestStep(
+                2, "Set default bounds `min_bound` = -27315, `max_bound` = 32767"),
+            TestStep(3, "TH reads the MinMeasuredValue attribute from the DUT and saves as `min_measured_value`. If `min_measured_value` is not null, set `min_bound` to `min_measured_value`"),
+            TestStep(4, "TH reads the MaxMeasuredValue attribute from the DUT and saves as `max_measured_value`. If `max_measured_value` is not null, set `max_bound` to `max_measured_value",
+                     "Verify that `max_measured_value` is either null or an int16 where min_bound < `max_measured_value` ≤ 32767."),
+            TestStep(5, "If `min_measured_value` is not null, verify min measured value range",
+                     "Verify that -27315 ≤ `min_measured_value` < `max_bound`"),
+            TestStep(6, "TH reads the MeasuredValue attribute from the DUT",
+                     "Verify that the DUT response contains either null or a int16 where `min_bound` ≤ MeasuredValue ≤ `max_bound`."),
+            TestStep(7, "TH reads the Tolerance attribute from the DUT",
+                     "Verify that Tolerance is in the range of 0 to 2048"),
+        ]
+
+    @async_test_body
+    async def test_TC_TMP_2_1(self):
+        cluster = Clusters.TemperatureMeasurement
+        attr = Clusters.TemperatureMeasurement.Attributes
+
+        # Commission DUT - already done
+        self.step(1)
+
+        self.step(2)
+        min_bound = -27315
+        max_bound = 32767
+
+        self.step(3)
+        min_measured_value = await self.read_single_attribute_check_success(cluster=cluster, attribute=attr.MinMeasuredValue)
+        if min_measured_value != NullValue:
+            min_bound = min_measured_value
+
+        self.step(4)
+        max_measured_value = await self.read_single_attribute_check_success(cluster=cluster, attribute=attr.MaxMeasuredValue)
+        if max_measured_value != NullValue:
+            max_bound = max_measured_value
+            asserts.assert_greater(max_measured_value, min_bound,
+                                   "MaxMeasuredValue is not greater than the minimum bound")
+            asserts.assert_less_equal(
+                max_measured_value, 32767, "MaxMeasuredValue is not less than or equal to than 32767")
+
+        self.step(5)
+        if min_measured_value != NullValue:
+            asserts.assert_greater_equal(min_measured_value, -27315, "MinMeasuredValue is out of range")
+            asserts.assert_less(min_measured_value, max_bound, "MinMeasuredValue is out of range")
+        else:
+            self.mark_current_step_skipped()
+
+        self.step(6)
+        measured_value = await self.read_single_attribute_check_success(cluster=cluster, attribute=attr.MeasuredValue)
+        if measured_value != NullValue:
+            print(measured_value)
+            print(min_bound)
+            asserts.assert_greater_equal(
+                measured_value, min_bound, "Measured value is less than min bound")
+            asserts.assert_less_equal(
+                measured_value, max_bound, "Measured value is greater than max bound")
+
+        self.step(7)
+        tolerance = await self.read_single_attribute_check_success(cluster=cluster, attribute=attr.Tolerance)
+        asserts.assert_greater_equal(tolerance, 0, "Tolerance is less than 0")
+        asserts.assert_less_equal(
+            tolerance, 2048, "Tolerance is greater than 2048")
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py
index 4affea32c81ec5..9ec12dca5fb081 100644
--- a/src/python_testing/matter_testing_support.py
+++ b/src/python_testing/matter_testing_support.py
@@ -374,7 +374,9 @@ class MatterTestConfig:
     discriminators: Optional[List[int]] = None
     setup_passcodes: Optional[List[int]] = None
     commissionee_ip_address_just_for_testing: Optional[str] = None
-    maximize_cert_chains: bool = False
+    # By default, we start with maximized cert chains, as required for RR-1.1.
+    # This allows cert tests to be run without re-commissioning for RR-1.1.
+    maximize_cert_chains: bool = True
 
     qr_code_content: Optional[str] = None
     manual_code: Optional[str] = None
@@ -390,7 +392,10 @@ class MatterTestConfig:
     # Node ID to use for controller/commissioner
     controller_node_id: int = _DEFAULT_CONTROLLER_NODE_ID
     # CAT Tags for default controller/commissioner
-    controller_cat_tags: List[int] = field(default_factory=list)
+    # By default, we commission with CAT tags specified for RR-1.1
+    # so the cert tests can be run without re-commissioning the device
+    # for this one test. This can be overwritten from the command line
+    controller_cat_tags: List[int] = field(default_factory=lambda: [0x0001_0001])
 
     # Fabric ID which to use
     fabric_id: int = 1
@@ -1416,7 +1421,7 @@ def convert_args_to_matter_config(args: argparse.Namespace) -> MatterTestConfig:
     return config
 
 
-def parse_matter_test_args(argv: List[str]) -> MatterTestConfig:
+def parse_matter_test_args(argv: Optional[List[str]] = None) -> MatterTestConfig:
     parser = argparse.ArgumentParser(description='Matter standalone Python test')
 
     basic_group = parser.add_argument_group(title="Basic arguments", description="Overall test execution arguments")
@@ -1613,7 +1618,7 @@ def _commission_device(self, i) -> bool:
             raise ValueError("Invalid commissioning method %s!" % conf.commissioning_method)
 
 
-def default_matter_test_main(argv=None, **kwargs):
+def default_matter_test_main():
     """Execute the test class in a test module.
     This is the default entry point for running a test script file directly.
     In this case, only one test class in a test script is allowed.
@@ -1623,26 +1628,13 @@ def default_matter_test_main(argv=None, **kwargs):
       ...
       if __name__ == '__main__':
         default_matter_test_main.main()
-    Args:
-      argv: A list that is then parsed as command line args. If None, defaults to sys.argv
     """
 
-    matter_test_config = parse_matter_test_args(argv)
-
-    # Allow override of command line from optional arguments
-    if not matter_test_config.controller_cat_tags and "controller_cat_tags" in kwargs:
-        matter_test_config.controller_cat_tags = kwargs["controller_cat_tags"]
+    matter_test_config = parse_matter_test_args()
 
     # Find the test class in the test script.
     test_class = _find_test_class()
 
-    # This is required in case we need any testing with maximized certificate chains.
-    # We need *all* issuers from the start, even for default controller, to use
-    # maximized chains, before MatterStackState init, others some stale certs
-    # may not chain properly.
-    if "maximize_cert_chains" in kwargs:
-        matter_test_config.maximize_cert_chains = kwargs["maximize_cert_chains"]
-
     hooks = InternalTestRunnerHooks()
 
     run_tests(test_class, matter_test_config, hooks)
@@ -1664,7 +1656,7 @@ def get_test_info(test_class: MatterBaseTest, matter_test_config: MatterTestConf
     return info
 
 
-def run_tests(test_class: MatterBaseTest, matter_test_config: MatterTestConfig, hooks: TestRunnerHooks) -> None:
+def run_tests_no_exit(test_class: MatterBaseTest, matter_test_config: MatterTestConfig, hooks: TestRunnerHooks, default_controller=None, external_stack=None) -> bool:
 
     get_test_info(test_class, matter_test_config)
 
@@ -1676,7 +1668,10 @@ def run_tests(test_class: MatterBaseTest, matter_test_config: MatterTestConfig,
     if len(matter_test_config.tests) > 0:
         tests = matter_test_config.tests
 
-    stack = MatterStackState(matter_test_config)
+    if external_stack:
+        stack = external_stack
+    else:
+        stack = MatterStackState(matter_test_config)
 
     with TracingContext() as tracing_ctx:
         for destination in matter_test_config.trace_to:
@@ -1686,12 +1681,12 @@ def run_tests(test_class: MatterBaseTest, matter_test_config: MatterTestConfig,
 
         # TODO: Steer to right FabricAdmin!
         # TODO: If CASE Admin Subject is a CAT tag range, then make sure to issue NOC with that CAT tag
-
-        default_controller = stack.certificate_authorities[0].adminList[0].NewController(
-            nodeId=matter_test_config.controller_node_id,
-            paaTrustStorePath=str(matter_test_config.paa_trust_store_path),
-            catTags=matter_test_config.controller_cat_tags
-        )
+        if not default_controller:
+            default_controller = stack.certificate_authorities[0].adminList[0].NewController(
+                nodeId=matter_test_config.controller_node_id,
+                paaTrustStorePath=str(matter_test_config.paa_trust_store_path),
+                catTags=matter_test_config.controller_cat_tags
+            )
         test_config.user_params["default_controller"] = stash_globally(default_controller)
 
         test_config.user_params["matter_test_config"] = stash_globally(matter_test_config)
@@ -1740,10 +1735,16 @@ def run_tests(test_class: MatterBaseTest, matter_test_config: MatterTestConfig,
         hooks.stop(duration=duration)
 
     # Shutdown the stack when all done
-    stack.Shutdown()
+    if not external_stack:
+        stack.Shutdown()
 
     if ok:
         logging.info("Final result: PASS !")
     else:
         logging.error("Final result: FAIL !")
+    return ok
+
+
+def run_tests(test_class: MatterBaseTest, matter_test_config: MatterTestConfig, hooks: TestRunnerHooks, default_controller=None, external_stack=None) -> None:
+    if not run_tests_no_exit(test_class, matter_test_config, hooks, default_controller, external_stack):
         sys.exit(1)
diff --git a/src/python_testing/test_testing/MockTestRunner.py b/src/python_testing/test_testing/MockTestRunner.py
new file mode 100644
index 00000000000000..79f6e21e2b434e
--- /dev/null
+++ b/src/python_testing/test_testing/MockTestRunner.py
@@ -0,0 +1,57 @@
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import importlib
+import os
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock
+
+from chip.clusters import Attribute
+
+try:
+    from matter_testing_support import MatterStackState, MatterTestConfig, run_tests_no_exit
+except ImportError:
+    sys.path.append(os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..')))
+    from matter_testing_support import MatterStackState, MatterTestConfig, run_tests_no_exit
+
+
+class AsyncMock(MagicMock):
+    async def __call__(self, *args, **kwargs):
+        return super(AsyncMock, self).__call__(*args, **kwargs)
+
+
+class MockTestRunner():
+    def __init__(self, filename: str, classname: str, test: str):
+        self.config = MatterTestConfig(
+            tests=[test], endpoint=1, dut_node_ids=[1])
+        self.stack = MatterStackState(self.config)
+        self.default_controller = self.stack.certificate_authorities[0].adminList[0].NewController(
+            nodeId=self.config.controller_node_id,
+            paaTrustStorePath=str(self.config.paa_trust_store_path),
+            catTags=self.config.controller_cat_tags
+        )
+        module = importlib.import_module(Path(os.path.basename(filename)).stem)
+        self.test_class = getattr(module, classname)
+
+    def Shutdown(self):
+        self.stack.Shutdown()
+
+    def run_test_with_mock_read(self,  read_cache: Attribute.AsyncReadTransaction.ReadResponse):
+        self.default_controller.Read = AsyncMock(return_value=read_cache)
+        return run_tests_no_exit(self.test_class, self.config, None, self.default_controller, self.stack)
diff --git a/src/python_testing/test_testing/test_TC_TMP_2_1.py b/src/python_testing/test_testing/test_TC_TMP_2_1.py
new file mode 100644
index 00000000000000..5693aced8ba505
--- /dev/null
+++ b/src/python_testing/test_testing/test_TC_TMP_2_1.py
@@ -0,0 +1,180 @@
+#!/usr/bin/env -S python3 -B
+#
+#    Copyright (c) 2024 Project CHIP Authors
+#    All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import sys
+import typing
+from dataclasses import dataclass
+
+import chip.clusters as Clusters
+from chip.clusters import Attribute
+from chip.clusters.Types import NullValue
+from MockTestRunner import MockTestRunner
+
+
+@dataclass
+class TestSpec():
+    min: typing.Optional[int]
+    max: typing.Optional[int]
+    measured: int
+    tolerance: int
+    expect_pass: bool
+
+
+TEST_CASES = [
+    # ==============================
+    # Measured Test cases
+    # ==============================
+    # --------
+    # Neither min nor max specified
+    # --------
+    # Measured lowest
+    TestSpec(NullValue, NullValue, -27315, 10, True),
+    # Measured highest
+    TestSpec(NullValue, NullValue, 32767, 10, True),
+    # Measured below
+    TestSpec(NullValue, NullValue, -27316, 10, False),
+    # Measured above
+    TestSpec(NullValue, NullValue, 32768, 10, False),
+    # Measured null
+    TestSpec(NullValue, NullValue, NullValue, 10, True),
+
+    # --------
+    # min only
+    # --------
+    # Measured lowest
+    TestSpec(5, NullValue, 5, 10, True),
+    # Measured highest
+    TestSpec(5, NullValue, 32767, 10, True),
+    # Measured below
+    TestSpec(5, NullValue, 4, 10, False),
+    # Measured above
+    TestSpec(5, NullValue, 32768, 10, False),
+    # Measured null
+    TestSpec(5, NullValue, NullValue, 10, True),
+
+    # --------
+    # max only
+    # --------
+    # Measured lowest
+    TestSpec(NullValue, 5, -27315, 10, True),
+    # Measured highest
+    TestSpec(NullValue, 5, 5, 10, True),
+    # Measured below
+    TestSpec(NullValue, 5, -27316, 10, False),
+    # Measured above
+    TestSpec(NullValue, 5, 6, 10, False),
+    # Measured null
+    TestSpec(NullValue, 5, NullValue, 10, True),
+
+    # --------
+    # both
+    # --------
+    # Measured lowest
+    TestSpec(-5, 5, -5, 10, True),
+    # Measured highest
+    TestSpec(-5, 5, 5, 10, True),
+    # Measured below
+    TestSpec(-5, 5, -6, 10, False),
+    # Measured above
+    TestSpec(-5, 5, 6, 10, False),
+    # Measured null
+    TestSpec(-5, 5, NullValue, 10, True),
+
+    # ==============================
+    # Min Test cases
+    # ==============================
+    # Max not specified, min OK bottom
+    TestSpec(-27315, NullValue, 0, 10, True),
+    # Max not specified, min OK top
+    TestSpec(32766, NullValue, 32767, 10, True),
+    # Max not specified, min out of range below
+    TestSpec(-27316, NullValue, 0, 10, False),
+    # Max not specified, min out of range above
+    TestSpec(32767, NullValue, 32767, 10, False),
+    # Max specified, min OK bottom
+    TestSpec(-27315, 5, 0, 10, True),
+    # Max specified, min OK top
+    TestSpec(4, 5, 4, 10, True),
+    # Max specified, min out of range below
+    TestSpec(-27316, 5, 0, 10, False),
+    # Max specified, min out of range above
+    TestSpec(5, 5, 5, 10, False),
+
+    # ==============================
+    # Min Test cases
+    # ==============================
+    # min not specified, max OK bottom
+    TestSpec(NullValue, -27314, -27315, 10, True),
+    # min not specified, max OK top
+    TestSpec(NullValue, 32767, 0, 10, True),
+    # min not specified, max out of range bottom
+    TestSpec(NullValue, -27315, -27315, 10, False),
+    # min not specified, max out of range top
+    TestSpec(NullValue, 32768, 0, 10, False),
+    # min specified, max OK bottom
+    TestSpec(0, 1, 0, 10, True),
+    # min specified, max OK top
+    TestSpec(0, 32767, 0, 10, True),
+    # min specified, max out of range bottom
+    TestSpec(0, 0, 0, 10, False),
+    # min specified, max out of range top
+    TestSpec(0, 32768, 0, 10, False),
+
+    # ==============================
+    # Tolerance test cases
+    # ==============================
+    # Tolerance OK bottom
+    TestSpec(NullValue, NullValue, 0, 0, True),
+    # Tolerance OK top
+    TestSpec(NullValue, NullValue, 0, 2048, True),
+    # Tolerance out of range bottom
+    TestSpec(NullValue, NullValue, 0, -1, False),
+    # Tolerance out of range top
+    TestSpec(NullValue, NullValue, 0, 2049, False),
+
+]
+
+
+def test_spec_to_attribute_cache(test_spec: TestSpec) -> Attribute.AsyncReadTransaction.ReadResponse:
+    c = Clusters.TemperatureMeasurement
+    attr = Clusters.TemperatureMeasurement.Attributes
+    resp = Attribute.AsyncReadTransaction.ReadResponse({}, [], {})
+    resp.attributes = {1: {c: {attr.MaxMeasuredValue: test_spec.max,
+                               attr.MinMeasuredValue: test_spec.min, attr.MeasuredValue: test_spec.measured, attr.Tolerance: test_spec.tolerance}}}
+    return resp
+
+
+def main():
+    test_runner = MockTestRunner('TC_TMP_2_1', 'TC_TMP_2_1', 'test_TC_TMP_2_1')
+    failures = []
+    for idx, t in enumerate(TEST_CASES):
+        ok = test_runner.run_test_with_mock_read(test_spec_to_attribute_cache(t)) == t.expect_pass
+        if not ok:
+            failures.append(f"Measured test case failure: {idx} {t}")
+
+    test_runner.Shutdown()
+    print(
+        f"Test of tests: run {len(TEST_CASES)}, test response correct: {len(TEST_CASES) - len(failures)} test response incorrect: {len(failures)}")
+    for f in failures:
+        print(f)
+
+    return 1 if failures else 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/src/qrcodetool/setup_payload_commands.cpp b/src/qrcodetool/setup_payload_commands.cpp
index a4010580af2b2e..f2c96eb03e3e4e 100644
--- a/src/qrcodetool/setup_payload_commands.cpp
+++ b/src/qrcodetool/setup_payload_commands.cpp
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <string>
+
 using namespace chip;
 
 enum class SetupPayloadCodeType
diff --git a/src/setup_payload/AdditionalDataPayloadParser.cpp b/src/setup_payload/AdditionalDataPayloadParser.cpp
index eb6b48f1b0fcc1..3fa307d93f0369 100644
--- a/src/setup_payload/AdditionalDataPayloadParser.cpp
+++ b/src/setup_payload/AdditionalDataPayloadParser.cpp
@@ -25,6 +25,7 @@
 
 #include <cstdlib>
 #include <string.h>
+#include <string>
 #include <vector>
 
 #include <lib/core/CHIPError.h>
diff --git a/src/setup_payload/ManualSetupPayloadGenerator.cpp b/src/setup_payload/ManualSetupPayloadGenerator.cpp
index b565907d43296a..72063c5c3d72a9 100644
--- a/src/setup_payload/ManualSetupPayloadGenerator.cpp
+++ b/src/setup_payload/ManualSetupPayloadGenerator.cpp
@@ -24,7 +24,6 @@
 #include "ManualSetupPayloadGenerator.h"
 
 #include <inttypes.h>
-#include <limits>
 
 #include <lib/support/logging/CHIPLogging.h>
 #include <lib/support/verhoeff/Verhoeff.h>
diff --git a/src/setup_payload/ManualSetupPayloadParser.cpp b/src/setup_payload/ManualSetupPayloadParser.cpp
index 3b20e2429ce770..2673e42fbd7817 100644
--- a/src/setup_payload/ManualSetupPayloadParser.cpp
+++ b/src/setup_payload/ManualSetupPayloadParser.cpp
@@ -27,9 +27,6 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <lib/support/verhoeff/Verhoeff.h>
 
-#include <string>
-#include <vector>
-
 namespace chip {
 
 CHIP_ERROR ManualSetupPayloadParser::CheckDecimalStringValidity(std::string decimalString,
diff --git a/src/setup_payload/QRCodeSetupPayloadGenerator.cpp b/src/setup_payload/QRCodeSetupPayloadGenerator.cpp
index 42a5374787d2d9..6ffa2319dadb35 100644
--- a/src/setup_payload/QRCodeSetupPayloadGenerator.cpp
+++ b/src/setup_payload/QRCodeSetupPayloadGenerator.cpp
@@ -37,6 +37,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 
 namespace chip {
 
diff --git a/src/setup_payload/QRCodeSetupPayloadGenerator.h b/src/setup_payload/QRCodeSetupPayloadGenerator.h
index d4a151a8c5717e..aefa1ee0caa1e6 100644
--- a/src/setup_payload/QRCodeSetupPayloadGenerator.h
+++ b/src/setup_payload/QRCodeSetupPayloadGenerator.h
@@ -31,6 +31,8 @@
 
 #include <lib/support/Span.h>
 
+#include <string>
+
 #pragma once
 
 namespace chip {
diff --git a/src/setup_payload/QRCodeSetupPayloadParser.cpp b/src/setup_payload/QRCodeSetupPayloadParser.cpp
index 93e560aff27215..99bf0e4983040b 100644
--- a/src/setup_payload/QRCodeSetupPayloadParser.cpp
+++ b/src/setup_payload/QRCodeSetupPayloadParser.cpp
@@ -24,7 +24,6 @@
 #include "QRCodeSetupPayloadParser.h"
 #include "Base38Decode.h"
 
-#include <memory>
 #include <string.h>
 #include <vector>
 
diff --git a/src/setup_payload/tests/TestHelpers.h b/src/setup_payload/tests/TestHelpers.h
index 17017387f5fa48..99b66dea895a11 100644
--- a/src/setup_payload/tests/TestHelpers.h
+++ b/src/setup_payload/tests/TestHelpers.h
@@ -25,6 +25,8 @@
 #include <setup_payload/QRCodeSetupPayloadParser.h>
 #include <setup_payload/SetupPayload.h>
 
+#include <string>
+
 namespace chip {
 
 const uint16_t kSmallBufferSizeInBytes   = 1;
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index afeab8d343f9df..40ae99ae99c77e 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -51,7 +51,7 @@ if (chip_project_config_include_dirs == [] &&
   chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
 }
 
-if (chip_device_platform == "cc13x2_26x2") {
+if (chip_device_platform == "cc13x4_26x4") {
   import("//build_overrides/ti_simplelink_sdk.gni")
 } else if (chip_device_platform == "efr32") {
   import("//build_overrides/efr32_sdk.gni")
diff --git a/src/test_driver/esp32/main/include/CHIPProjectConfig.h b/src/test_driver/esp32/main/include/CHIPProjectConfig.h
index 1e4dc9626b5033..3a25601cfd884e 100644
--- a/src/test_driver/esp32/main/include/CHIPProjectConfig.h
+++ b/src/test_driver/esp32/main/include/CHIPProjectConfig.h
@@ -30,6 +30,4 @@
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
 
-#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
-
 #endif // CHIP_PROJECT_CONFIG_H
diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md
index 559b75699c0995..10389252b8a8de 100644
--- a/src/test_driver/tizen/README.md
+++ b/src/test_driver/tizen/README.md
@@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in
 
 ```sh
 # Pull the image from hub.docker.com
-docker pull ghcr.io/project-chip/chip-build-tizen-qemu:35
+docker pull ghcr.io/project-chip/chip-build-tizen-qemu:47
 ```
 
 ## Building and Running Tests on QEMU
@@ -21,7 +21,7 @@ All steps described below should be done inside the docker container.
 
 ```sh
 docker run -it --rm --name chip-tizen-qemu \
-    ghcr.io/project-chip/chip-build-tizen-qemu:35 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:47 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository
diff --git a/src/tracing/json/json_tracing.h b/src/tracing/json/json_tracing.h
index 14f3d163a04c46..ddbb46a9d61ace 100644
--- a/src/tracing/json/json_tracing.h
+++ b/src/tracing/json/json_tracing.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <fstream>
+#include <string>
 #include <tracing/backend.h>
 #include <unordered_map>
 
diff --git a/third_party/openthread/ot-stm32 b/third_party/openthread/ot-stm32
new file mode 160000
index 00000000000000..eb6377f1d7bf6b
--- /dev/null
+++ b/third_party/openthread/ot-stm32
@@ -0,0 +1 @@
+Subproject commit eb6377f1d7bf6bc7038a76e903af0bdf77c6f99f
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index 53f098de9fdc7d..0dbd0dd89fa90d 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 53f098de9fdc7db248a72eabbe07d8ce4876daab
+Subproject commit 0dbd0dd89fa90dc6e0d1d2636563ea980c010c19
diff --git a/third_party/ti_simplelink_sdk/BUILD.gn b/third_party/ti_simplelink_sdk/BUILD.gn
index e7040b16c4667b..0261b2a8b10edf 100644
--- a/third_party/ti_simplelink_sdk/BUILD.gn
+++ b/third_party/ti_simplelink_sdk/BUILD.gn
@@ -39,17 +39,7 @@ source_set("syscalls_stub") {
 }
 
 config("ti_simplelink_mbedtls_config") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    defines = [ "MBEDTLS_CONFIG_FILE=\"cc13x2_26x2-mbedtls-config.h\"" ]
-
-    include_dirs = [
-      "${chip_root}/src/platform/cc13xx_26xx/",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto",
-      "${ti_simplelink_sdk_root}/source",
-    ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     defines = [ "MBEDTLS_CONFIG_FILE=\"cc13x4_26x4-mbedtls-config.h\"" ]
     include_dirs = [
       "${chip_root}/src/platform/cc13xx_26xx/",
@@ -66,16 +56,6 @@ config("ti_simplelink_mbedtls_config") {
 
 mbedtls_target("mbedtls") {
   # Hardware acceleration
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    sources = [
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c",
-    ]
-  }
   if (ti_simplelink_device_family == "cc13x4_26x4") {
     sources = [
       "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/aes_alt.c",
@@ -94,14 +74,7 @@ mbedtls_target("mbedtls") {
 }
 
 config("ti_simplelink_freertos_config") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    include_dirs = [
-      "${chip_root}/src/platform/cc13xx_26xx",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2",
-      "${freertos_root}/portable/GCC/ARM_CM4F",
-    ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     include_dirs = [
       "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4",
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ",
@@ -127,11 +100,7 @@ config("ti_simplelink_posix_config") {
 }
 
 freertos_target("freertos") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    sources = [ "${freertos_root}/portable/GCC/ARM_CM4F/port.c" ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4" ||
-             ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     sources = [
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
@@ -145,8 +114,7 @@ freertos_target("freertos") {
 
   public_configs = [ ":ti_simplelink_freertos_config" ]
 
-  if (ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     # BLE has to have it's own heap config
     public_deps =
         [ "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sysconfig" ]
diff --git a/third_party/ti_simplelink_sdk/create_factory_data.py b/third_party/ti_simplelink_sdk/create_factory_data.py
index 224979a9587306..25bbcaa54f4c00 100644
--- a/third_party/ti_simplelink_sdk/create_factory_data.py
+++ b/third_party/ti_simplelink_sdk/create_factory_data.py
@@ -31,7 +31,7 @@ def create_hex_file(args):
 
     # there are 17 elements, each element will need 8 bytes in the struct
     # 4 for length of the element, and 4 for the pointer to the element
-    # factory data starts at 0xAC000 or 0xFE800, so the elements will
+    # factory data starts at 0xFE800, so the elements will
     # start 136 bytes after the start address
     factory_data_dict = json.load(args.factory_data_json_file[0])
     factory_data_schema = json.load(args.factory_data_schema[0])
@@ -41,10 +41,7 @@ def create_hex_file(args):
 
     struct_idx = 0
     values_idx = 0
-    if device_family == 'cc13x2_26x2':
-        value_address = 0xAC088
-    else:
-        value_address = 0xFE888
+    value_address = 0xFE888
 
     for element in factory_data:
         # get the length in hex and write to first hex file
@@ -137,12 +134,8 @@ def create_hex_file(args):
 
     # get hex file in a format that can be merged in a later step
     subprocess.call(['objcopy', args.factory_data_hex_file, '--input-target', 'ihex', '--output-target', 'binary', 'temp.bin'])
-    if device_family == 'cc13x2_26x2':
-        subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
-                        'ihex', args.factory_data_hex_file, '--change-addresses=0xac000'])
-    else:
-        subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
-                        'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
+    subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
+                     'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
     subprocess.call(['rm', 'temp.bin'])
 
 
diff --git a/third_party/ti_simplelink_sdk/factory_data_trim.py b/third_party/ti_simplelink_sdk/factory_data_trim.py
index c38be1f0a0a2ac..211b83020656fe 100644
--- a/third_party/ti_simplelink_sdk/factory_data_trim.py
+++ b/third_party/ti_simplelink_sdk/factory_data_trim.py
@@ -16,7 +16,7 @@
 
 """Script to extract the factory data content from the matter application + factory data image 
 
-This script will trim the factory data content out of the matter application image. It will also get the length of the factory data from the matter application map file. The output is the Matter image without the dummy factory d.
+This script will trim the factory data content out of the matter application image. It will also get the length of the factory data from the matter application map file. The output is the Matter image without the dummy factory data.
 
 Run with:
     python factory_data_trim.py <matter image> <matter image map file> <factory data image> <device family>
@@ -35,10 +35,7 @@
 
 # extract factory data length from map file
 with open(matter_app_map_file, "r") as map_file:
-    if device_family == 'cc13x2_26x2':
-        pattern = ".factory_data   0x000ac000"
-    else:
-        pattern = ".factory_data   0x000fe800"
+    pattern = ".factory_data   0x000fe800"
     for line in map_file:
         if re.search(pattern, line):
             factory_data_num_bytes = line
@@ -52,12 +49,8 @@
 matter_image.fromfile(matter_app_file, format='hex')
 matter_image_dict = matter_image.todict()
 
-if device_family == 'cc13x2_26x2':
-    # 704512 is 0xAC000 - start of factory data
-    start_index = list(matter_image_dict.keys()).index(704512)
-else:
-    # 1042432 is 0xFE800 - start of factory data
-    start_index = list(matter_image_dict.keys()).index(1042432)
+# 1042432 is 0xFE800 - start of factory data
+start_index = list(matter_image_dict.keys()).index(1042432)
 # convert length of factory data into a decimal value
 end_index = start_index + int(factory_data_num_bytes, 16)
 
diff --git a/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py b/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
index d98fc94593dd95..c0fd310dcb6dea 100644
--- a/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
+++ b/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Simple hexmerge script for combining the BIM, Factory Data, and App
+"""Simple hexmerge script for combining MCUBoot, Factory Data, and App
 
-This script provides a basic utility to combine the OAD application binary file with the Boot Image Manager hex file and Factory Data hex file. The output is a combined hex file that can be programmed on the target and run.
+This script provides a basic utility to combine the OAD application binary file with the MCUBoot hex file and Factory Data hex file. The output is a combined hex file that can be programmed on the target and run.
 
 Run with:
-    python oad_and_factory_data_merge_tool.py <App bin (CC13x2)/App hex (CC13x4)> <BIM (CC13x2)/MCUBoot (CC13x4) hex> <Factory data hex> <output>
+    python oad_and_factory_data_merge_tool.py <App hex (CC13x4)> <MCUBoot (CC13x4) hex> <Factory data hex> <output>
 """
 
 import sys
diff --git a/third_party/ti_simplelink_sdk/oad_merge_tool.py b/third_party/ti_simplelink_sdk/oad_merge_tool.py
index 0554601a1da07c..7bb2d47253c73f 100644
--- a/third_party/ti_simplelink_sdk/oad_merge_tool.py
+++ b/third_party/ti_simplelink_sdk/oad_merge_tool.py
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Simple hexmerge script for combining the BIM/MCUBoot image and App
+"""Simple hexmerge script for combining the MCUBoot image and App
 
-This script provides a basic utility to combine the OAD application binary file with the Boot Image Manager/MCUBoot hex file. The output is a combined hex file that can be programmed on the target and run.
+This script provides a basic utility to combine the OAD application binary file with the MCUBoot hex file. The output is a combined hex file that can be programmed on the target and run.
 
 Run with:
-    python oad_merge_tool.py <App bin (CC13x2)/App hex (CC13x4)> <BIM (CC13x2)/MCUBoot (CC13x4) hex> <output>
+    python oad_merge_tool.py <App hex (CC13x4)> <MCUBoot (CC13x4) hex> <output>
 """
 
 import sys
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni b/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
index 79b7aa1f59a695..e79d3a0d65396d 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
@@ -14,15 +14,7 @@
 
 import("ti_simplelink_board.gni")
 
-if (ti_simplelink_device_family == "cc13x2_26x2" ||
-    ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-  arm_arch = "armv7e-m"
-  arm_abi = "aapcs"
-  arm_cpu = "cortex-m4"
-  arm_float_abi = "hard"
-  arm_fpu = "fpv5-sp-d16"
-  arm_use_thumb = true
-} else if (ti_simplelink_device_family == "cc13x4_26x4") {
+if (ti_simplelink_device_family == "cc13x4_26x4") {
   arm_arch = ""
   arm_abi = ""
   arm_cpu = "cortex-m33"
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_board.gni b/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
index 146e3dbfb07257..f5b11d670166b1 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
@@ -28,36 +28,14 @@ assert(ti_simplelink_board != "", "ti_simplelink_board must be specified")
 #
 # | Development Kit     | Device Family   | SoC           |                     |
 # | -----------------   | --------------- | ----------    | ------------------- |
-# | CC1352R1_LAUNCHXL   | cc13x2_26x2     | cc1352r1f3    | Thread MTD + no BLE |
-# | CC2652R1_LAUNCHXL   | cc13x2_26x2     | cc2652r1f3    | Thread MTD + no BLE |
-# | LP_CC2652R7         | cc13x2x7_26x2x7 | cc2652r1f7    | Thread FTD + BLE    |
 # | CC134P10_6_LAUNCHXL | cc13x4_26x4     | cc1354p10     | Thread FTD + BLE    |
 # | CC2674              | cc13x4_24x4     | CC2674P10RGZ  | Thread FTD + BLE    |
 # | CC2674              | cc13x4_24x4     | CC2674R10RGZ  | Thread FTD + BLE    |
 # | CC3220SF_LAUNCHXL   | cc32xx          | cc3220SF      | Wi-Fi               |
 # | CC3235SF_LAUNCHXL   | cc32xx          | cc3235SF      | Wi-Fi               |
 
-# XXX: Can we do an array with a case statement?
-if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
-  ti_simplelink_device_family = "cc13x2_26x2"
-  ti_simplelink_device_family_driverlib = "cc13x2_cc26x2"
-  ti_simplelink_soc_family = "cc13x2"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC13X2?
-  ti_simplelink_soc = "cc1352r1f3"
-  ti_simplelink_bim_name = "cc1352r1lp"
-} else if (ti_simplelink_board == "CC2652R1_LAUNCHXL") {
-  ti_simplelink_device_family = "cc13x2_26x2"
-  ti_simplelink_device_family_driverlib = "cc13x2_cc26x2"
-  ti_simplelink_soc_family = "cc26x2"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC26X2?
-  ti_simplelink_soc = "cc2652r1f3"
-  ti_simplelink_bim_name = "cc2652r1lp"
-} else if (ti_simplelink_board == "LP_EM_CC1354P10_6" ||
-           ti_simplelink_board == "LP_EM_CC1354P10_1") {
+if (ti_simplelink_board == "LP_EM_CC1354P10_6" ||
+    ti_simplelink_board == "LP_EM_CC1354P10_1") {
   ti_simplelink_device_family = "cc13x4_26x4"
   ti_simplelink_device_family_driverlib = "cc13x4_cc26x4"
   ti_simplelink_soc_family = "cc13x4"
@@ -69,15 +47,6 @@ if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
   ti_simplelink_device_family_driverlib = "cc13x4_cc26x4"
   ti_simplelink_soc_family = "cc13x4"  #ble path
   ti_simplelink_isa = "m33f"
-} else if (ti_simplelink_board == "LP_CC2652R7") {
-  ti_simplelink_device_family = "cc13x2x7_26x2x7"
-  ti_simplelink_device_family_driverlib = "cc13x2x7_cc26x2x7"
-  ti_simplelink_soc_family = "cc26x2x7"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC26X2?
-  ti_simplelink_soc = "cc2652r1f7"
-  ti_simplelink_bim_name = "cc2652r7lp"
 } else if (ti_simplelink_board == "CC3220SF_LAUNCHXL") {
   ti_simplelink_device_family = "cc32xx"
   ti_simplelink_soc_family = "cc32xx"
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
index e0a848a079c3f9..94e7851bc60a35 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
@@ -41,8 +41,7 @@ template("ti_simplelink_executable") {
   output_base_name = get_path_info(invoker.output_name, "name")
 
   #used for OTA image creator for the cc13xx
-  if (ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     objcopy_image_name = output_base_name + ".hex"
     objcopy_image_format = "ihex"
   } else {
@@ -72,19 +71,7 @@ template("ti_simplelink_executable") {
 
     public_configs = [ ":${simplelink_target_name}_config" ]
 
-    if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      if (chip_enable_ota_requestor) {
-        sources +=
-            [ "${chip_root}/src/platform/cc13xx_26xx/oad_image_header.c" ]
-        if (custom_factory_data) {
-          ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds"
-        } else {
-          ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds"
-        }
-      } else {
-        ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds"
-      }
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       if (chip_enable_ota_requestor) {
         sources +=
             [ "${chip_root}/src/platform/cc13xx_26xx/oad_image_header.c" ]
@@ -116,181 +103,7 @@ template("ti_simplelink_executable") {
   }
 
   if (chip_enable_ota_requestor) {
-    if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      if (custom_factory_data) {
-        pw_python_action("${simplelink_target_name}-without-factory-data.hex") {
-          public_deps = [ ":${simplelink_target_name}.out.image" ]
-
-          script = "${ti_simplelink_sdk_build_root}/factory_data_trim.py"
-          sources = [ "${root_out_dir}/${objcopy_image_name}" ]
-          outputs =
-              [ "${root_out_dir}/${output_base_name}-without-factory-data.hex" ]
-
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.hex",
-                        root_out_dir),
-            rebase_path("${root_out_dir}/${output_base_name}.out.map",
-                        root_out_dir),
-            rebase_path(
-                "${root_out_dir}/${output_base_name}-without-factory-data.hex",
-                root_out_dir),
-            "cc13x2_26x2",
-          ]
-        }
-        pw_python_action("${simplelink_target_name}-factory-data.hex") {
-          script = "${ti_simplelink_sdk_build_root}/create_factory_data.py"
-          sources = [
-            "${chip_root}/src/platform/cc13xx_26xx/factory_data.schema",
-            "${chip_root}/src/platform/cc13xx_26xx/factory_data_cc13xx_26xx.json",
-          ]
-          outputs = [ "${root_out_dir}/${output_base_name}-factory-data.hex" ]
-
-          args = [
-            "-factory_data",
-            rebase_path(
-                "${chip_root}/src/platform/cc13xx_26xx/factory_data_cc13xx_26xx.json"),
-            "-schema",
-            rebase_path(
-                "${chip_root}/src/platform/cc13xx_26xx/factory_data.schema"),
-            "-o",
-            rebase_path("${root_out_dir}/${output_base_name}-factory-data.hex",
-                        root_out_dir),
-            "-device",
-            "cc13x2_26x2",
-          ]
-        }
-      }
-      pw_python_action("${simplelink_target_name}.bin") {
-        if (custom_factory_data) {
-          public_deps =
-              [ ":${simplelink_target_name}-without-factory-data.hex" ]
-        } else {
-          public_deps = [ ":${simplelink_target_name}.out.image" ]
-        }
-
-        script = "${ti_simplelink_sdk_root}//tools/common/oad/oad_image_tool.py"
-        if (custom_factory_data) {
-          sources =
-              [ "${root_out_dir}/${output_base_name}-without-factory-data.hex" ]
-          input_path =
-              "${root_out_dir}/${output_base_name}-without-factory-data.hex"
-        } else {
-          sources = [ "${root_out_dir}/${objcopy_image_name}" ]
-          input_path = "${root_out_dir}/${output_base_name}.hex"
-        }
-        outputs = [ "${root_out_dir}/${output_base_name}.bin" ]
-
-        args = [
-          "--verbose",
-          "ccs",
-          rebase_path(root_out_dir, root_build_dir),
-          "7",
-          "-hex1",
-          rebase_path(input_path, root_out_dir),
-          "-o",
-          output_base_name,
-        ]
-
-        if (defined(invoker.pem_file)) {
-          args += [
-            "-k",
-            rebase_path(invoker.pem_file, root_build_dir),
-          ]
-        } else {
-          args += [
-            "-k",
-            rebase_path(
-                "${ti_simplelink_sdk_root}/tools/common/oad/private.pem",
-                root_build_dir),
-          ]
-        }
-      }
-      pw_python_action("${simplelink_target_name}-bim.hex") {
-        public_deps = [ ":${simplelink_target_name}.bin" ]
-        if (custom_factory_data) {
-          public_deps += [ ":${simplelink_target_name}-factory-data.hex" ]
-
-          script = "${ti_simplelink_sdk_build_root}/oad_and_factory_data_merge_tool.py"
-          sources = [
-            "${root_out_dir}/${output_base_name}-factory-data.hex",
-            "${root_out_dir}/${output_base_name}.bin",
-          ]
-          outputs = [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-        } else {
-          script = "${ti_simplelink_sdk_build_root}/oad_merge_tool.py"
-          sources = [ "${root_out_dir}/${output_base_name}.bin" ]
-          outputs = [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-        }
-
-        if (defined(invoker.bim_hex)) {
-          bim_hex = invoker.bim_hex
-        } else {
-          bim_hex = "${ti_simplelink_sdk_root}/examples/nortos/${ti_simplelink_board}/bim/hexfiles/bim_offchip/Release/bim_offchip.hex"
-        }
-
-        if (custom_factory_data) {
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.bin",
-                        root_build_dir),
-            rebase_path(bim_hex, root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-factory-data.hex",
-                        root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-bim.hex",
-                        root_build_dir),
-          ]
-        } else {
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.bin",
-                        root_build_dir),
-            rebase_path(bim_hex, root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-bim.hex",
-                        root_build_dir),
-          ]
-        }
-
-        args += [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-      }
-      pw_python_action("${target_name}.ota") {
-        public_deps = [ ":${simplelink_target_name}-bim.hex" ]
-
-        script = "${chip_root}/src/app/ota_image_tool.py"
-        sources = [ "${root_out_dir}/${output_base_name}.bin" ]
-        outputs = [ "${root_out_dir}/${output_base_name}.ota" ]
-
-        args = [
-          "create",
-          rebase_path("${root_out_dir}/${output_base_name}.bin",
-                      root_build_dir),
-          rebase_path("${root_out_dir}/${output_base_name}.ota",
-                      root_build_dir),
-        ]
-
-        args += [
-          "-v",
-          matter_device_vid,
-          "-p",
-          matter_device_pid,
-          "-vn",
-          matter_software_ver,
-          "-vs",
-          matter_software_ver_str,
-        ]
-        if (defined(invoker.ota_digest)) {
-          args += [
-            "-da",
-            matter_ota_digest,
-          ]
-        } else {
-          args += [
-            "-da",
-            "sha256",
-          ]
-        }
-        if (defined(invoker.ota_args)) {
-          args += invoker.ota_args
-        }
-      }
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       if (custom_factory_data) {
         pw_python_action("${simplelink_target_name}-without-factory-data.hex") {
           public_deps = [ ":${simplelink_target_name}.out.image" ]
@@ -661,13 +474,7 @@ template("ti_simplelink_executable") {
   group(simplelink_target_name) {
     if (chip_enable_ota_requestor) {
       # Generating the ota binary image
-      if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-        data_deps = [
-          ":${simplelink_target_name}-bim.hex",
-          ":${simplelink_target_name}.ota",
-          ":${simplelink_target_name}.out",
-        ]
-      } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         data_deps = [
           ":${simplelink_target_name}-mcuboot.hex",
           ":${simplelink_target_name}.ota",
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
index 326d2b7e88540f..fe77dfc0033039 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
@@ -30,13 +30,9 @@ import("ti_simplelink_board.gni")
 declare_args() {
   # Location of the TI SimpleLink SDK.
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     ti_simplelink_sdk_root =
         "${chip_root}/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx"
-    ot_cc13x2_cc26x2 =
-        "${chip_root}/third_party/ti_simplelink_sdk/repo_ot-cc13x2_cc26x2"
   } else if (ti_simplelink_device_family == "cc32xx") {
     ti_simplelink_sdk_root =
         "${chip_root}/third_party/ti_simplelink_sdk/repo_cc32xx"
@@ -59,26 +55,6 @@ template("ti_sysconfig") {
     gen_outputs += [ output_dir + "/" + output ]
   }
 
-  config("cc13x2_26x2_${target_name}_config") {
-    ldflags = [
-      "-nostartfiles",
-      "-fno-exceptions",
-      "-fno-unwind-tables",
-    ]
-    defines = [ "DeviceFamily_CC13X2_CC26X2" ]
-  }
-
-  config("cc13x2x7_26x2x7_${target_name}_config") {
-    ldflags = [
-      "-nostartfiles",
-      "-fno-exceptions",
-      "-fno-unwind-tables",
-    ]
-
-    cflags = [ "-Wno-sign-compare" ]
-    defines = [ "DeviceFamily_CC26X2X7" ]
-  }
-
   config("cc13x4_26x4_${target_name}_config") {
     ldflags = [
       "-nostartfiles",
@@ -181,9 +157,7 @@ template("ti_simplelink_sdk") {
   assert(ti_simplelink_sdk_root != "",
          "ti_simplelink_sdk_root must be specified")
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     action("build_external_library") {
       script = "${ti_simplelink_sdk_build_root}/run_sdk_drivers_gen.py"
       outputs = [
@@ -211,16 +185,6 @@ template("ti_simplelink_sdk") {
 
   sdk_target_name = target_name
 
-  config("cc13x2_26x2_sdk_config") {
-    libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
-    defines = [ "DeviceFamily_CC13X2_CC26X2" ]
-  }
-
-  config("cc13x2x7_26x2x7_sdk_config") {
-    libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_cc26x2.a" ]
-    defines = [ "DeviceFamily_CC13X2X7_CC26X2X7" ]
-  }
-
   config("cc13x4_26x4_sdk_config") {
     libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
     defines = [ "FLASH_ONLY_BUILD" ]
@@ -253,9 +217,7 @@ template("ti_simplelink_sdk") {
     ]
   }
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     config("external_library_config") {
       libs = [
         "${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a",
@@ -299,17 +261,7 @@ template("ti_simplelink_sdk") {
       "${ti_simplelink_sdk_root}/kernel/freertos/dpl/SwiP_freertos.c",
       "${ti_simplelink_sdk_root}/kernel/freertos/dpl/SystemP_freertos.c",
     ]
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      sources += [
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/ClockPCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/HwiPCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/PowerCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/TimerPCC26XX_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/startup/startup_cc13x2_cc26x2_gcc.c",
-        "${ti_simplelink_sdk_root}/source/ti/drivers/sha2/SHA2CC26X2.c",
-      ]
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       sources += [
         "${ti_simplelink_sdk_root}/kernel/freertos/dpl/ClockPCC26X2_freertos.c",
         "${ti_simplelink_sdk_root}/kernel/freertos/dpl/HwiPCC26X2_freertos.c",
@@ -376,9 +328,7 @@ template("ti_simplelink_sdk") {
     public_configs = [ ":${sdk_target_name}_config" ]
   }
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     source_set("${sdk_target_name}_nvocmp") {
       defines = [ "NVOCMP_POSIX_MUTEX" ]
       cflags = [
@@ -414,141 +364,6 @@ template("ti_simplelink_sdk") {
     }
   }
 
-  config("${sdk_target_name}_cc13x2_26x2_dmm_config") {
-    defines = [
-      "INCLUDE_BGET_STATS",
-      "USE_DMM",
-      "NVOCMP_FREERTOS_MUTEX=1",
-      "USEOT",
-      "ICALL_EVENTS",
-      "ICALL_JT",
-      "ICALL_LITE",
-      "ICALL_MAX_NUM_ENTITIES=6",
-      "ICALL_MAX_NUM_TASKS=3",
-      "ICALL_STACK0_ADDR",
-      "POWER_SAVING",
-      "TBM_ACTIVE_ITEMS_ONLY",
-      "NPI_USE_UART",
-      "NPI_FLOW_CTRL=0",
-      "OSAL_CBTIMER_NUM_TASKS=1",
-      "USE_ICALL",
-      "BLE_START",
-      "FREERTOS",
-    ]
-    cflags = [
-      "-Wno-conversion",
-      "-Wno-comment",
-      "-Wno-shadow",
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/build_components.opt",
-                        root_build_dir),
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/factory_config.opt",
-                        root_build_dir),
-    ]
-  }
-
-  config("${sdk_target_name}_cc13x2x7_26x2x7_dmm_config") {
-    include_dirs = []
-    libs = []
-
-    defines = [
-      "INCLUDE_BGET_STATS",
-      "USE_DMM",
-      "NVOCMP_FREERTOS_MUTEX=1",
-      "USEOT",
-      "ICALL_EVENTS",
-      "ICALL_JT",
-      "ICALL_LITE",
-      "ICALL_MAX_NUM_ENTITIES=6",
-      "ICALL_MAX_NUM_TASKS=3",
-      "ICALL_STACK0_ADDR",
-      "POWER_SAVING",
-      "TBM_ACTIVE_ITEMS_ONLY",
-      "NPI_USE_UART",
-      "NPI_FLOW_CTRL=0",
-      "OSAL_CBTIMER_NUM_TASKS=1",
-      "USE_ICALL",
-      "BLE_START",
-      "FREERTOS",
-    ]
-
-    libs += [
-      "${ti_simplelink_sdk_root}/source/ti/dmm/lib/gcc/m4f/libdmmlib_freertos.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/OneLib.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/StackWrapper.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/ble_r2.symbols",
-    ]
-
-    defines += [
-      "FLASH_ROM_BUILD",
-      "ONE_BLE_LIB_SIZE_OPTIMIZATION",
-      "STACK_LIBRARY",
-      "CC26XX",
-      "CC26X2",
-      "CC26X2R1_LAUNCHXL",
-    ]
-
-    include_dirs += [
-      # DMM/BLE:
-      "${ti_simplelink_sdk_root}/source",
-
-      # Eclipse the SDK config header from DMM
-      "${chip_root}/src/platform/cc13x2_26x2",
-
-      # CHIPoBLE Added include dirs
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/freertos/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/freertos/itm",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/thread/platform",
-      "${ti_simplelink_sdk_root}/source/",
-      "${ti_simplelink_sdk_root}/source/ti/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/thread/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/thread/source/activity/",
-      "${ti_simplelink_sdk_root}/source/ti/common/nv",
-
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/inc",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/rf_patches",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/driverlib",
-
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/npi/stack/",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/rcosc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/controller/cc26xx/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/rom",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/freertos",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/heapmgr",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/dev_info",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common/cc26xx/",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/simple_profile",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/osal/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/controller/cc26xx/inc/",
-      "${ti_simplelink_sdk_root}/source/ti/common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/freertos/",
-    ]
-
-    cflags = [
-      "-Wno-conversion",
-      "-Wno-comment",
-      "-Wno-shadow",
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/build_components.opt",
-                        root_build_dir),
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/factory_config.opt",
-                        root_build_dir),
-    ]
-  }
-
   config("${sdk_target_name}_cc13x4_26x4_dmm_config") {
     include_dirs = []
     libs = []
@@ -699,9 +514,7 @@ template("ti_simplelink_sdk") {
   }
 
   source_set("${sdk_target_name}_dmm") {
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x4_26x4" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       defines = []
       include_dirs = [
         "${chip_root}/third_party/openthread/repo/include/",
@@ -729,22 +542,7 @@ template("ti_simplelink_sdk") {
         "${ti_simplelink_sdk_root}/source/ti/dmm/dmm_priority_ble_thread.c",
       ]
 
-      if (ti_simplelink_device_family == "cc13x2_26x2" ||
-          ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-        sources += [
-          "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/host/gatt_uuid.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/host/gattservapp_util.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/app/icall_api_lite.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/icall_cc2650.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/icall_user_config.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/stack/ble_user_config_stack.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/dev_info/cc26xx/devinfoservice.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/rom/agama_r1/rom_init.c",
-        ]
-
-        include_dirs += [ "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/" ]
-      } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         sources += [
           "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4/ble_user_config.c",
           "${ti_simplelink_sdk_root}/source/ti/ble5stack_flash/host/gatt_uuid.c",
@@ -780,9 +578,7 @@ template("ti_simplelink_sdk") {
       ":${sdk_target_name}_dpl",
       ":${sdk_target_name}_freertos",
     ]
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-        ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       public_deps += [
         ":${sdk_target_name}_dmm",
         ":${sdk_target_name}_nvocmp",
@@ -791,9 +587,7 @@ template("ti_simplelink_sdk") {
     }
     if (defined(invoker.public_configs)) {
       public_configs = invoker.public_configs
-      if (ti_simplelink_device_family == "cc13x2_26x2" ||
-          ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-          ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         public_configs += [ ":external_library_config" ]
       }
     }
@@ -803,9 +597,7 @@ template("ti_simplelink_sdk") {
 template("freertos_target") {
   freertos_target_name = target_name
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     _freertos_root = "${freertos_root}"
   } else {
     _freertos_root = "${freertos_root}/repo"
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index a3e74424d0768b..78c93070ca6d03 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -27,10 +27,11 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage-null-handling.h>
+#include <app/util/attribute-table.h>
 #include <app/util/odd-sized-integers.h>
 #include <lib/core/CHIPEncoding.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 namespace chip {
 namespace app {
@@ -55,6 +56,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Identify::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -86,6 +101,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Identify::IdentifyTypeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Identify::IdentifyTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Identify::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Identify::IdentifyTypeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Identify::IdentifyTypeEnum>;
@@ -117,6 +147,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Identify::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -148,6 +192,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Identify::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -186,6 +244,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Groups::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value)
 {
@@ -218,6 +291,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Groups::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -249,6 +336,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Groups::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -286,6 +387,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -317,6 +432,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -348,6 +477,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -379,6 +522,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -414,6 +571,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::StartUpOnOffEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::OnOff::StartUpOnOffEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::StartUpOnOffEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::OnOff::StartUpOnOffEnum>;
@@ -427,6 +599,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Cl
     return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::OnOff::StartUpOnOffEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::OnOff::StartUpOnOffEnum>;
@@ -436,6 +617,18 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> & value)
 {
@@ -465,6 +658,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -496,6 +703,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -534,6 +755,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOffSwitchConfiguration::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -566,6 +802,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOffSwitchConfiguration::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -598,6 +849,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOffSwitchConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -630,6 +896,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OnOffSwitchConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -671,6 +952,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -684,6 +979,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -693,6 +997,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -722,6 +1037,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -754,6 +1083,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -786,6 +1129,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -818,6 +1175,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -850,6 +1221,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -882,6 +1267,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -915,6 +1314,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value)
 {
@@ -948,6 +1362,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -983,6 +1411,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -996,6 +1438,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1005,6 +1456,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -1037,6 +1499,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1050,6 +1526,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1059,6 +1544,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -1091,6 +1587,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1104,6 +1614,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1113,6 +1632,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -1145,6 +1675,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1158,6 +1702,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1167,6 +1720,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -1199,6 +1763,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1212,6 +1790,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1221,6 +1808,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -1250,6 +1848,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1282,6 +1894,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1322,8 +1948,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -1354,8 +1995,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -1386,8 +2042,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -1416,6 +2087,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -1448,6 +2133,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1480,6 +2179,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -1512,6 +2225,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1544,6 +2271,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -1576,6 +2317,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1608,6 +2363,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1640,6 +2409,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BinaryInputBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1678,6 +2461,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PulseWidthModulation::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1710,6 +2508,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PulseWidthModulation::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1751,6 +2563,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Binding::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1782,6 +2608,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Binding::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1820,6 +2660,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AccessControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1860,8 +2714,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(512 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 512, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[512 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::Actions::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(512 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 512, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[512 + 2];
@@ -1889,6 +2757,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Actions::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -1920,6 +2802,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Actions::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -1960,8 +2856,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BasicInformation::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -1990,6 +2901,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BasicInformation::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -2022,6 +2947,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BasicInformation::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -2054,6 +2993,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BasicInformation::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2086,6 +3039,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BasicInformation::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2124,6 +3091,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateProvider::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2156,6 +3138,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateProvider::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2194,6 +3191,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -2227,6 +3239,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value)
 {
@@ -2263,6 +3291,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -2276,6 +3319,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -2285,6 +3338,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -2314,6 +3378,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2346,6 +3425,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OtaSoftwareUpdateRequestor::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2386,8 +3480,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(35 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 35, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[35 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::LocalizationConfiguration::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(35 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 35, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[35 + 1];
@@ -2416,6 +3525,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LocalizationConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2448,6 +3572,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LocalizationConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2487,6 +3626,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TimeFormatLocalization::HourFormatEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value)
 {
@@ -2521,6 +3675,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value)
 {
@@ -2554,6 +3723,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2586,6 +3770,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeFormatLocalization::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2624,6 +3823,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitLocalization::TempUnitEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::UnitLocalization::TempUnitEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitLocalization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitLocalization::TempUnitEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::UnitLocalization::TempUnitEnum>;
@@ -2656,6 +3870,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitLocalization::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2688,6 +3916,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitLocalization::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2726,6 +3968,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSourceConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2758,6 +4015,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSourceConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2796,6 +4068,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::PowerSourceStatusEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::PowerSourceStatusEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::PowerSourceStatusEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::PowerSourceStatusEnum>;
@@ -2828,6 +4115,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -2862,8 +4163,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(60 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 60, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[60 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(60 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 60, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[60 + 1];
@@ -2895,6 +4210,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2908,6 +4237,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -2917,6 +4255,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -2949,6 +4298,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2962,6 +4325,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -2971,6 +4343,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -3000,6 +4383,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::WiredCurrentTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::WiredCurrentTypeEnum>;
@@ -3035,6 +4433,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3048,6 +4460,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3057,6 +4478,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -3086,6 +4518,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3118,6 +4564,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3150,6 +4610,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -3185,6 +4659,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3198,6 +4686,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3207,6 +4704,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -3239,6 +4747,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -3252,6 +4774,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -3261,6 +4792,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -3293,6 +4835,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3306,6 +4862,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3315,6 +4880,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -3344,6 +4920,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeLevelEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatChargeLevelEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeLevelEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatChargeLevelEnum>;
@@ -3376,6 +4967,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -3408,6 +5013,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatReplaceabilityEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatReplaceabilityEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatReplaceabilityEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatReplaceabilityEnum>;
@@ -3440,6 +5060,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -3474,8 +5108,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(60 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 60, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[60 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(60 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 60, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[60 + 1];
@@ -3505,6 +5153,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatCommonDesignationEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatCommonDesignationEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatCommonDesignationEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatCommonDesignationEnum>;
@@ -3539,8 +5202,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(20 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 20, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[20 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(20 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 20, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[20 + 1];
@@ -3571,8 +5248,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(20 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 20, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[20 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(20 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 20, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[20 + 1];
@@ -3602,6 +5293,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatApprovedChemistryEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatApprovedChemistryEnum>;
@@ -3634,6 +5340,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3666,6 +5386,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -3698,6 +5432,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatChargeStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::PowerSource::BatChargeStateEnum>;
@@ -3733,6 +5482,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3746,6 +5509,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3755,6 +5527,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -3784,6 +5567,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -3819,6 +5616,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3832,6 +5643,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3841,6 +5661,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -3870,6 +5701,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -3902,6 +5747,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerSource::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -3940,6 +5799,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::GeneralCommissioning::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -3972,6 +5845,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::GeneralCommissioning::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4004,6 +5892,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::GeneralCommissioning::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4042,6 +5944,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -4074,6 +5990,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -4106,6 +6036,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -4138,6 +6082,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -4175,6 +6133,22 @@ Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value)
 {
@@ -4189,6 +6163,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum>;
@@ -4198,6 +6181,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> & value)
@@ -4216,6 +6212,12 @@ namespace LastNetworkID {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to NetworkCommissioning::LastNetworkID::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[32 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, zclString, sizeof(zclString));
@@ -4226,15 +6228,30 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 32, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 32);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -4244,12 +6261,30 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -4282,6 +6317,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -4295,6 +6344,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -4304,6 +6362,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
 {
     if (value.IsNull())
@@ -4334,6 +6403,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value)
 {
@@ -4367,6 +6453,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4399,6 +6499,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4431,6 +6546,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NetworkCommissioning::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4469,6 +6598,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DiagnosticLogs::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4501,6 +6644,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DiagnosticLogs::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4539,6 +6696,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::GeneralDiagnostics::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -4577,6 +6748,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SoftwareDiagnostics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4615,6 +6800,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4647,6 +6847,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThreadNetworkDiagnostics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4685,6 +6900,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WiFiNetworkDiagnostics::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4717,6 +6947,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WiFiNetworkDiagnostics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4755,6 +7000,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EthernetNetworkDiagnostics::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4787,6 +7047,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EthernetNetworkDiagnostics::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -4825,6 +7100,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeSourceEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TimeSynchronization::TimeSourceEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeSourceEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::TimeSynchronization::TimeSourceEnum>;
@@ -4858,6 +7148,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value)
 {
@@ -4891,6 +7196,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -4923,6 +7242,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -4955,6 +7288,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -4987,6 +7334,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TimeSynchronization::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5027,8 +7388,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5058,6 +7434,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorI
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::VendorId>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value)
 {
     using Traits = NumericAttributeTraits<chip::VendorId>;
@@ -5092,8 +7483,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5125,8 +7531,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5156,6 +7577,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5190,8 +7626,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[64 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[64 + 1];
@@ -5221,6 +7672,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5255,8 +7721,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[64 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[64 + 1];
@@ -5288,8 +7769,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -5321,8 +7817,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5354,8 +7865,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(256 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 256, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[256 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(256 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 256, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[256 + 2];
@@ -5387,8 +7913,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[64 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[64 + 1];
@@ -5420,8 +7961,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5451,6 +8007,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -5485,8 +8056,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, zclString,
+                                 ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -5516,6 +8102,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5548,6 +8149,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BridgedDeviceBasicInformation::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5585,6 +8201,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Switch::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -5616,6 +8246,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Switch::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -5647,6 +8291,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Switch::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -5678,6 +8336,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Switch::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5709,6 +8381,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Switch::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5747,6 +8433,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AdministratorCommissioning::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5779,6 +8480,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AdministratorCommissioning::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5817,6 +8533,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalCredentials::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5849,6 +8580,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalCredentials::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5891,6 +8637,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FixedLabel::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5923,6 +8683,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FixedLabel::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -5961,6 +8735,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UserLabel::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -5993,6 +8781,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UserLabel::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6031,6 +8833,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6063,6 +8879,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6101,6 +8931,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyDiscovery::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6133,6 +8977,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyDiscovery::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6171,6 +9029,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyValid::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6203,6 +9075,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ProxyValid::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6241,6 +9127,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanState::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -6273,6 +9173,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6305,6 +9219,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6344,6 +9272,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IcdManagement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value)
 {
@@ -6379,8 +9323,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(128 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 128, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[128 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::IcdManagement::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(128 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 128, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[128 + 1];
@@ -6409,6 +9367,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::IcdManagement::OperatingModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::IcdManagement::OperatingModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IcdManagement::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::IcdManagement::OperatingModeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::IcdManagement::OperatingModeEnum>;
@@ -6441,6 +9414,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IcdManagement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6473,6 +9460,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IcdManagement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6510,6 +9511,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6541,6 +9556,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6572,6 +9601,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Timer::TimerStatusEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Timer::TimerStatusEnum>;
@@ -6603,6 +9647,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6634,6 +9692,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6672,6 +9744,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6704,6 +9791,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenCavityOperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6741,6 +9843,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -6775,6 +9891,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -6788,6 +9918,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -6797,6 +9936,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -6828,6 +9978,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -6841,6 +10005,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -6850,6 +10023,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -6878,6 +10062,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -6909,6 +10107,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OvenMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -6951,6 +10163,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value)
 {
@@ -6965,6 +10192,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum>;
@@ -6974,6 +10210,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value)
@@ -7005,6 +10254,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -7037,6 +10301,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryDryerControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7077,8 +10355,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[64 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(64 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 64, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[64 + 1];
@@ -7110,6 +10402,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7123,6 +10429,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7132,6 +10447,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -7161,6 +10487,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7196,6 +10536,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7209,6 +10563,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7218,6 +10581,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -7250,6 +10624,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7263,6 +10651,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7272,6 +10669,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -7301,6 +10709,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -7333,6 +10755,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7371,6 +10807,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7409,6 +10859,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7451,6 +10916,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7464,6 +10943,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7473,6 +10961,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -7503,6 +11002,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value)
 {
@@ -7536,6 +11050,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -7568,6 +11097,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7606,6 +11149,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7644,6 +11201,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7682,6 +11253,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -7714,6 +11300,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -7746,6 +11347,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -7778,6 +11394,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -7810,6 +11441,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -7842,6 +11487,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -7874,6 +11533,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -7913,6 +11586,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value)
 {
@@ -7947,6 +11636,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value)
 {
@@ -7981,6 +11686,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value)
 {
@@ -8014,6 +11735,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -8046,6 +11781,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAlarm::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8084,6 +11833,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8122,6 +11885,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AirQuality::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8160,6 +11937,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum>;
@@ -8192,6 +11984,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
@@ -8224,6 +12031,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
@@ -8256,6 +12078,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
@@ -8288,6 +12125,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::MuteStateEnum>;
@@ -8320,6 +12172,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -8352,6 +12218,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -8384,6 +12264,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum>;
@@ -8416,6 +12311,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
@@ -8448,6 +12358,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum>;
@@ -8481,6 +12406,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum>;
@@ -8513,6 +12453,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::SmokeCoAlarm::SensitivityEnum>;
@@ -8545,6 +12500,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -8577,6 +12546,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -8609,6 +12592,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8648,6 +12645,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value)
 {
@@ -8682,6 +12694,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value)
 {
@@ -8716,6 +12743,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value)
 {
@@ -8750,6 +12792,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value)
 {
@@ -8783,6 +12840,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -8815,6 +12886,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DishwasherAlarm::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8853,6 +12938,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8891,6 +12990,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8929,6 +13042,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -8961,6 +13088,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -8999,6 +13140,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9031,6 +13186,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcOperationalState::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9072,6 +13241,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::NodeId value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::NodeId>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_NODE_ID_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::NodeId value)
 {
     using Traits = NumericAttributeTraits<chip::NodeId>;
@@ -9085,6 +13268,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::NodeId
     return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_NODE_ID_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::NodeId>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_NODE_ID_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::NodeId>;
@@ -9094,6 +13286,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_NODE_ID_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::NodeId> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::NodeId> & value)
 {
     if (value.IsNull())
@@ -9123,6 +13326,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9155,6 +13372,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9187,6 +13418,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ScenesManagement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9225,6 +13470,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::HepaFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9263,6 +13522,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ActivatedCarbonFilterMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9301,6 +13575,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -9333,6 +13622,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -9366,6 +13670,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value)
 {
@@ -9400,6 +13721,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value)
 {
@@ -9434,6 +13772,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value)
 {
@@ -9468,6 +13823,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value)
 {
@@ -9502,6 +13874,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap> value)
 {
@@ -9535,6 +13924,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9567,6 +13971,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BooleanStateConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -9608,6 +14027,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9621,6 +14055,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9630,6 +14074,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -9662,6 +14117,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9675,6 +14145,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -9684,6 +14164,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -9716,6 +14207,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -9729,6 +14235,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -9738,6 +14254,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -9771,6 +14298,23 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::ValveCon
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value)
 {
@@ -9785,6 +14329,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
@@ -9794,6 +14348,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
@@ -9829,6 +14396,23 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::ValveCon
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value)
 {
@@ -9843,6 +14427,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum>;
@@ -9852,6 +14446,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value)
@@ -9886,6 +14493,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -9899,6 +14521,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -9908,6 +14540,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     if (value.IsNull())
@@ -9940,6 +14583,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -9953,6 +14611,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -9962,6 +14630,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     if (value.IsNull())
@@ -9991,6 +14670,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Percent
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -10024,6 +14718,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value)
 {
@@ -10057,6 +14768,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10089,6 +14815,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -10121,6 +14862,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10159,6 +14915,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalPowerMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10197,6 +14968,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalEnergyMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10235,6 +15021,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10267,6 +15068,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10299,6 +15115,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10331,6 +15162,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10363,6 +15209,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10395,6 +15256,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -10427,6 +15303,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10464,6 +15355,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Messages::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -10495,6 +15400,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Messages::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10533,6 +15452,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10571,6 +15505,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvse::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10609,6 +15557,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyPreference::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10641,6 +15603,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyPreference::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10673,6 +15649,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyPreference::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -10705,6 +15695,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyPreference::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10743,6 +15747,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PowerTopology::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10784,6 +15802,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10797,6 +15829,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10806,6 +15847,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -10838,6 +15890,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10851,6 +15917,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10860,6 +15935,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -10889,6 +15975,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::EnergyEvseMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -10930,6 +16030,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10943,6 +16058,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10952,6 +16077,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -10984,6 +16120,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -10997,6 +16148,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11006,6 +16167,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -11035,6 +16207,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DeviceEnergyManagementMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -11076,6 +16263,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockState value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockState>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockState value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockState>;
@@ -11089,6 +16291,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Cl
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockState>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockState>;
@@ -11098,6 +16309,18 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value)
 {
@@ -11127,6 +16350,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockType value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockType>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockType value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlLockType>;
@@ -11158,6 +16396,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -11193,6 +16445,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
@@ -11206,6 +16473,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Cl
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
@@ -11215,6 +16491,18 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value)
 {
@@ -11244,6 +16532,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -11275,6 +16577,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -11306,6 +16622,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -11337,6 +16667,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -11368,6 +16712,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -11399,6 +16757,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -11430,6 +16802,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11461,6 +16847,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11492,6 +16892,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11523,6 +16937,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11554,6 +16982,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11585,6 +17027,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11616,6 +17072,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11648,6 +17118,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value)
 {
@@ -11680,6 +17166,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11714,8 +17214,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(3 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 3, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[3 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(3 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 3, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[3 + 1];
@@ -11743,6 +17257,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11774,6 +17302,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -11805,6 +17347,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -11836,6 +17392,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::OperatingModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::OperatingModeEnum>;
@@ -11868,6 +17439,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value)
 {
@@ -11901,6 +17488,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value)
 {
@@ -11933,6 +17536,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -11964,6 +17581,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -11995,6 +17626,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -12026,6 +17671,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -12058,6 +17717,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value)
 {
@@ -12090,6 +17765,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -12121,6 +17810,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -12152,6 +17855,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -12183,6 +17900,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -12214,6 +17945,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12233,6 +17978,12 @@ namespace AliroReaderVerificationKey {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to DoorLock::AliroReaderVerificationKey::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[65 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, sizeof(zclString));
@@ -12243,15 +17994,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 65, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 65);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(65 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 65, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[65 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(65 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 65, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[65 + 1];
@@ -12261,12 +18026,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -12283,6 +18065,12 @@ namespace AliroReaderGroupIdentifier {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to DoorLock::AliroReaderGroupIdentifier::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[16 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, sizeof(zclString));
@@ -12293,15 +18081,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 16, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 16);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -12311,12 +18113,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -12348,8 +18167,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -12365,6 +18198,12 @@ namespace AliroGroupResolvingKey {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to DoorLock::AliroGroupResolvingKey::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[16 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, sizeof(zclString));
@@ -12375,15 +18214,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 16, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 16);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -12393,12 +18246,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -12427,6 +18297,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -12458,6 +18342,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12489,6 +18387,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12520,6 +18432,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -12551,6 +18477,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::DoorLock::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12589,6 +18529,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::Type>;
@@ -12621,6 +18576,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12653,6 +18622,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12688,6 +18671,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12701,6 +18698,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12710,6 +18716,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -12742,6 +18759,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12755,6 +18786,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12764,6 +18804,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -12793,6 +18844,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12825,6 +18890,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -12858,6 +18937,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value)
 {
@@ -12894,6 +18988,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -12907,6 +19015,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -12916,6 +19033,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     if (value.IsNull())
@@ -12948,6 +19076,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -12961,6 +19103,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -12970,6 +19121,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     if (value.IsNull())
@@ -13000,6 +19162,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value)
 {
@@ -13036,6 +19214,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13049,6 +19241,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13058,6 +19259,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
@@ -13091,6 +19303,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13104,6 +19330,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13113,6 +19348,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
@@ -13143,6 +19389,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::EndProductType>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::WindowCovering::EndProductType>;
@@ -13178,6 +19439,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13191,6 +19466,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13200,6 +19484,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
@@ -13233,6 +19528,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13246,6 +19555,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent100ths>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent100ths>;
@@ -13255,6 +19573,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_PERCENT100THS_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value)
 {
@@ -13285,6 +19614,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13317,6 +19660,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13349,6 +19706,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13381,6 +19752,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13413,6 +19798,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::BitMask
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::Mode>>;
@@ -13446,6 +19846,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value)
 {
@@ -13479,6 +19894,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -13511,6 +19940,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WindowCovering::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13549,6 +19992,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -13581,6 +20038,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13613,6 +20084,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -13645,6 +20130,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13677,6 +20176,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13709,6 +20222,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13741,6 +20268,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13773,6 +20314,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13805,6 +20360,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13837,6 +20406,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -13869,6 +20452,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -13901,6 +20498,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BarrierControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -13942,6 +20553,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -13955,6 +20581,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -13964,6 +20600,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -13996,6 +20643,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14009,6 +20671,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14018,6 +20690,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14050,6 +20733,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14063,6 +20761,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14072,6 +20780,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14104,6 +20823,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14117,6 +20851,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14126,6 +20870,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14158,6 +20913,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14171,6 +20941,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14180,6 +20960,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14212,6 +21003,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14225,6 +21031,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14234,6 +21050,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14266,6 +21093,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14279,6 +21121,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14288,6 +21140,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14320,6 +21183,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14333,6 +21211,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14342,6 +21230,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14374,6 +21273,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14387,6 +21301,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14396,6 +21320,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14428,6 +21363,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14441,6 +21391,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14450,6 +21410,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14482,6 +21453,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14495,6 +21481,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14504,6 +21500,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14536,6 +21543,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14549,6 +21571,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14558,6 +21590,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14590,6 +21633,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14603,6 +21661,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14612,6 +21680,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14642,6 +21721,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap> value)
 {
@@ -14676,6 +21772,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value)
 {
@@ -14710,6 +21823,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value)
 {
@@ -14746,6 +21876,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14759,6 +21904,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -14768,6 +21923,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -14800,6 +21966,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14813,6 +21994,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -14822,6 +22013,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -14854,6 +22056,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -14867,6 +22084,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -14876,6 +22103,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -14908,6 +22146,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -14921,6 +22174,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -14930,6 +22193,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -14962,6 +22236,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -14975,6 +22264,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -14984,6 +22283,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -15014,6 +22324,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value)
 {
@@ -15048,6 +22375,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value)
 {
@@ -15081,6 +22425,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -15113,6 +22472,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -15154,6 +22528,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15167,6 +22555,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15176,6 +22573,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -15208,6 +22616,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15221,6 +22643,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15230,6 +22661,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -15259,6 +22701,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -15291,6 +22747,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15323,6 +22793,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15355,6 +22839,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15387,6 +22885,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15419,6 +22931,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -15451,6 +22977,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -15483,6 +23023,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -15515,6 +23069,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -15547,6 +23115,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15579,6 +23161,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15611,6 +23207,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15643,6 +23253,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15675,6 +23299,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15707,6 +23345,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15739,6 +23391,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15771,6 +23437,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -15803,6 +23483,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -15836,6 +23530,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap> value)
 {
@@ -15870,6 +23580,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum value)
 {
@@ -15903,6 +23628,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SystemModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::SystemModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SystemModeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::SystemModeEnum>;
@@ -15936,6 +23676,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ThermostatRunningModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ThermostatRunningModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ThermostatRunningModeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ThermostatRunningModeEnum>;
@@ -15968,6 +23723,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::StartOfWeekEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::StartOfWeekEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::StartOfWeekEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::StartOfWeekEnum>;
@@ -16000,6 +23770,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16032,6 +23816,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16065,6 +23863,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum value)
 {
@@ -16101,6 +23914,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -16114,6 +23941,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -16123,6 +23959,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -16153,6 +24000,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap> value)
 {
@@ -16187,6 +24050,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap> value)
 {
@@ -16221,6 +24099,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SetpointChangeSourceEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::SetpointChangeSourceEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SetpointChangeSourceEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::SetpointChangeSourceEnum>;
@@ -16256,6 +24149,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -16269,6 +24176,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -16278,6 +24194,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -16307,6 +24234,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -16342,6 +24283,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16355,6 +24310,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16364,6 +24328,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16396,6 +24371,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16409,6 +24398,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16418,6 +24416,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16450,6 +24459,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16463,6 +24486,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16472,6 +24504,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16504,6 +24547,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16517,6 +24574,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16526,6 +24592,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16558,6 +24635,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16571,6 +24662,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16580,6 +24680,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16612,6 +24723,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16625,6 +24750,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16634,6 +24768,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -16663,6 +24808,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -16695,6 +24854,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACTypeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACTypeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACTypeEnum>;
@@ -16727,6 +24901,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -16759,6 +24947,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum>;
@@ -16791,6 +24994,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCompressorTypeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACCompressorTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCompressorTypeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACCompressorTypeEnum>;
@@ -16824,6 +25042,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap> value)
 {
@@ -16857,6 +25091,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACLouverPositionEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACLouverPositionEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACLouverPositionEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACLouverPositionEnum>;
@@ -16892,6 +25141,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -16905,6 +25168,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -16914,6 +25186,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -16943,6 +25226,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCapacityFormatEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACCapacityFormatEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCapacityFormatEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::Thermostat::ACCapacityFormatEnum>;
@@ -16975,6 +25273,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17007,6 +25319,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17039,6 +25365,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17074,6 +25414,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17087,6 +25441,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17096,6 +25459,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -17112,6 +25486,12 @@ namespace ActivePresetHandle {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to Thermostat::ActivePresetHandle::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[16 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, sizeof(zclString));
@@ -17122,15 +25502,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 16, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 16);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -17140,12 +25534,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -17162,6 +25573,12 @@ namespace ActiveScheduleHandle {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to Thermostat::ActiveScheduleHandle::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[16 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, sizeof(zclString));
@@ -17172,15 +25589,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 16, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 16);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -17190,12 +25621,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -17225,6 +25673,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -17258,6 +25720,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap> value)
 {
@@ -17294,6 +25772,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -17307,6 +25799,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -17316,6 +25817,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -17345,6 +25857,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -17377,6 +25903,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -17415,6 +25955,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::FanModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::FanModeEnum>;
@@ -17447,6 +26002,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeSequenceEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::FanModeSequenceEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeSequenceEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::FanModeSequenceEnum>;
@@ -17482,6 +26052,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -17495,6 +26079,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent
     return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -17504,6 +26097,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     if (value.IsNull())
@@ -17533,6 +26137,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Percent
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::Percent>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value)
 {
     using Traits = NumericAttributeTraits<chip::Percent>;
@@ -17565,6 +26183,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17600,6 +26232,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17613,6 +26259,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17622,6 +26277,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -17651,6 +26317,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -17684,6 +26364,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::RockBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::RockBitmap>>;
@@ -17717,6 +26412,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::RockBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::RockBitmap>>;
@@ -17750,6 +26460,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::WindBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::WindBitmap>>;
@@ -17783,6 +26508,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::WindBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::FanControl::WindBitmap>>;
@@ -17815,6 +26555,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::AirflowDirectionEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::AirflowDirectionEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::AirflowDirectionEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::FanControl::AirflowDirectionEnum>;
@@ -17847,6 +26602,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -17879,6 +26648,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FanControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -17918,6 +26701,23 @@ Get(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfi
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThermostatUserInterfaceConfiguration::Id, Id, writable,
+                                 ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value)
 {
@@ -17953,6 +26753,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThermostatUserInterfaceConfiguration::Id, Id, writable,
+                                 ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value)
 {
@@ -17989,6 +26806,24 @@ Get(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfi
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value,
+    MarkAttributeDirty markDirty)
+{
+    using Traits =
+        NumericAttributeTraits<chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThermostatUserInterfaceConfiguration::Id, Id, writable,
+                                 ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value)
 {
@@ -18024,6 +26859,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThermostatUserInterfaceConfiguration::Id, Id, writable,
+                                 ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -18057,6 +26907,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ThermostatUserInterfaceConfiguration::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18096,6 +26961,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18128,6 +27007,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18160,6 +27053,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18192,6 +27099,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18224,6 +27145,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18256,6 +27191,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18290,8 +27239,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(254 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 254, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[254 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(254 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 254, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[254 + 1];
@@ -18320,6 +27283,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18352,6 +27329,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18384,6 +27375,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18419,6 +27424,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18432,6 +27451,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18441,6 +27469,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -18470,6 +27509,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18502,6 +27555,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18537,6 +27604,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18550,6 +27631,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18559,6 +27649,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -18588,6 +27689,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18620,6 +27735,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18655,6 +27784,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18668,6 +27811,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18677,6 +27829,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -18706,6 +27869,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18738,6 +27915,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18773,6 +27964,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18786,6 +27991,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18795,6 +28009,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -18824,6 +28049,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18856,6 +28095,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18891,6 +28144,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18904,6 +28171,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -18913,6 +28189,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -18942,6 +28229,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -18974,6 +28275,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19009,6 +28324,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19022,6 +28351,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19031,6 +28369,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -19060,6 +28409,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19092,6 +28455,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19127,6 +28504,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19140,6 +28531,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19149,6 +28549,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -19178,6 +28589,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19210,6 +28635,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19242,6 +28681,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19274,6 +28727,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19309,6 +28776,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19322,6 +28803,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19331,6 +28821,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -19360,6 +28861,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19392,6 +28907,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19427,6 +28956,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19440,6 +28983,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19449,6 +29001,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -19478,6 +29041,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19510,6 +29087,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19545,6 +29136,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19558,6 +29163,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19567,6 +29181,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -19596,6 +29221,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19628,6 +29267,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19660,6 +29313,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19692,6 +29359,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -19724,6 +29405,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19756,6 +29451,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19788,6 +29497,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19820,6 +29543,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19852,6 +29589,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19884,6 +29635,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19916,6 +29681,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19951,6 +29730,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19964,6 +29757,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -19973,6 +29775,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -20002,6 +29815,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -20034,6 +29861,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20072,6 +29913,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20104,6 +29959,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20137,6 +30006,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap> value)
 {
@@ -20170,6 +30055,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20202,6 +30101,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20237,6 +30150,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20250,6 +30177,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20259,6 +30195,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -20291,6 +30238,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20304,6 +30265,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20313,6 +30283,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -20342,6 +30323,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -20376,8 +30371,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -20408,8 +30418,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -20441,6 +30466,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20454,6 +30493,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20463,6 +30511,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -20495,6 +30554,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20508,6 +30581,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20517,6 +30599,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -20547,6 +30640,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap> value)
 {
@@ -20583,6 +30692,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20596,6 +30719,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -20605,6 +30737,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -20634,6 +30777,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -20666,6 +30824,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::BallastConfiguration::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20707,6 +30879,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20720,6 +30907,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20729,6 +30926,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -20761,6 +30969,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20774,6 +30997,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20783,6 +31016,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -20815,6 +31059,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20828,6 +31087,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20837,6 +31106,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -20866,6 +31146,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -20902,6 +31197,21 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::Illumina
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum value)
 {
@@ -20916,6 +31226,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum>;
@@ -20925,6 +31244,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum> & value)
@@ -20956,6 +31288,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -20988,6 +31335,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::IlluminanceMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21029,6 +31391,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21042,6 +31419,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21051,6 +31438,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21083,6 +31481,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21096,6 +31509,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21105,6 +31528,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21137,6 +31571,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21150,6 +31599,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21159,6 +31618,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21188,6 +31658,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21220,6 +31705,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -21252,6 +31752,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21293,6 +31808,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21306,6 +31835,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21315,6 +31853,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21347,6 +31896,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21360,6 +31923,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21369,6 +31941,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21401,6 +31984,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21414,6 +32011,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21423,6 +32029,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21452,6 +32069,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21487,6 +32118,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21500,6 +32145,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21509,6 +32163,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21541,6 +32206,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21554,6 +32233,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21563,6 +32251,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21595,6 +32294,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21608,6 +32321,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -21617,6 +32339,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -21646,6 +32379,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21678,6 +32425,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -21710,6 +32471,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -21742,6 +32517,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::PressureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21783,6 +32572,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21796,6 +32599,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21805,6 +32617,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -21837,6 +32660,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21850,6 +32687,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21859,6 +32705,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -21891,6 +32748,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21904,6 +32775,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21913,6 +32793,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -21942,6 +32833,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -21974,6 +32879,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -22006,6 +32925,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FlowMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22047,6 +32980,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22060,6 +33008,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22069,6 +33027,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -22101,6 +33070,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22114,6 +33098,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22123,6 +33117,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -22155,6 +33160,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22168,6 +33188,16 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22177,6 +33207,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -22206,6 +33247,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22238,6 +33294,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -22270,6 +33341,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RelativeHumidityMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22309,6 +33395,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> value)
 {
@@ -22343,6 +33445,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum value)
 {
@@ -22377,6 +33494,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap> value)
 {
@@ -22410,6 +33543,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22442,6 +33589,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22474,6 +33635,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -22506,6 +33681,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22538,6 +33727,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22570,6 +33773,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -22602,6 +33819,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22634,6 +33865,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22666,6 +33911,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -22698,6 +33957,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -22730,6 +34003,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22768,6 +34055,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::CarbonMonoxideConcentrationMeasurement::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22807,6 +34109,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::CarbonDioxideConcentrationMeasurement::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22846,6 +34163,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::NitrogenDioxideConcentrationMeasurement::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22885,6 +34217,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::OzoneConcentrationMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22923,6 +34270,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Pm25ConcentrationMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -22961,6 +34323,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FormaldehydeConcentrationMeasurement::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23000,6 +34377,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Pm1ConcentrationMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23038,6 +34430,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Pm10ConcentrationMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23076,6 +34483,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23115,6 +34537,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::RadonConcentrationMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23155,8 +34592,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(12 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 12, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[12 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(12 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 12, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[12 + 1];
@@ -23187,8 +34638,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[16 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::WakeOnLan::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(16 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 16, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[16 + 1];
@@ -23217,6 +34682,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23249,6 +34728,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::WakeOnLan::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23286,6 +34779,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23317,6 +34824,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Channel::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23355,6 +34876,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -23387,6 +34922,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23419,6 +34968,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::TargetNavigator::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23457,6 +35020,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::MediaPlayback::PlaybackStateEnum>;
@@ -23492,6 +35070,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23505,6 +35097,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23514,6 +35115,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -23546,6 +35158,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23559,6 +35185,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23568,6 +35203,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -23597,6 +35243,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, float * value
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<float>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value)
 {
     using Traits = NumericAttributeTraits<float>;
@@ -23632,6 +35292,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23645,6 +35319,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23654,6 +35337,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -23686,6 +35380,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23699,6 +35407,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -23708,6 +35425,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -23737,6 +35465,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23769,6 +35511,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaPlayback::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23807,6 +35563,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -23839,6 +35609,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23871,6 +35655,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::MediaInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23908,6 +35706,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -23939,6 +35751,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::LowPower::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -23977,6 +35803,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24009,6 +35849,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::KeypadInput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24048,6 +35902,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value)
 {
@@ -24081,6 +35951,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24113,6 +35997,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24151,6 +36049,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -24183,6 +36095,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24215,6 +36141,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AudioOutput::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24253,6 +36193,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24285,6 +36239,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationLauncher::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24325,8 +36293,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -24355,6 +36338,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorI
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::VendorId>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value)
 {
     using Traits = NumericAttributeTraits<chip::VendorId>;
@@ -24389,8 +36386,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(256 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 256, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[256 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(256 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 256, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[256 + 2];
@@ -24419,6 +36431,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24452,6 +36478,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value)
 {
@@ -24487,8 +36528,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[32 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(32 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 32, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[32 + 1];
@@ -24517,6 +36573,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24549,6 +36619,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24587,6 +36671,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24619,6 +36717,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::AccountLogin::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24657,6 +36769,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -24691,8 +36817,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(8 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 8, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[8 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(8 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 8, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[8 + 1];
@@ -24723,8 +36863,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(8 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 8, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[8 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(8 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 8, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[8 + 1];
@@ -24753,6 +36907,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24785,6 +36953,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24817,6 +36999,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -24849,6 +37045,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24881,6 +37091,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24919,6 +37143,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentAppObserver::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -24951,6 +37189,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ContentAppObserver::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -24989,6 +37241,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -25021,6 +37288,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25053,6 +37334,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25085,6 +37380,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25117,6 +37426,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25149,6 +37472,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25181,6 +37518,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25213,6 +37564,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25245,6 +37610,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25277,6 +37656,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25309,6 +37702,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25341,6 +37748,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25373,6 +37794,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25405,6 +37840,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25437,6 +37886,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25469,6 +37932,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25501,6 +37978,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25533,6 +38024,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25565,6 +38070,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25597,6 +38116,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -25629,6 +38162,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -25661,6 +38208,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -25693,6 +38254,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -25725,6 +38300,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25757,6 +38346,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25789,6 +38392,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25821,6 +38438,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25853,6 +38484,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25885,6 +38530,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25917,6 +38576,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25949,6 +38622,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -25981,6 +38668,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26013,6 +38714,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26045,6 +38760,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26077,6 +38806,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26109,6 +38852,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26141,6 +38898,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26173,6 +38944,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -26205,6 +38990,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -26237,6 +39036,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -26269,6 +39082,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -26301,6 +39128,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26333,6 +39174,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26365,6 +39220,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26397,6 +39266,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26429,6 +39312,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26461,6 +39358,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26493,6 +39404,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26525,6 +39450,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26557,6 +39496,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26589,6 +39542,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26621,6 +39588,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26653,6 +39634,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26685,6 +39680,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26717,6 +39726,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26749,6 +39772,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -26781,6 +39818,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26813,6 +39864,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -26845,6 +39910,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26877,6 +39956,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26909,6 +40002,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26941,6 +40048,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -26973,6 +40094,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27005,6 +40140,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27037,6 +40186,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27069,6 +40232,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27101,6 +40278,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27133,6 +40324,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27165,6 +40370,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27197,6 +40416,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27229,6 +40462,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -27261,6 +40509,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27293,6 +40555,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27325,6 +40601,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27357,6 +40648,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27389,6 +40694,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27421,6 +40740,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27453,6 +40786,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27485,6 +40832,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27517,6 +40878,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27549,6 +40924,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27581,6 +40970,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27613,6 +41016,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27645,6 +41062,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27677,6 +41108,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27709,6 +41154,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27741,6 +41200,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27773,6 +41246,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27805,6 +41292,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27837,6 +41338,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27869,6 +41384,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27901,6 +41430,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27933,6 +41476,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -27965,6 +41522,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -27997,6 +41568,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28029,6 +41614,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28061,6 +41660,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28093,6 +41706,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28125,6 +41752,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -28157,6 +41798,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28189,6 +41844,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28221,6 +41890,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28253,6 +41936,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28285,6 +41982,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28317,6 +42028,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28349,6 +42074,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28381,6 +42120,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28413,6 +42166,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28445,6 +42212,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28477,6 +42258,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28509,6 +42304,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28541,6 +42350,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28573,6 +42396,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28605,6 +42442,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28637,6 +42488,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28669,6 +42534,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28701,6 +42580,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28733,6 +42626,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28765,6 +42672,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -28797,6 +42718,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28829,6 +42764,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -28861,6 +42810,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28893,6 +42856,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28925,6 +42902,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28957,6 +42948,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -28989,6 +42994,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29021,6 +43040,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29053,6 +43086,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29085,6 +43132,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -29117,6 +43179,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::ElectricalMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29155,6 +43231,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -29188,6 +43278,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value)
 {
@@ -29222,6 +43327,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value)
 {
@@ -29256,6 +43376,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value)
 {
@@ -29290,6 +43425,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value)
 {
@@ -29323,6 +43473,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -29355,6 +43519,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29387,6 +43565,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -29419,6 +43611,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -29451,6 +43657,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
@@ -29483,6 +43703,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
@@ -29515,6 +43749,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
@@ -29547,6 +43795,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -29579,6 +43841,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -29611,6 +43887,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -29643,6 +43933,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
@@ -29675,6 +43979,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -29707,6 +44025,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
@@ -29739,6 +44071,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
@@ -29771,6 +44117,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
@@ -29803,6 +44163,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<int64_t>;
@@ -29835,6 +44209,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -29867,6 +44255,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -29899,6 +44301,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, float * value
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<float>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value)
 {
     using Traits = NumericAttributeTraits<float>;
@@ -29931,6 +44347,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, double * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<double>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value)
 {
     using Traits = NumericAttributeTraits<double>;
@@ -29965,8 +44395,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[10 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[10 + 1];
@@ -29997,8 +44441,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 1000, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[1000 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 1000, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[1000 + 2];
@@ -30029,8 +44488,22 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[10 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[10 + 1];
@@ -30061,8 +44534,23 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Mutable
     value.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 1000, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[1000 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE,
+                                 markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(1000 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 1000, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[1000 + 2];
@@ -30091,6 +44579,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_EPOCH_US_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -30123,6 +44625,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -30155,6 +44671,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorI
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::VendorId>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value)
 {
     using Traits = NumericAttributeTraits<chip::VendorId>;
@@ -30187,6 +44717,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Cl
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
@@ -30219,6 +44764,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -30251,6 +44810,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * valu
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -30283,6 +44856,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -30315,6 +44902,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -30347,6 +44948,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -30379,6 +44994,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -30414,6 +45043,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -30427,6 +45070,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -30436,6 +45088,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value)
 {
     if (value.IsNull())
@@ -30469,6 +45132,21 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::BitMask<chip::app::Clus
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value)
 {
@@ -30483,6 +45161,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>>;
@@ -30492,6 +45179,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> & value)
@@ -30527,6 +45227,21 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::BitMask<chip::app::Clus
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value)
 {
@@ -30541,6 +45256,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>>;
@@ -30550,6 +45274,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> & value)
@@ -30585,6 +45322,21 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::BitMask<chip::app::Clus
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value)
 {
@@ -30599,6 +45351,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>>;
@@ -30608,6 +45369,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> & value)
@@ -30643,6 +45417,21 @@ Get(chip::EndpointId endpoint, DataModel::Nullable<chip::BitMask<chip::app::Clus
     }
     return status;
 }
+
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value)
 {
@@ -30657,6 +45446,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>>;
@@ -30666,6 +45464,19 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP64_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> & value,
+    MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> & value)
@@ -30700,6 +45511,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -30713,6 +45538,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -30722,6 +45556,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -30754,6 +45599,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -30767,6 +45626,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -30776,6 +45644,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -30808,6 +45687,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -30821,6 +45714,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, false>>;
@@ -30830,6 +45732,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -30862,6 +45775,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -30875,6 +45802,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -30884,6 +45820,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     if (value.IsNull())
@@ -30916,6 +45863,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
@@ -30929,6 +45890,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, false>>;
@@ -30938,6 +45908,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -30970,6 +45951,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
@@ -30983,6 +45978,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, false>>;
@@ -30992,6 +45996,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -31024,6 +46039,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
@@ -31037,6 +46066,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, false>>;
@@ -31046,6 +46084,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -31078,6 +46127,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -31091,6 +46154,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint64_t>;
@@ -31100,6 +46172,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value)
 {
     if (value.IsNull())
@@ -31132,6 +46215,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -31145,6 +46242,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -31154,6 +46260,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
 {
     if (value.IsNull())
@@ -31186,6 +46303,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -31199,6 +46330,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -31208,6 +46348,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -31240,6 +46391,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
@@ -31253,6 +46418,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<3, true>>;
@@ -31262,6 +46436,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT24S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
 {
     if (value.IsNull())
@@ -31294,6 +46479,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -31307,6 +46506,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int32_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int32_t>;
@@ -31316,6 +46524,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT32S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value)
 {
     if (value.IsNull())
@@ -31348,6 +46567,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
@@ -31361,6 +46594,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<5, true>>;
@@ -31370,6 +46612,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT40S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
 {
     if (value.IsNull())
@@ -31402,6 +46655,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
@@ -31415,6 +46682,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<6, true>>;
@@ -31424,6 +46700,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT48S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
 {
     if (value.IsNull())
@@ -31456,6 +46743,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
@@ -31469,6 +46770,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<OddSizedInteger<7, true>>;
@@ -31478,6 +46788,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT56S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
 {
     if (value.IsNull())
@@ -31510,6 +46831,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value)
 {
     using Traits = NumericAttributeTraits<int64_t>;
@@ -31523,6 +46858,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int64_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int64_t>;
@@ -31532,6 +46876,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value)
 {
     if (value.IsNull())
@@ -31564,6 +46919,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -31577,6 +46946,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -31586,6 +46964,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -31618,6 +47007,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -31631,6 +47034,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -31640,6 +47052,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -31672,6 +47095,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<float>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value)
 {
     using Traits = NumericAttributeTraits<float>;
@@ -31685,6 +47122,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<float>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<float>;
@@ -31694,6 +47140,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_SINGLE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value)
 {
     if (value.IsNull())
@@ -31726,6 +47183,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<double>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value)
 {
     using Traits = NumericAttributeTraits<double>;
@@ -31739,6 +47210,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<double>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<double>;
@@ -31748,6 +47228,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_DOUBLE_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value)
 {
     if (value.IsNull())
@@ -31764,6 +47255,12 @@ namespace NullableOctetString {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableByteSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to UnitTesting::NullableOctetString::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[10 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, sizeof(zclString));
@@ -31774,15 +47271,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 10, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 10);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[10 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value)
 {
+
     static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[10 + 1];
@@ -31792,12 +47303,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpa
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_OCTET_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value)
 {
     if (value.IsNull())
@@ -31814,6 +47342,12 @@ namespace NullableCharString {
 
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::MutableCharSpan> & value)
 {
+    if (value.IsNull())
+    {
+        ChipLogError(Zcl, "Null Nullable<Span> passed to UnitTesting::NullableCharString::Get");
+        return Protocols::InteractionModel::Status::Failure;
+    }
+
     uint8_t zclString[10 + 1];
     Protocols::InteractionModel::Status status =
         emberAfReadAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, sizeof(zclString));
@@ -31824,15 +47358,29 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
         value.SetNull();
         return Protocols::InteractionModel::Status::Success;
     }
-    auto & span = value.SetNonNull();
+    auto & span = value.Value();
 
     VerifyOrReturnError(span.size() == 10, Protocols::InteractionModel::Status::InvalidDataType);
     memcpy(span.data(), &zclString[1], 10);
     span.reduce_size(length);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty)
+{
+
+    static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
+    uint8_t zclString[10 + 1];
+    auto length = static_cast<uint8_t>(value.size());
+    Encoding::Put8(zclString, length);
+    memcpy(&zclString[1], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value)
 {
+
     static_assert(10 < NumericAttributeTraits<uint8_t>::kNullValue, "value.size() might be too big");
     VerifyOrReturnError(value.size() <= 10, Protocols::InteractionModel::Status::ConstraintError);
     uint8_t zclString[10 + 1];
@@ -31842,12 +47390,29 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpa
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    uint8_t zclString[1] = { 0xFF };
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     uint8_t zclString[1] = { 0xFF };
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value)
 {
     if (value.IsNull())
@@ -31881,6 +47446,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value,
+                                        MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
@@ -31894,6 +47474,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Cl
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<chip::app::Clusters::UnitTesting::SimpleEnum>;
@@ -31903,6 +47492,18 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> & value)
 {
@@ -31936,6 +47537,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -31949,6 +47564,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -31958,6 +47582,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     if (value.IsNull())
@@ -31990,6 +47625,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -32003,6 +47652,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int8_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int8_t>;
@@ -32012,6 +47670,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value)
 {
     if (value.IsNull())
@@ -32044,6 +47713,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -32057,6 +47740,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t valu
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -32066,6 +47758,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value)
 {
     if (value.IsNull())
@@ -32098,6 +47801,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nu
     }
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -32111,6 +47828,15 @@ Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType value;
+    Traits::SetNull(value);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
 {
     using Traits = NumericAttributeTraits<int16_t>;
@@ -32120,6 +47846,17 @@ Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint)
     return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
 }
 
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint, markDirty);
+    }
+
+    return Set(endpoint, value.Value(), markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
 {
     if (value.IsNull())
@@ -32149,6 +47886,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -32181,6 +47932,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -32213,6 +47978,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -32245,6 +48024,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * val
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint8_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::UnitTesting::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value)
 {
     using Traits = NumericAttributeTraits<uint8_t>;
@@ -32283,6 +48076,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FaultInjection::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -32315,6 +48122,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::FaultInjection::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
@@ -32353,6 +48174,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<bool>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SampleMei::Id, Id, writable, ZCL_BOOLEAN_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value)
 {
     using Traits = NumericAttributeTraits<bool>;
@@ -32385,6 +48220,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint32_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SampleMei::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value)
 {
     using Traits = NumericAttributeTraits<uint32_t>;
@@ -32417,6 +48266,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * va
     *value = Traits::StorageToWorking(temp);
     return status;
 }
+
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty)
+{
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
+    {
+        return Protocols::InteractionModel::Status::ConstraintError;
+    }
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::SampleMei::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE, markDirty);
+}
+
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_t>;
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 3a35e3511a6747..e51fb1999e9ce8 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -33,6 +33,7 @@
 
 namespace chip {
 namespace app {
+
 namespace Clusters {
 
 namespace Identify {
@@ -41,22 +42,27 @@ namespace Attributes {
 namespace IdentifyTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace IdentifyTime
 
 namespace IdentifyType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Identify::IdentifyTypeEnum * value); // IdentifyTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Identify::IdentifyTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Identify::IdentifyTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace IdentifyType
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -70,16 +76,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> * value); // NameSupportBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Groups::NameSupportBitmap> value, MarkAttributeDirty markDirty);
 } // namespace NameSupport
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -91,40 +101,52 @@ namespace Attributes {
 namespace OnOff {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace OnOff
 
 namespace GlobalSceneControl {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace GlobalSceneControl
 
 namespace OnTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace OnTime
 
 namespace OffWaitTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace OffWaitTime
 
 namespace StartUpOnOff {
 Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> & value); // StartUpOnOffEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::StartUpOnOffEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::StartUpOnOffEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::StartUpOnOffEnum> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpOnOff
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -136,21 +158,25 @@ namespace Attributes {
 namespace SwitchType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SwitchType
 
 namespace SwitchActions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SwitchActions
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -162,38 +188,48 @@ namespace Attributes {
 namespace CurrentLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentLevel
 
 namespace RemainingTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RemainingTime
 
 namespace MinLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MinLevel
 
 namespace MaxLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MaxLevel
 
 namespace CurrentFrequency {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentFrequency
 
 namespace MinFrequency {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace MinFrequency
 
 namespace MaxFrequency {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace MaxFrequency
 
 namespace Options {
@@ -201,56 +237,81 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> * value); // OptionsBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value, MarkAttributeDirty markDirty);
 } // namespace Options
 
 namespace OnOffTransitionTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace OnOffTransitionTime
 
 namespace OnLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnLevel
 
 namespace OnTransitionTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnTransitionTime
 
 namespace OffTransitionTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OffTransitionTime
 
 namespace DefaultMoveRate {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace DefaultMoveRate
 
 namespace StartUpCurrentLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpCurrentLevel
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -262,56 +323,67 @@ namespace Attributes {
 namespace ActiveText {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ActiveText
 
 namespace Description {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace Description
 
 namespace InactiveText {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace InactiveText
 
 namespace OutOfService {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace OutOfService
 
 namespace Polarity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Polarity
 
 namespace PresentValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace PresentValue
 
 namespace Reliability {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Reliability
 
 namespace StatusFlags {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace StatusFlags
 
 namespace ApplicationType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace ApplicationType
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -323,11 +395,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -343,11 +417,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -359,6 +435,7 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 } // namespace Attributes
@@ -370,16 +447,19 @@ namespace Attributes {
 namespace SetupURL {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // long_char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace SetupURL
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -391,26 +471,31 @@ namespace Attributes {
 namespace NodeLabel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace NodeLabel
 
 namespace LocalConfigDisabled {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace LocalConfigDisabled
 
 namespace Reachable {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace Reachable
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -422,11 +507,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -438,6 +525,7 @@ namespace Attributes {
 namespace UpdatePossible {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace UpdatePossible
 
 namespace UpdateState {
@@ -445,23 +533,32 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum * value); // UpdateStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::OtaSoftwareUpdateRequestor::UpdateStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UpdateState
 
 namespace UpdateStateProgress {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UpdateStateProgress
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -473,16 +570,19 @@ namespace Attributes {
 namespace ActiveLocale {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ActiveLocale
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -496,6 +596,8 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::HourFormatEnum * value); // HourFormatEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeFormatLocalization::HourFormatEnum value, MarkAttributeDirty markDirty);
 } // namespace HourFormat
 
 namespace ActiveCalendarType {
@@ -503,16 +605,20 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum * value); // CalendarTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeFormatLocalization::CalendarTypeEnum value, MarkAttributeDirty markDirty);
 } // namespace ActiveCalendarType
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -525,16 +631,20 @@ namespace TemperatureUnit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::UnitLocalization::TempUnitEnum * value); // TempUnitEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitLocalization::TempUnitEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitLocalization::TempUnitEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TemperatureUnit
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -546,11 +656,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -563,106 +675,146 @@ namespace Status {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::PowerSourceStatusEnum * value); // PowerSourceStatusEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::PowerSourceStatusEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::PowerSourceStatusEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Status
 
 namespace Order {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Order
 
 namespace Description {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace Description
 
 namespace WiredAssessedInputVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WiredAssessedInputVoltage
 
 namespace WiredAssessedInputFrequency {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WiredAssessedInputFrequency
 
 namespace WiredCurrentType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::WiredCurrentTypeEnum * value); // WiredCurrentTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::WiredCurrentTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WiredCurrentType
 
 namespace WiredAssessedCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WiredAssessedCurrent
 
 namespace WiredNominalVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace WiredNominalVoltage
 
 namespace WiredMaximumCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace WiredMaximumCurrent
 
 namespace WiredPresent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace WiredPresent
 
 namespace BatVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatVoltage
 
 namespace BatPercentRemaining {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatPercentRemaining
 
 namespace BatTimeRemaining {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatTimeRemaining
 
 namespace BatChargeLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::BatChargeLevelEnum * value); // BatChargeLevelEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeLevelEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeLevelEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatChargeLevel
 
 namespace BatReplacementNeeded {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace BatReplacementNeeded
 
 namespace BatReplaceability {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::BatReplaceabilityEnum * value); // BatReplaceabilityEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatReplaceabilityEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatReplaceabilityEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatReplaceability
 
 namespace BatPresent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace BatPresent
 
 namespace BatReplacementDescription {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace BatReplacementDescription
 
 namespace BatCommonDesignation {
@@ -670,16 +822,20 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatCommonDesignationEnum * value); // BatCommonDesignationEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::BatCommonDesignationEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatCommonDesignationEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatCommonDesignation
 
 namespace BatANSIDesignation {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace BatANSIDesignation
 
 namespace BatIECDesignation {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace BatIECDesignation
 
 namespace BatApprovedChemistry {
@@ -687,51 +843,68 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatApprovedChemistryEnum * value); // BatApprovedChemistryEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatApprovedChemistryEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatApprovedChemistry
 
 namespace BatCapacity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace BatCapacity
 
 namespace BatQuantity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace BatQuantity
 
 namespace BatChargeState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::PowerSource::BatChargeStateEnum * value); // BatChargeStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::PowerSource::BatChargeStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatChargeState
 
 namespace BatTimeToFullCharge {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatTimeToFullCharge
 
 namespace BatFunctionalWhileCharging {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace BatFunctionalWhileCharging
 
 namespace BatChargingCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatChargingCurrent
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -743,16 +916,19 @@ namespace Attributes {
 namespace Breadcrumb {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace Breadcrumb
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -764,21 +940,25 @@ namespace Attributes {
 namespace MaxNetworks {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MaxNetworks
 
 namespace ScanMaxTimeSeconds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace ScanMaxTimeSeconds
 
 namespace ConnectMaxTimeSeconds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace ConnectMaxTimeSeconds
 
 namespace InterfaceEnabled {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace InterfaceEnabled
 
 namespace LastNetworkingStatus {
@@ -788,25 +968,41 @@ Get(chip::EndpointId endpoint,
         value); // NetworkCommissioningStatusEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum> & value,
+    MarkAttributeDirty markDirty);
 } // namespace LastNetworkingStatus
 
 namespace LastNetworkID {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LastNetworkID
 
 namespace LastConnectErrorValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int32s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LastConnectErrorValue
 
 namespace SupportedThreadFeatures {
@@ -815,21 +1011,27 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> * value); // ThreadCapabilitiesBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SupportedThreadFeatures
 
 namespace ThreadVersion {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ThreadVersion
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -841,11 +1043,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -857,6 +1061,7 @@ namespace Attributes {
 namespace TestEventTriggersEnabled {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace TestEventTriggersEnabled
 
 } // namespace Attributes
@@ -868,6 +1073,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -879,11 +1085,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -895,11 +1103,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -911,11 +1121,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -928,6 +1140,8 @@ namespace TimeSource {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeSynchronization::TimeSourceEnum * value); // TimeSourceEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeSourceEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeSourceEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TimeSource
 
 namespace TimeZoneDatabase {
@@ -935,26 +1149,32 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum * value); // TimeZoneDatabaseEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::TimeSynchronization::TimeZoneDatabaseEnum value, MarkAttributeDirty markDirty);
 } // namespace TimeZoneDatabase
 
 namespace NTPServerAvailable {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace NTPServerAvailable
 
 namespace SupportsDNSResolve {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace SupportsDNSResolve
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -966,86 +1186,103 @@ namespace Attributes {
 namespace VendorName {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace VendorName
 
 namespace VendorID {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty);
 } // namespace VendorID
 
 namespace ProductName {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ProductName
 
 namespace NodeLabel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace NodeLabel
 
 namespace HardwareVersion {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace HardwareVersion
 
 namespace HardwareVersionString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace HardwareVersionString
 
 namespace SoftwareVersion {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace SoftwareVersion
 
 namespace SoftwareVersionString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace SoftwareVersionString
 
 namespace ManufacturingDate {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ManufacturingDate
 
 namespace PartNumber {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace PartNumber
 
 namespace ProductURL {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // long_char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ProductURL
 
 namespace ProductLabel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ProductLabel
 
 namespace SerialNumber {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace SerialNumber
 
 namespace Reachable {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace Reachable
 
 namespace UniqueID {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace UniqueID
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1057,26 +1294,31 @@ namespace Attributes {
 namespace NumberOfPositions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfPositions
 
 namespace CurrentPosition {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentPosition
 
 namespace MultiPressMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MultiPressMax
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1088,11 +1330,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1104,11 +1348,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1124,11 +1370,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1140,11 +1388,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1156,11 +1406,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1172,11 +1424,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1188,11 +1442,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1204,16 +1460,19 @@ namespace Attributes {
 namespace StateValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace StateValue
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1228,27 +1487,35 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> * value); // UserActiveModeTriggerBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UserActiveModeTriggerHint
 
 namespace UserActiveModeTriggerInstruction {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace UserActiveModeTriggerInstruction
 
 namespace OperatingMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::IcdManagement::OperatingModeEnum * value); // OperatingModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::IcdManagement::OperatingModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::IcdManagement::OperatingModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OperatingMode
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1260,27 +1527,33 @@ namespace Attributes {
 namespace SetTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace SetTime
 
 namespace TimeRemaining {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace TimeRemaining
 
 namespace TimerState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Timer::TimerStatusEnum * value); // TimerStatusEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Timer::TimerStatusEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TimerState
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1292,11 +1565,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1308,30 +1583,41 @@ namespace Attributes {
 namespace CurrentMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentMode
 
 namespace StartUpMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpMode
 
 namespace OnMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnMode
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1346,20 +1632,29 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value); // DrynessLevelEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::LaundryDryerControls::DrynessLevelEnum> & value,
+    MarkAttributeDirty markDirty);
 } // namespace SelectedDrynessLevel
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1371,42 +1666,58 @@ namespace Attributes {
 namespace Description {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace Description
 
 namespace StandardNamespace {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // enum16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StandardNamespace
 
 namespace CurrentMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentMode
 
 namespace StartUpMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpMode
 
 namespace OnMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnMode
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1418,6 +1729,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1429,6 +1741,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1440,8 +1753,12 @@ namespace Attributes {
 namespace SpinSpeedCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SpinSpeedCurrent
 
 namespace NumberOfRinses {
@@ -1449,16 +1766,20 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum * value); // NumberOfRinsesEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value, MarkAttributeDirty markDirty);
 } // namespace NumberOfRinses
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1470,6 +1791,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1481,6 +1803,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1492,36 +1815,43 @@ namespace Attributes {
 namespace TemperatureSetpoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace TemperatureSetpoint
 
 namespace MinTemperature {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MinTemperature
 
 namespace MaxTemperature {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MaxTemperature
 
 namespace Step {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Step
 
 namespace SelectedTemperatureLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SelectedTemperatureLevel
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1535,6 +1865,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Mask
 
 namespace State {
@@ -1542,6 +1875,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace State
 
 namespace Supported {
@@ -1549,16 +1885,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::RefrigeratorAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Supported
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1570,6 +1911,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1581,6 +1923,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1593,85 +1936,110 @@ namespace ExpressedState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum * value); // ExpressedStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ExpressedState
 
 namespace SmokeState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum * value); // AlarmStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SmokeState
 
 namespace COState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum * value); // AlarmStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace COState
 
 namespace BatteryAlert {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum * value); // AlarmStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BatteryAlert
 
 namespace DeviceMuted {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::MuteStateEnum * value); // MuteStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::MuteStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace DeviceMuted
 
 namespace TestInProgress {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace TestInProgress
 
 namespace HardwareFaultAlert {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace HardwareFaultAlert
 
 namespace EndOfServiceAlert {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum * value); // EndOfServiceEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace EndOfServiceAlert
 
 namespace InterconnectSmokeAlarm {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum * value); // AlarmStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace InterconnectSmokeAlarm
 
 namespace InterconnectCOAlarm {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum * value); // AlarmStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace InterconnectCOAlarm
 
 namespace ContaminationState {
 Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum * value); // ContaminationStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ContaminationState
 
 namespace SmokeSensitivityLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::SmokeCoAlarm::SensitivityEnum * value); // SensitivityEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SmokeSensitivityLevel
 
 namespace ExpiryDate {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace ExpiryDate
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1685,6 +2053,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Mask
 
 namespace Latch {
@@ -1692,6 +2063,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Latch
 
 namespace State {
@@ -1699,6 +2073,9 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace State
 
 namespace Supported {
@@ -1706,16 +2083,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> * value); // AlarmBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DishwasherAlarm::AlarmBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Supported
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1727,6 +2109,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1738,6 +2121,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1749,11 +2133,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1765,11 +2151,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1781,23 +2169,30 @@ namespace Attributes {
 namespace LastConfiguredBy {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::NodeId> & value); // node_id
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::NodeId value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::NodeId value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::NodeId> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::NodeId> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LastConfiguredBy
 
 namespace SceneTableSize {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace SceneTableSize
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1809,6 +2204,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1820,6 +2216,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1831,11 +2228,13 @@ namespace Attributes {
 namespace SupportedSensitivityLevels {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SupportedSensitivityLevels
 
 namespace DefaultSensitivityLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace DefaultSensitivityLevel
 
 namespace AlarmsActive {
@@ -1844,6 +2243,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AlarmsActive
 
 namespace AlarmsSuppressed {
@@ -1852,6 +2254,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AlarmsSuppressed
 
 namespace AlarmsEnabled {
@@ -1860,6 +2265,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AlarmsEnabled
 
 namespace AlarmsSupported {
@@ -1868,6 +2276,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> * value); // AlarmModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::AlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AlarmsSupported
 
 namespace SensorFault {
@@ -1876,16 +2287,21 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap> * value); // SensorFaultBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BooleanStateConfiguration::SensorFaultBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SensorFault
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1897,22 +2313,34 @@ namespace Attributes {
 namespace OpenDuration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OpenDuration
 
 namespace DefaultOpenDuration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace DefaultOpenDuration
 
 namespace AutoCloseTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // epoch_us
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AutoCloseTime
 
 namespace CurrentState {
@@ -1921,10 +2349,18 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value); // ValveStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value,
+    MarkAttributeDirty markDirty);
 } // namespace CurrentState
 
 namespace TargetState {
@@ -1933,29 +2369,46 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value); // ValveStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum> & value,
+    MarkAttributeDirty markDirty);
 } // namespace TargetState
 
 namespace CurrentLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentLevel
 
 namespace TargetLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TargetLevel
 
 namespace DefaultOpenLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Percent * value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 } // namespace DefaultOpenLevel
 
 namespace ValveFault {
@@ -1964,21 +2417,27 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> * value); // ValveFaultBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ValveFault
 
 namespace LevelStep {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace LevelStep
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -1990,6 +2449,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2001,6 +2461,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2012,36 +2473,43 @@ namespace Attributes {
 namespace NumberOfLoadControlPrograms {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfLoadControlPrograms
 
 namespace NumberOfEventsPerProgram {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfEventsPerProgram
 
 namespace NumberOfTransitions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfTransitions
 
 namespace DefaultRandomStart {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace DefaultRandomStart
 
 namespace DefaultRandomDuration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace DefaultRandomDuration
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2053,11 +2521,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2069,6 +2539,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2080,6 +2551,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2091,21 +2563,25 @@ namespace Attributes {
 namespace CurrentEnergyBalance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentEnergyBalance
 
 namespace CurrentLowPowerModeSensitivity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentLowPowerModeSensitivity
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2117,6 +2593,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2128,20 +2605,29 @@ namespace Attributes {
 namespace StartUpMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpMode
 
 namespace OnMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnMode
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2153,20 +2639,29 @@ namespace Attributes {
 namespace StartUpMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpMode
 
 namespace OnMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OnMode
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2179,93 +2674,121 @@ namespace LockState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value); // DlLockState
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockState value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockState value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LockState
 
 namespace LockType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockType * value); // DlLockType
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockType value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlLockType value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LockType
 
 namespace ActuatorEnabled {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace ActuatorEnabled
 
 namespace DoorState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value); // DoorStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace DoorState
 
 namespace DoorOpenEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace DoorOpenEvents
 
 namespace DoorClosedEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace DoorClosedEvents
 
 namespace OpenPeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace OpenPeriod
 
 namespace NumberOfTotalUsersSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfTotalUsersSupported
 
 namespace NumberOfPINUsersSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfPINUsersSupported
 
 namespace NumberOfRFIDUsersSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfRFIDUsersSupported
 
 namespace NumberOfWeekDaySchedulesSupportedPerUser {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfWeekDaySchedulesSupportedPerUser
 
 namespace NumberOfYearDaySchedulesSupportedPerUser {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfYearDaySchedulesSupportedPerUser
 
 namespace NumberOfHolidaySchedulesSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfHolidaySchedulesSupported
 
 namespace MaxPINCodeLength {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MaxPINCodeLength
 
 namespace MinPINCodeLength {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MinPINCodeLength
 
 namespace MaxRFIDCodeLength {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MaxRFIDCodeLength
 
 namespace MinRFIDCodeLength {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MinRFIDCodeLength
 
 namespace CredentialRulesSupport {
@@ -2273,37 +2796,47 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> * value); // DlCredentialRuleMask
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlCredentialRuleMask> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CredentialRulesSupport
 
 namespace NumberOfCredentialsSupportedPerUser {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfCredentialsSupportedPerUser
 
 namespace Language {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace Language
 
 namespace LEDSettings {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace LEDSettings
 
 namespace AutoRelockTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace AutoRelockTime
 
 namespace SoundVolume {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SoundVolume
 
 namespace OperatingMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::DoorLock::OperatingModeEnum * value); // OperatingModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OperatingMode
 
 namespace SupportedOperatingModes {
@@ -2312,6 +2845,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> * value); // DlSupportedOperatingModes
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SupportedOperatingModes
 
 namespace DefaultConfigurationRegister {
@@ -2320,26 +2856,33 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> * value); // DlDefaultConfigurationRegister
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlDefaultConfigurationRegister> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace DefaultConfigurationRegister
 
 namespace EnableLocalProgramming {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace EnableLocalProgramming
 
 namespace EnableOneTouchLocking {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace EnableOneTouchLocking
 
 namespace EnableInsideStatusLED {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace EnableInsideStatusLED
 
 namespace EnablePrivacyModeButton {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace EnablePrivacyModeButton
 
 namespace LocalProgrammingFeatures {
@@ -2348,85 +2891,111 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> * value); // DlLocalProgrammingFeatures
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::DoorLock::DlLocalProgrammingFeatures> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LocalProgrammingFeatures
 
 namespace WrongCodeEntryLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace WrongCodeEntryLimit
 
 namespace UserCodeTemporaryDisableTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace UserCodeTemporaryDisableTime
 
 namespace SendPINOverTheAir {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace SendPINOverTheAir
 
 namespace RequirePINforRemoteOperation {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace RequirePINforRemoteOperation
 
 namespace ExpiringUserTimeout {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ExpiringUserTimeout
 
 namespace AliroReaderVerificationKey {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AliroReaderVerificationKey
 
 namespace AliroReaderGroupIdentifier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AliroReaderGroupIdentifier
 
 namespace AliroReaderGroupSubIdentifier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableByteSpan & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 } // namespace AliroReaderGroupSubIdentifier
 
 namespace AliroGroupResolvingKey {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AliroGroupResolvingKey
 
 namespace AliroBLEAdvertisingVersion {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace AliroBLEAdvertisingVersion
 
 namespace NumberOfAliroCredentialIssuerKeysSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfAliroCredentialIssuerKeysSupported
 
 namespace NumberOfAliroEndpointKeysSupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfAliroEndpointKeysSupported
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2438,40 +3007,54 @@ namespace Attributes {
 namespace Type {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type * value); // Type
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Type
 
 namespace PhysicalClosedLimitLift {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalClosedLimitLift
 
 namespace PhysicalClosedLimitTilt {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalClosedLimitTilt
 
 namespace CurrentPositionLift {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentPositionLift
 
 namespace CurrentPositionTilt {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentPositionTilt
 
 namespace NumberOfActuationsLift {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfActuationsLift
 
 namespace NumberOfActuationsTilt {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfActuationsTilt
 
 namespace ConfigStatus {
@@ -2479,20 +3062,31 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> * value); // ConfigStatus
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::WindowCovering::ConfigStatus> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ConfigStatus
 
 namespace CurrentPositionLiftPercentage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentPositionLiftPercentage
 
 namespace CurrentPositionTiltPercentage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentPositionTiltPercentage
 
 namespace OperationalStatus {
@@ -2500,74 +3094,101 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> * value); // OperationalStatus
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::WindowCovering::OperationalStatus> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OperationalStatus
 
 namespace TargetPositionLiftPercent100ths {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::Percent100ths> & value); // percent100ths
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty);
 } // namespace TargetPositionLiftPercent100ths
 
 namespace TargetPositionTiltPercent100ths {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::Percent100ths> & value); // percent100ths
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty);
 } // namespace TargetPositionTiltPercent100ths
 
 namespace EndProductType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::WindowCovering::EndProductType * value); // EndProductType
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value,
+                                        MarkAttributeDirty markDirty);
 } // namespace EndProductType
 
 namespace CurrentPositionLiftPercent100ths {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::Percent100ths> & value); // percent100ths
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty);
 } // namespace CurrentPositionLiftPercent100ths
 
 namespace CurrentPositionTiltPercent100ths {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::Percent100ths> & value); // percent100ths
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent100ths value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::Percent100ths> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent100ths> & value, MarkAttributeDirty markDirty);
 } // namespace CurrentPositionTiltPercent100ths
 
 namespace InstalledOpenLimitLift {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace InstalledOpenLimitLift
 
 namespace InstalledClosedLimitLift {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace InstalledClosedLimitLift
 
 namespace InstalledOpenLimitTilt {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace InstalledOpenLimitTilt
 
 namespace InstalledClosedLimitTilt {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace InstalledClosedLimitTilt
 
 namespace Mode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::Mode> * value); // Mode
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::WindowCovering::Mode> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Mode
 
 namespace SafetyStatus {
@@ -2575,16 +3196,21 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> * value); // SafetyStatus
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::WindowCovering::SafetyStatus> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SafetyStatus
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2596,61 +3222,73 @@ namespace Attributes {
 namespace BarrierMovingState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierMovingState
 
 namespace BarrierSafetyStatus {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierSafetyStatus
 
 namespace BarrierCapabilities {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierCapabilities
 
 namespace BarrierOpenEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierOpenEvents
 
 namespace BarrierCloseEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierCloseEvents
 
 namespace BarrierCommandOpenEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierCommandOpenEvents
 
 namespace BarrierCommandCloseEvents {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierCommandCloseEvents
 
 namespace BarrierOpenPeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierOpenPeriod
 
 namespace BarrierClosePeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierClosePeriod
 
 namespace BarrierPosition {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace BarrierPosition
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2662,92 +3300,144 @@ namespace Attributes {
 namespace MaxPressure {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxPressure
 
 namespace MaxSpeed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxSpeed
 
 namespace MaxFlow {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxFlow
 
 namespace MinConstPressure {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinConstPressure
 
 namespace MaxConstPressure {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxConstPressure
 
 namespace MinCompPressure {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinCompPressure
 
 namespace MaxCompPressure {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxCompPressure
 
 namespace MinConstSpeed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinConstSpeed
 
 namespace MaxConstSpeed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxConstSpeed
 
 namespace MinConstFlow {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinConstFlow
 
 namespace MaxConstFlow {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxConstFlow
 
 namespace MinConstTemp {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinConstTemp
 
 namespace MaxConstTemp {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxConstTemp
 
 namespace PumpStatus {
@@ -2756,6 +3446,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap> * value); // PumpStatusBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::PumpConfigurationAndControl::PumpStatusBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace PumpStatus
 
 namespace EffectiveOperationMode {
@@ -2763,6 +3456,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum * value); // OperationModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace EffectiveOperationMode
 
 namespace EffectiveControlMode {
@@ -2770,41 +3466,64 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value); // ControlModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace EffectiveControlMode
 
 namespace Capacity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Capacity
 
 namespace Speed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Speed
 
 namespace LifetimeRunningHours {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LifetimeRunningHours
 
 namespace Power {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Power
 
 namespace LifetimeEnergyConsumed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LifetimeEnergyConsumed
 
 namespace OperationMode {
@@ -2812,6 +3531,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum * value); // OperationModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OperationMode
 
 namespace ControlMode {
@@ -2819,16 +3541,21 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value); // ControlModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ControlMode
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -2840,105 +3567,131 @@ namespace Attributes {
 namespace LocalTemperature {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LocalTemperature
 
 namespace OutdoorTemperature {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OutdoorTemperature
 
 namespace Occupancy {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Occupancy
 
 namespace AbsMinHeatSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AbsMinHeatSetpointLimit
 
 namespace AbsMaxHeatSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AbsMaxHeatSetpointLimit
 
 namespace AbsMinCoolSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AbsMinCoolSetpointLimit
 
 namespace AbsMaxCoolSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AbsMaxCoolSetpointLimit
 
 namespace PICoolingDemand {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PICoolingDemand
 
 namespace PIHeatingDemand {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PIHeatingDemand
 
 namespace HVACSystemTypeConfiguration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace HVACSystemTypeConfiguration
 
 namespace LocalTemperatureCalibration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace LocalTemperatureCalibration
 
 namespace OccupiedCoolingSetpoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace OccupiedCoolingSetpoint
 
 namespace OccupiedHeatingSetpoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace OccupiedHeatingSetpoint
 
 namespace UnoccupiedCoolingSetpoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace UnoccupiedCoolingSetpoint
 
 namespace UnoccupiedHeatingSetpoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace UnoccupiedHeatingSetpoint
 
 namespace MinHeatSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MinHeatSetpointLimit
 
 namespace MaxHeatSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MaxHeatSetpointLimit
 
 namespace MinCoolSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MinCoolSetpointLimit
 
 namespace MaxCoolSetpointLimit {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MaxCoolSetpointLimit
 
 namespace MinSetpointDeadBand {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace MinSetpointDeadBand
 
 namespace RemoteSensing {
@@ -2946,6 +3699,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap> * value); // RemoteSensingBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::RemoteSensingBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace RemoteSensing
 
 namespace ControlSequenceOfOperation {
@@ -2954,12 +3710,16 @@ Get(chip::EndpointId endpoint,
     chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum * value); // ControlSequenceOfOperationEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ControlSequenceOfOperationEnum value, MarkAttributeDirty markDirty);
 } // namespace ControlSequenceOfOperation
 
 namespace SystemMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::SystemModeEnum * value); // SystemModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SystemModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SystemModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SystemMode
 
 namespace ThermostatRunningMode {
@@ -2967,22 +3727,28 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ThermostatRunningModeEnum * value); // ThermostatRunningModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ThermostatRunningModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ThermostatRunningModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ThermostatRunningMode
 
 namespace StartOfWeek {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::StartOfWeekEnum * value); // StartOfWeekEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::StartOfWeekEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::StartOfWeekEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartOfWeek
 
 namespace NumberOfWeeklyTransitions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfWeeklyTransitions
 
 namespace NumberOfDailyTransitions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfDailyTransitions
 
 namespace TemperatureSetpointHold {
@@ -2990,13 +3756,19 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum * value); // TemperatureSetpointHoldEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::TemperatureSetpointHoldEnum value, MarkAttributeDirty markDirty);
 } // namespace TemperatureSetpointHold
 
 namespace TemperatureSetpointHoldDuration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TemperatureSetpointHoldDuration
 
 namespace ThermostatProgrammingOperationMode {
@@ -3005,6 +3777,9 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap> * value); // ProgrammingOperationModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::ProgrammingOperationModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ThermostatProgrammingOperationMode
 
 namespace ThermostatRunningState {
@@ -3012,94 +3787,136 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap> * value); // RelayStateBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::RelayStateBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ThermostatRunningState
 
 namespace SetpointChangeSource {
 Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SetpointChangeSourceEnum * value); // SetpointChangeSourceEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SetpointChangeSourceEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::SetpointChangeSourceEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SetpointChangeSource
 
 namespace SetpointChangeAmount {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SetpointChangeAmount
 
 namespace SetpointChangeSourceTimestamp {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace SetpointChangeSourceTimestamp
 
 namespace OccupiedSetback {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OccupiedSetback
 
 namespace OccupiedSetbackMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OccupiedSetbackMin
 
 namespace OccupiedSetbackMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OccupiedSetbackMax
 
 namespace UnoccupiedSetback {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UnoccupiedSetback
 
 namespace UnoccupiedSetbackMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UnoccupiedSetbackMin
 
 namespace UnoccupiedSetbackMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace UnoccupiedSetbackMax
 
 namespace EmergencyHeatDelta {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace EmergencyHeatDelta
 
 namespace ACType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ACTypeEnum * value); // ACTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACType
 
 namespace ACCapacity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ACCapacity
 
 namespace ACRefrigerantType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum * value); // ACRefrigerantTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACRefrigerantTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACRefrigerantType
 
 namespace ACCompressorType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ACCompressorTypeEnum * value); // ACCompressorTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCompressorTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCompressorTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACCompressorType
 
 namespace ACErrorCode {
@@ -3107,68 +3924,95 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap> * value); // ACErrorCodeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::ACErrorCodeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACErrorCode
 
 namespace ACLouverPosition {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ACLouverPositionEnum * value); // ACLouverPositionEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACLouverPositionEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACLouverPositionEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACLouverPosition
 
 namespace ACCoilTemperature {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACCoilTemperature
 
 namespace ACCapacityformat {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::Thermostat::ACCapacityFormatEnum * value); // ACCapacityFormatEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCapacityFormatEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::Thermostat::ACCapacityFormatEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ACCapacityformat
 
 namespace NumberOfPresets {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfPresets
 
 namespace NumberOfSchedules {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfSchedules
 
 namespace NumberOfScheduleTransitions {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace NumberOfScheduleTransitions
 
 namespace NumberOfScheduleTransitionPerDay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NumberOfScheduleTransitionPerDay
 
 namespace ActivePresetHandle {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ActivePresetHandle
 
 namespace ActiveScheduleHandle {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ActiveScheduleHandle
 
 namespace PresetsSchedulesEditable {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace PresetsSchedulesEditable
 
 namespace TemperatureSetpointHoldPolicy {
@@ -3177,23 +4021,32 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                             value); // TemperatureSetpointHoldPolicyBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TemperatureSetpointHoldPolicy
 
 namespace SetpointHoldExpiryTimestamp {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // epoch_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SetpointHoldExpiryTimestamp
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3206,41 +4059,56 @@ namespace FanMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::FanControl::FanModeEnum * value); // FanModeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace FanMode
 
 namespace FanModeSequence {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::FanControl::FanModeSequenceEnum * value); // FanModeSequenceEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeSequenceEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::FanModeSequenceEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace FanModeSequence
 
 namespace PercentSetting {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace PercentSetting
 
 namespace PercentCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::Percent * value); // percent
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::Percent value, MarkAttributeDirty markDirty);
 } // namespace PercentCurrent
 
 namespace SpeedMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SpeedMax
 
 namespace SpeedSetting {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SpeedSetting
 
 namespace SpeedCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace SpeedCurrent
 
 namespace RockSupport {
@@ -3248,6 +4116,8 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> * value); // RockBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace RockSupport
 
 namespace RockSetting {
@@ -3255,6 +4125,8 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> * value); // RockBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::RockBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace RockSetting
 
 namespace WindSupport {
@@ -3262,6 +4134,8 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> * value); // WindBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WindSupport
 
 namespace WindSetting {
@@ -3269,22 +4143,28 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> * value); // WindBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::FanControl::WindBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace WindSetting
 
 namespace AirflowDirection {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::FanControl::AirflowDirectionEnum * value); // AirflowDirectionEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::AirflowDirectionEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::FanControl::AirflowDirectionEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace AirflowDirection
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3299,6 +4179,9 @@ Get(chip::EndpointId endpoint,
     chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum * value); // TemperatureDisplayModeEnum
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ThermostatUserInterfaceConfiguration::TemperatureDisplayModeEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace TemperatureDisplayMode
 
 namespace KeypadLockout {
@@ -3307,6 +4190,9 @@ Get(chip::EndpointId endpoint,
     chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum * value); // KeypadLockoutEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::ThermostatUserInterfaceConfiguration::KeypadLockoutEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace KeypadLockout
 
 namespace ScheduleProgrammingVisibility {
@@ -3316,16 +4202,21 @@ Get(chip::EndpointId endpoint,
         value); // ScheduleProgrammingVisibilityEnum
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::ThermostatUserInterfaceConfiguration::ScheduleProgrammingVisibilityEnum value,
+    MarkAttributeDirty markDirty);
 } // namespace ScheduleProgrammingVisibility
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3337,293 +4228,380 @@ namespace Attributes {
 namespace CurrentHue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentHue
 
 namespace CurrentSaturation {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentSaturation
 
 namespace RemainingTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RemainingTime
 
 namespace CurrentX {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentX
 
 namespace CurrentY {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentY
 
 namespace DriftCompensation {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace DriftCompensation
 
 namespace CompensationText {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace CompensationText
 
 namespace ColorTemperatureMireds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorTemperatureMireds
 
 namespace ColorMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace ColorMode
 
 namespace Options {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Options
 
 namespace NumberOfPrimaries {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NumberOfPrimaries
 
 namespace Primary1X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary1X
 
 namespace Primary1Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary1Y
 
 namespace Primary1Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary1Intensity
 
 namespace Primary2X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary2X
 
 namespace Primary2Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary2Y
 
 namespace Primary2Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary2Intensity
 
 namespace Primary3X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary3X
 
 namespace Primary3Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary3Y
 
 namespace Primary3Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary3Intensity
 
 namespace Primary4X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary4X
 
 namespace Primary4Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary4Y
 
 namespace Primary4Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary4Intensity
 
 namespace Primary5X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary5X
 
 namespace Primary5Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary5Y
 
 namespace Primary5Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary5Intensity
 
 namespace Primary6X {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary6X
 
 namespace Primary6Y {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Primary6Y
 
 namespace Primary6Intensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Primary6Intensity
 
 namespace WhitePointX {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace WhitePointX
 
 namespace WhitePointY {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace WhitePointY
 
 namespace ColorPointRX {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointRX
 
 namespace ColorPointRY {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointRY
 
 namespace ColorPointRIntensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ColorPointRIntensity
 
 namespace ColorPointGX {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointGX
 
 namespace ColorPointGY {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointGY
 
 namespace ColorPointGIntensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ColorPointGIntensity
 
 namespace ColorPointBX {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointBX
 
 namespace ColorPointBY {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorPointBY
 
 namespace ColorPointBIntensity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ColorPointBIntensity
 
 namespace EnhancedCurrentHue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace EnhancedCurrentHue
 
 namespace EnhancedColorMode {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace EnhancedColorMode
 
 namespace ColorLoopActive {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace ColorLoopActive
 
 namespace ColorLoopDirection {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace ColorLoopDirection
 
 namespace ColorLoopTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorLoopTime
 
 namespace ColorLoopStartEnhancedHue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorLoopStartEnhancedHue
 
 namespace ColorLoopStoredEnhancedHue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorLoopStoredEnhancedHue
 
 namespace ColorCapabilities {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorCapabilities
 
 namespace ColorTempPhysicalMinMireds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorTempPhysicalMinMireds
 
 namespace ColorTempPhysicalMaxMireds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ColorTempPhysicalMaxMireds
 
 namespace CoupleColorTempToLevelMinMireds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace CoupleColorTempToLevelMinMireds
 
 namespace StartUpColorTemperatureMireds {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartUpColorTemperatureMireds
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3635,11 +4613,13 @@ namespace Attributes {
 namespace PhysicalMinLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalMinLevel
 
 namespace PhysicalMaxLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalMaxLevel
 
 namespace BallastStatus {
@@ -3648,59 +4628,83 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap> * value); // BallastStatusBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BallastConfiguration::BallastStatusBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BallastStatus
 
 namespace MinLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MinLevel
 
 namespace MaxLevel {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MaxLevel
 
 namespace IntrinsicBallastFactor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace IntrinsicBallastFactor
 
 namespace BallastFactorAdjustment {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace BallastFactorAdjustment
 
 namespace LampQuantity {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace LampQuantity
 
 namespace LampType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace LampType
 
 namespace LampManufacturer {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace LampManufacturer
 
 namespace LampRatedHours {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LampRatedHours
 
 namespace LampBurnHours {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LampBurnHours
 
 namespace LampAlarmMode {
@@ -3709,23 +4713,32 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap> * value); // LampAlarmModeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::BallastConfiguration::LampAlarmModeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LampAlarmMode
 
 namespace LampBurnHoursTripPoint {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace LampBurnHoursTripPoint
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3737,27 +4750,40 @@ namespace Attributes {
 namespace MeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
 namespace LightSensorType {
@@ -3766,20 +4792,30 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum> & value); // LightSensorTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::IlluminanceMeasurement::LightSensorTypeEnum> & value,
+    MarkAttributeDirty markDirty);
 } // namespace LightSensorType
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3791,37 +4827,52 @@ namespace Attributes {
 namespace MeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3833,68 +4884,97 @@ namespace Attributes {
 namespace MeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
 namespace ScaledValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace ScaledValue
 
 namespace MinScaledValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinScaledValue
 
 namespace MaxScaledValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxScaledValue
 
 namespace ScaledTolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ScaledTolerance
 
 namespace Scale {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace Scale
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3906,37 +4986,52 @@ namespace Attributes {
 namespace MeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3948,37 +5043,52 @@ namespace Attributes {
 namespace MeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Tolerance
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -3992,6 +5102,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> * value); // OccupancyBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Occupancy
 
 namespace OccupancySensorType {
@@ -3999,6 +5112,8 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum * value); // OccupancySensorTypeEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::OccupancySensing::OccupancySensorTypeEnum value, MarkAttributeDirty markDirty);
 } // namespace OccupancySensorType
 
 namespace OccupancySensorTypeBitmap {
@@ -4007,61 +5122,75 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap> * value); // OccupancySensorTypeBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::OccupancySensing::OccupancySensorTypeBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace OccupancySensorTypeBitmap
 
 namespace PIROccupiedToUnoccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PIROccupiedToUnoccupiedDelay
 
 namespace PIRUnoccupiedToOccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PIRUnoccupiedToOccupiedDelay
 
 namespace PIRUnoccupiedToOccupiedThreshold {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PIRUnoccupiedToOccupiedThreshold
 
 namespace UltrasonicOccupiedToUnoccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace UltrasonicOccupiedToUnoccupiedDelay
 
 namespace UltrasonicUnoccupiedToOccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace UltrasonicUnoccupiedToOccupiedDelay
 
 namespace UltrasonicUnoccupiedToOccupiedThreshold {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace UltrasonicUnoccupiedToOccupiedThreshold
 
 namespace PhysicalContactOccupiedToUnoccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalContactOccupiedToUnoccupiedDelay
 
 namespace PhysicalContactUnoccupiedToOccupiedDelay {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalContactUnoccupiedToOccupiedDelay
 
 namespace PhysicalContactUnoccupiedToOccupiedThreshold {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace PhysicalContactUnoccupiedToOccupiedThreshold
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4073,6 +5202,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4084,6 +5214,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4095,6 +5226,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4106,6 +5238,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4117,6 +5250,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4128,6 +5262,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4139,6 +5274,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4150,6 +5286,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4161,6 +5298,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4172,6 +5310,7 @@ namespace Attributes {
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4183,21 +5322,25 @@ namespace Attributes {
 namespace MACAddress {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace MACAddress
 
 namespace LinkLocalAddress {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableByteSpan & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 } // namespace LinkLocalAddress
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4209,11 +5352,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4225,16 +5370,19 @@ namespace Attributes {
 namespace CurrentTarget {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentTarget
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4247,49 +5395,70 @@ namespace CurrentState {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::MediaPlayback::PlaybackStateEnum * value); // PlaybackStateEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace CurrentState
 
 namespace StartTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // epoch_us
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace StartTime
 
 namespace Duration {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Duration
 
 namespace PlaybackSpeed {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, float * value); // single
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty);
 } // namespace PlaybackSpeed
 
 namespace SeekRangeEnd {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SeekRangeEnd
 
 namespace SeekRangeStart {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SeekRangeStart
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4301,16 +5470,19 @@ namespace Attributes {
 namespace CurrentInput {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentInput
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4322,11 +5494,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4338,11 +5512,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4357,16 +5533,21 @@ Get(chip::EndpointId endpoint,
     chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> * value); // SupportedProtocolsBitmap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::ContentLauncher::SupportedProtocolsBitmap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace SupportedStreamingProtocols
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4378,16 +5559,19 @@ namespace Attributes {
 namespace CurrentOutput {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentOutput
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4399,11 +5583,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4415,21 +5601,25 @@ namespace Attributes {
 namespace VendorName {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace VendorName
 
 namespace VendorID {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty);
 } // namespace VendorID
 
 namespace ApplicationName {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // long_char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ApplicationName
 
 namespace ProductID {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ProductID
 
 namespace Status {
@@ -4437,21 +5627,26 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum * value); // ApplicationStatusEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value, MarkAttributeDirty markDirty);
 } // namespace Status
 
 namespace ApplicationVersion {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ApplicationVersion
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4463,11 +5658,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4479,41 +5676,49 @@ namespace Attributes {
 namespace Enabled {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace Enabled
 
 namespace OnDemandRatingThreshold {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace OnDemandRatingThreshold
 
 namespace ScheduledContentRatingThreshold {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace ScheduledContentRatingThreshold
 
 namespace ScreenDailyTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace ScreenDailyTime
 
 namespace RemainingScreenTime {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // elapsed_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace RemainingScreenTime
 
 namespace BlockUnrated {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace BlockUnrated
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4525,11 +5730,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -4541,651 +5748,781 @@ namespace Attributes {
 namespace MeasurementType {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace MeasurementType
 
 namespace DcVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcVoltage
 
 namespace DcVoltageMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcVoltageMin
 
 namespace DcVoltageMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcVoltageMax
 
 namespace DcCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcCurrent
 
 namespace DcCurrentMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcCurrentMin
 
 namespace DcCurrentMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcCurrentMax
 
 namespace DcPower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcPower
 
 namespace DcPowerMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcPowerMin
 
 namespace DcPowerMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace DcPowerMax
 
 namespace DcVoltageMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcVoltageMultiplier
 
 namespace DcVoltageDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcVoltageDivisor
 
 namespace DcCurrentMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcCurrentMultiplier
 
 namespace DcCurrentDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcCurrentDivisor
 
 namespace DcPowerMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcPowerMultiplier
 
 namespace DcPowerDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace DcPowerDivisor
 
 namespace AcFrequency {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcFrequency
 
 namespace AcFrequencyMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcFrequencyMin
 
 namespace AcFrequencyMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcFrequencyMax
 
 namespace NeutralCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace NeutralCurrent
 
 namespace TotalActivePower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * value); // int32s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 } // namespace TotalActivePower
 
 namespace TotalReactivePower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * value); // int32s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 } // namespace TotalReactivePower
 
 namespace TotalApparentPower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace TotalApparentPower
 
 namespace Measured1stHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured1stHarmonicCurrent
 
 namespace Measured3rdHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured3rdHarmonicCurrent
 
 namespace Measured5thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured5thHarmonicCurrent
 
 namespace Measured7thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured7thHarmonicCurrent
 
 namespace Measured9thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured9thHarmonicCurrent
 
 namespace Measured11thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Measured11thHarmonicCurrent
 
 namespace MeasuredPhase1stHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase1stHarmonicCurrent
 
 namespace MeasuredPhase3rdHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase3rdHarmonicCurrent
 
 namespace MeasuredPhase5thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase5thHarmonicCurrent
 
 namespace MeasuredPhase7thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase7thHarmonicCurrent
 
 namespace MeasuredPhase9thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase9thHarmonicCurrent
 
 namespace MeasuredPhase11thHarmonicCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace MeasuredPhase11thHarmonicCurrent
 
 namespace AcFrequencyMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcFrequencyMultiplier
 
 namespace AcFrequencyDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcFrequencyDivisor
 
 namespace PowerMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace PowerMultiplier
 
 namespace PowerDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace PowerDivisor
 
 namespace HarmonicCurrentMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace HarmonicCurrentMultiplier
 
 namespace PhaseHarmonicCurrentMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace PhaseHarmonicCurrentMultiplier
 
 namespace InstantaneousVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace InstantaneousVoltage
 
 namespace InstantaneousLineCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace InstantaneousLineCurrent
 
 namespace InstantaneousActiveCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace InstantaneousActiveCurrent
 
 namespace InstantaneousReactiveCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace InstantaneousReactiveCurrent
 
 namespace InstantaneousPower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace InstantaneousPower
 
 namespace RmsVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltage
 
 namespace RmsVoltageMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMin
 
 namespace RmsVoltageMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMax
 
 namespace RmsCurrent {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrent
 
 namespace RmsCurrentMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMin
 
 namespace RmsCurrentMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMax
 
 namespace ActivePower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePower
 
 namespace ActivePowerMin {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMin
 
 namespace ActivePowerMax {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMax
 
 namespace ReactivePower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ReactivePower
 
 namespace ApparentPower {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ApparentPower
 
 namespace PowerFactor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace PowerFactor
 
 namespace AverageRmsVoltageMeasurementPeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsVoltageMeasurementPeriod
 
 namespace AverageRmsUnderVoltageCounter {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsUnderVoltageCounter
 
 namespace RmsExtremeOverVoltagePeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeOverVoltagePeriod
 
 namespace RmsExtremeUnderVoltagePeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeUnderVoltagePeriod
 
 namespace RmsVoltageSagPeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSagPeriod
 
 namespace RmsVoltageSwellPeriod {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSwellPeriod
 
 namespace AcVoltageMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcVoltageMultiplier
 
 namespace AcVoltageDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcVoltageDivisor
 
 namespace AcCurrentMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcCurrentMultiplier
 
 namespace AcCurrentDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcCurrentDivisor
 
 namespace AcPowerMultiplier {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcPowerMultiplier
 
 namespace AcPowerDivisor {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcPowerDivisor
 
 namespace OverloadAlarmsMask {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace OverloadAlarmsMask
 
 namespace VoltageOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace VoltageOverload
 
 namespace CurrentOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace CurrentOverload
 
 namespace AcOverloadAlarmsMask {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AcOverloadAlarmsMask
 
 namespace AcVoltageOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AcVoltageOverload
 
 namespace AcCurrentOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AcCurrentOverload
 
 namespace AcActivePowerOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AcActivePowerOverload
 
 namespace AcReactivePowerOverload {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AcReactivePowerOverload
 
 namespace AverageRmsOverVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsOverVoltage
 
 namespace AverageRmsUnderVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsUnderVoltage
 
 namespace RmsExtremeOverVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeOverVoltage
 
 namespace RmsExtremeUnderVoltage {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeUnderVoltage
 
 namespace RmsVoltageSag {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSag
 
 namespace RmsVoltageSwell {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSwell
 
 namespace LineCurrentPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace LineCurrentPhaseB
 
 namespace ActiveCurrentPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActiveCurrentPhaseB
 
 namespace ReactiveCurrentPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ReactiveCurrentPhaseB
 
 namespace RmsVoltagePhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltagePhaseB
 
 namespace RmsVoltageMinPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMinPhaseB
 
 namespace RmsVoltageMaxPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMaxPhaseB
 
 namespace RmsCurrentPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentPhaseB
 
 namespace RmsCurrentMinPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMinPhaseB
 
 namespace RmsCurrentMaxPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMaxPhaseB
 
 namespace ActivePowerPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerPhaseB
 
 namespace ActivePowerMinPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMinPhaseB
 
 namespace ActivePowerMaxPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMaxPhaseB
 
 namespace ReactivePowerPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ReactivePowerPhaseB
 
 namespace ApparentPowerPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ApparentPowerPhaseB
 
 namespace PowerFactorPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace PowerFactorPhaseB
 
 namespace AverageRmsVoltageMeasurementPeriodPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsVoltageMeasurementPeriodPhaseB
 
 namespace AverageRmsOverVoltageCounterPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsOverVoltageCounterPhaseB
 
 namespace AverageRmsUnderVoltageCounterPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsUnderVoltageCounterPhaseB
 
 namespace RmsExtremeOverVoltagePeriodPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeOverVoltagePeriodPhaseB
 
 namespace RmsExtremeUnderVoltagePeriodPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeUnderVoltagePeriodPhaseB
 
 namespace RmsVoltageSagPeriodPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSagPeriodPhaseB
 
 namespace RmsVoltageSwellPeriodPhaseB {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSwellPeriodPhaseB
 
 namespace LineCurrentPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace LineCurrentPhaseC
 
 namespace ActiveCurrentPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActiveCurrentPhaseC
 
 namespace ReactiveCurrentPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ReactiveCurrentPhaseC
 
 namespace RmsVoltagePhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltagePhaseC
 
 namespace RmsVoltageMinPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMinPhaseC
 
 namespace RmsVoltageMaxPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageMaxPhaseC
 
 namespace RmsCurrentPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentPhaseC
 
 namespace RmsCurrentMinPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMinPhaseC
 
 namespace RmsCurrentMaxPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsCurrentMaxPhaseC
 
 namespace ActivePowerPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerPhaseC
 
 namespace ActivePowerMinPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMinPhaseC
 
 namespace ActivePowerMaxPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ActivePowerMaxPhaseC
 
 namespace ReactivePowerPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace ReactivePowerPhaseC
 
 namespace ApparentPowerPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ApparentPowerPhaseC
 
 namespace PowerFactorPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace PowerFactorPhaseC
 
 namespace AverageRmsVoltageMeasurementPeriodPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsVoltageMeasurementPeriodPhaseC
 
 namespace AverageRmsOverVoltageCounterPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsOverVoltageCounterPhaseC
 
 namespace AverageRmsUnderVoltageCounterPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace AverageRmsUnderVoltageCounterPhaseC
 
 namespace RmsExtremeOverVoltagePeriodPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeOverVoltagePeriodPhaseC
 
 namespace RmsExtremeUnderVoltagePeriodPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsExtremeUnderVoltagePeriodPhaseC
 
 namespace RmsVoltageSagPeriodPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSagPeriodPhaseC
 
 namespace RmsVoltageSwellPeriodPhaseC {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RmsVoltageSwellPeriodPhaseC
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -5197,6 +6534,7 @@ namespace Attributes {
 namespace Boolean {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace Boolean
 
 namespace Bitmap8 {
@@ -5204,6 +6542,8 @@ Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> * value); // Bitmap8MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value, MarkAttributeDirty markDirty);
 } // namespace Bitmap8
 
 namespace Bitmap16 {
@@ -5211,6 +6551,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> * value); // Bitmap16MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Bitmap16
 
 namespace Bitmap32 {
@@ -5218,6 +6561,9 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> * value); // Bitmap32MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Bitmap32
 
 namespace Bitmap64 {
@@ -5225,184 +6571,226 @@ Protocols::InteractionModel::Status
 Get(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> * value); // Bitmap64MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 } // namespace Bitmap64
 
 namespace Int8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Int8u
 
 namespace Int16u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Int16u
 
 namespace Int24u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace Int24u
 
 namespace Int32u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace Int32u
 
 namespace Int40u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // int40u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace Int40u
 
 namespace Int48u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // int48u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace Int48u
 
 namespace Int56u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // int56u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace Int56u
 
 namespace Int64u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace Int64u
 
 namespace Int8s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace Int8s
 
 namespace Int16s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace Int16s
 
 namespace Int24s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * value); // int24s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 } // namespace Int24s
 
 namespace Int32s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int32_t * value); // int32s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 } // namespace Int32s
 
 namespace Int40s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * value); // int40s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 } // namespace Int40s
 
 namespace Int48s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * value); // int48s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 } // namespace Int48s
 
 namespace Int56s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * value); // int56s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 } // namespace Int56s
 
 namespace Int64s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int64_t * value); // int64s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 } // namespace Int64s
 
 namespace Enum8 {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace Enum8
 
 namespace Enum16 {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // enum16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace Enum16
 
 namespace FloatSingle {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, float * value); // single
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty);
 } // namespace FloatSingle
 
 namespace FloatDouble {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, double * value); // double
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value, MarkAttributeDirty markDirty);
 } // namespace FloatDouble
 
 namespace OctetString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableByteSpan & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 } // namespace OctetString
 
 namespace LongOctetString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableByteSpan & value); // long_octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 } // namespace LongOctetString
 
 namespace CharString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace CharString
 
 namespace LongCharString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // long_char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 } // namespace LongCharString
 
 namespace EpochUs {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint64_t * value); // epoch_us
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 } // namespace EpochUs
 
 namespace EpochS {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace EpochS
 
 namespace VendorId {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::VendorId value, MarkAttributeDirty markDirty);
 } // namespace VendorId
 
 namespace EnumAttr {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         chip::app::Clusters::UnitTesting::SimpleEnum * value); // SimpleEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value,
+                                        MarkAttributeDirty markDirty);
 } // namespace EnumAttr
 
 namespace RangeRestrictedInt8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace RangeRestrictedInt8u
 
 namespace RangeRestrictedInt8s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int8_t * value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 } // namespace RangeRestrictedInt8s
 
 namespace RangeRestrictedInt16u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace RangeRestrictedInt16u
 
 namespace RangeRestrictedInt16s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, int16_t * value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 } // namespace RangeRestrictedInt16s
 
 namespace TimedWriteBoolean {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace TimedWriteBoolean
 
 namespace Unsupported {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace Unsupported
 
 namespace NullableBoolean {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<bool> & value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<bool> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableBoolean
 
 namespace NullableBitmap8 {
@@ -5411,10 +6799,17 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> & value); // Bitmap8MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint, chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap> value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> & value,
+    MarkAttributeDirty markDirty);
 } // namespace NullableBitmap8
 
 namespace NullableBitmap16 {
@@ -5423,10 +6818,18 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> & value); // Bitmap16MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> & value,
+    MarkAttributeDirty markDirty);
 } // namespace NullableBitmap16
 
 namespace NullableBitmap32 {
@@ -5435,10 +6838,18 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> & value); // Bitmap32MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> & value,
+    MarkAttributeDirty markDirty);
 } // namespace NullableBitmap32
 
 namespace NullableBitmap64 {
@@ -5447,223 +6858,345 @@ Get(chip::EndpointId endpoint,
     DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> & value); // Bitmap64MaskMap
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap> value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status
 Set(chip::EndpointId endpoint,
     const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> & value);
+Protocols::InteractionModel::Status
+Set(chip::EndpointId endpoint,
+    const chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> & value,
+    MarkAttributeDirty markDirty);
 } // namespace NullableBitmap64
 
 namespace NullableInt8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt8u
 
 namespace NullableInt16u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt16u
 
 namespace NullableInt24u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int24u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt24u
 
 namespace NullableInt32u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint32_t> & value); // int32u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt32u
 
 namespace NullableInt40u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int40u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt40u
 
 namespace NullableInt48u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int48u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt48u
 
 namespace NullableInt56u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int56u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt56u
 
 namespace NullableInt64u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint64_t> & value); // int64u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt64u
 
 namespace NullableInt8s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt8s
 
 namespace NullableInt16s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt16s
 
 namespace NullableInt24s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int24s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt24s
 
 namespace NullableInt32s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int32_t> & value); // int32s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int32_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt32s
 
 namespace NullableInt40s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int40s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt40s
 
 namespace NullableInt48s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int48s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt48s
 
 namespace NullableInt56s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int56s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt56s
 
 namespace NullableInt64s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int64_t> & value); // int64s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int64_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int64_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableInt64s
 
 namespace NullableEnum8 {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // enum8
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableEnum8
 
 namespace NullableEnum16 {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // enum16
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableEnum16
 
 namespace NullableFloatSingle {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<float> & value); // single
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, float value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<float> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableFloatSingle
 
 namespace NullableFloatDouble {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<double> & value); // double
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, double value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<double> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableFloatDouble
 
 namespace NullableOctetString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableByteSpan> & value); // octet_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::ByteSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::ByteSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableOctetString
 
 namespace NullableCharString {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::MutableCharSpan> & value); // char_string
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::CharSpan value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::CharSpan> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableCharString
 
 namespace NullableEnumAttr {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint,
                                         DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> & value); // SimpleEnum
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, chip::app::Clusters::UnitTesting::SimpleEnum value,
+                                        MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
                                         const chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint,
+                                        const chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableEnumAttr
 
 namespace NullableRangeRestrictedInt8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableRangeRestrictedInt8u
 
 namespace NullableRangeRestrictedInt8s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int8_t> & value); // int8s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int8_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int8_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableRangeRestrictedInt8s
 
 namespace NullableRangeRestrictedInt16u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<uint16_t> & value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableRangeRestrictedInt16u
 
 namespace NullableRangeRestrictedInt16s {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint);
+Protocols::InteractionModel::Status SetNull(chip::EndpointId endpoint, MarkAttributeDirty markDirty);
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value,
+                                        MarkAttributeDirty markDirty);
 } // namespace NullableRangeRestrictedInt16s
 
 namespace WriteOnlyInt8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace WriteOnlyInt8u
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 namespace MeiInt8u {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint8_t * value); // int8u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
 } // namespace MeiInt8u
 
 } // namespace Attributes
@@ -5675,11 +7208,13 @@ namespace Attributes {
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes
@@ -5691,16 +7226,19 @@ namespace Attributes {
 namespace FlipFlop {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, bool * value); // boolean
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, bool value, MarkAttributeDirty markDirty);
 } // namespace FlipFlop
 
 namespace FeatureMap {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty);
 } // namespace FeatureMap
 
 namespace ClusterRevision {
 Protocols::InteractionModel::Status Get(chip::EndpointId endpoint, uint16_t * value); // int16u
 Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value);
+Protocols::InteractionModel::Status Set(chip::EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty);
 } // namespace ClusterRevision
 
 } // namespace Attributes